Merge pull request #15 from uPhyca/plugin_version_1_1_0

Fix bootclasspath issue
uPhyca · Mar 11, 2015 · 1a62799 · 1a62799
2 parents 05c3942 + 9cc3bcb
commit 1a62799
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/example/build.gradle b/example/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         mavenLocal()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.0.0'
+        classpath 'com.android.tools.build:gradle:1.1.0'
         classpath 'com.uphyca.galette:galette-plugin:0.9.10-SNAPSHOT'
     }
 }

diff --git a/plugin/src/main/groovy/com/uphyca/galette/GAlettePlugin.groovy b/plugin/src/main/groovy/com/uphyca/galette/GAlettePlugin.groovy
@@ -39,12 +39,12 @@ class GAlettePlugin implements Plugin<Project> {
             javaCompile.doLast {
                 def classpath = project.files()
 
-                if (plugin.properties['runtimeJarList']) {
+                if (project.android.properties['bootClasspath']) {
+                    // 0.10
+                    project.android.bootClasspath.each { classpath += project.files(it) }
+                } else if (plugin.properties['runtimeJarList']) {
                     // 0.9
                     plugin.runtimeJarList.each { classpath += project.files(it) }
-                } else if (project.android.properties['bootClasspath']) {
-                    // 0.10
-                    plugin.bootClasspath.each { classpath += project.files(it) }
                 }
                 classpath += javaCompile.classpath
                 classpath += project.configurations["galette"]

diff --git a/tests/build.gradle b/tests/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         mavenLocal()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.0.0'
+        classpath 'com.android.tools.build:gradle:1.1.0'
         classpath 'com.uphyca.galette:galette-plugin:0.9.10-SNAPSHOT'
     }
 }