This commit will fix the VerifyError listed in JakeWharton#9

The issue seems to have been resolved by upgrading to the latest build tools.
yhartanto · Dec 9, 2014 · 053947d · 053947d
1 parent e7325ed
commit 053947d
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 16 deletions.
diff --git a/build.gradle b/build.gradle
@@ -6,8 +6,8 @@ buildscript {
 
   dependencies {
     classpath 'org.gradle.api.plugins:gradle-nexus-plugin:0.7'
-    classpath 'com.android.tools.build:gradle:0.12.2'
-    classpath 'org.aspectj:aspectjtools:1.8.1'
+    classpath 'com.android.tools.build:gradle:1.0.0'
+    classpath 'org.aspectj:aspectjtools:1.8.4'
   }
 }
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Nov 22 02:31:13 GMT 2013
+#Mon Dec 08 15:44:09 PST 2014
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-1.12-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
diff --git a/hugo-example/build.gradle b/hugo-example/build.gradle
@@ -7,11 +7,14 @@ buildscript {
       mavenLocal()
     }
 
-    classpath 'com.android.tools.build:gradle:0.10.+'
+    classpath 'com.android.tools.build:gradle:1.0.0'
     classpath 'com.jakewharton.hugo:hugo-plugin:1.1.1-SNAPSHOT'
   }
 }
 
+apply plugin: 'com.android.application'
+apply plugin: 'hugo'
+
 dependencies {
   repositories {
     mavenCentral()
@@ -21,12 +24,9 @@ dependencies {
   }
 }
 
-apply plugin: 'android'
-apply plugin: 'hugo'
-
 android {
   compileSdkVersion 19
-  buildToolsVersion '19.0.3'
+  buildToolsVersion '21.1.1'
 
   compileOptions {
     sourceCompatibility JavaVersion.VERSION_1_7
@@ -35,7 +35,7 @@ android {
 
   buildTypes {
     dev {
-      packageNameSuffix '.dev'
+      applicationIdSuffix '.dev'
     }
   }
 }
diff --git a/hugo-plugin/build.gradle b/hugo-plugin/build.gradle
@@ -5,8 +5,8 @@ dependencies {
   compile gradleApi()
   compile localGroovy()
   compile 'com.android.tools.build:gradle:0.12.2'
-  compile 'org.aspectj:aspectjtools:1.8.1'
-  compile 'org.aspectj:aspectjrt:1.8.1'
+  compile 'org.aspectj:aspectjtools:1.8.4'
+  compile 'org.aspectj:aspectjrt:1.8.4'
 }
 
 modifyPom {

diff --git a/hugo-plugin/src/main/groovy/hugo/weaving/plugin/HugoPlugin.groovy b/hugo-plugin/src/main/groovy/hugo/weaving/plugin/HugoPlugin.groovy
@@ -28,7 +28,7 @@ class HugoPlugin implements Plugin<Project> {
     project.dependencies {
       debugCompile 'com.jakewharton.hugo:hugo-runtime:1.1.1-SNAPSHOT'
       // TODO this should come transitively
-      debugCompile 'org.aspectj:aspectjrt:1.8.1'
+      debugCompile 'org.aspectj:aspectjrt:1.8.4'
       compile 'com.jakewharton.hugo:hugo-annotations:1.1.1-SNAPSHOT'
     }
 

diff --git a/hugo-runtime/build.gradle b/hugo-runtime/build.gradle
@@ -6,13 +6,13 @@ import org.aspectj.tools.ajc.Main
 apply plugin: 'com.android.library'
 
 dependencies {
-  compile 'org.aspectj:aspectjrt:1.8.1'
+  compile 'org.aspectj:aspectjrt:1.8.4'
   compile project(':hugo-annotations')
 }
 
 android {
   compileSdkVersion 20
-  buildToolsVersion '20.0.0'
+  buildToolsVersion '21.1.1'
 
   compileOptions {
     sourceCompatibility JavaVersion.VERSION_1_7
@@ -67,7 +67,7 @@ task install(type: Exec, dependsOn: assemble) {
       "-DartifactId=hugo-runtime",
       "-Dversion=${version}",
       "-Dpackaging=aar",
-      "-Dfile=build/outputs/aar/hugo-runtime-${version}.aar"
+      "-Dfile=build/outputs/aar/hugo-runtime-release.aar"
   ]
 }