Merge pull request #57 from android/fat-jar-resources

Fat jar resources

README.md

@@ -18,19 +18,19 @@ Create a real life complexity Android project that mimics your own and observe t
 
 ## Build & Run
 1. Clone the repo
-2. `gradle fatJar`
+2. `./gradlew fatJar`
 3. `java -jar build/libs/android-studio-poet-all-1.0-SNAPSHOT.jar`
 
 ## How
-* The generated sources will incude the basic functionality of method calling both in class itself and between the generated classes, both in Java and Kotlin
+* The generated sources will include the basic functionality of method calling both in class itself and between the generated classes, both in Java and Kotlin
 
 * The generated build.gradle files will include other modules as dependencies
 
-* You can control Andorid resources (images, layouts etc')
+* You can control Android resources (images, layouts etc')
 
 * You can control product flavors
 
-* You can have intermodule depdendencies
+* You can have both source and resources inter-module dependencies
 
 This is not an official Google product.
 

build.gradle

@@ -24,6 +24,8 @@ dependencies {
     compile 'com.squareup:javapoet:1.9.0'
     compile "org.jetbrains.kotlinx:kotlinx-coroutines-core:0.19.2"
 
+    compile group: 'commons-io', name: 'commons-io', version: '2.0.1'
+
     testCompile 'junit:junit:4.12'
     testCompile "org.mockito:mockito-inline:2.10.0"
     testCompile "com.nhaarman:mockito-kotlin:1.5.0"

src/main/kotlin/com/google/androidstudiopoet/AndroidStudioPoet.kt

@@ -103,9 +103,15 @@ class AndroidStudioPoet(private val modulesWriter: SourceModuleWriter, private v
 
         val btnGenerate = JButton("Generate").apply {
             addActionListener {
-                val text = textArea.text
-                println(text)
-                processInput(configFrom(text)!!)
+                try {
+                    val text = textArea.text
+                    println(text)
+                    processInput(configFrom(text)!!)
+
+                } catch (e: Exception) {
+                    println("ERROR: the generation failed due to JSON script errors - " +
+                            "please fix and try again ")
+                }
             }
         }
 
@@ -139,7 +145,6 @@ class AndroidStudioPoet(private val modulesWriter: SourceModuleWriter, private v
         }
     }
 
-
     private fun createTitleLabel(): JLabel {
         return JLabel("Android Studio Poet").apply {
             horizontalAlignment = SwingConstants.CENTER
@@ -163,7 +168,8 @@ class AndroidStudioPoet(private val modulesWriter: SourceModuleWriter, private v
         filename == null -> null
         !File(filename).canRead() -> null
         else -> File(filename).readText().let {
-            return configFrom(it) }
+            return configFrom(it)
+        }
     }