From 06477dfde8b96d29f256126424ca983cb102e703 Mon Sep 17 00:00:00 2001 From: Martin Zeitler Date: Thu, 27 Sep 2018 03:54:54 +0200 Subject: [PATCH 1/4] versions updated; deprecated configurations updated. --- .gitignore | 1 + build.gradle | 14 +++++++------- gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 703364a9..ac3d7c43 100755 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /out /.idea /.gradle +/local.properties diff --git a/build.gradle b/build.gradle index 5af85588..436a4549 100755 --- a/build.gradle +++ b/build.gradle @@ -33,24 +33,24 @@ configurations { // The repackaging rules are defined in the "shadowJar" task below. dependencies { compile "com.android.tools:r8:1.0.37" - compile "com.android.tools.build:apkzlib:3.2.0-alpha06" - compile "com.android.tools.ddms:ddmlib:26.2.0-alpha04" + compile "com.android.tools.build:apkzlib:3.2.0" + compile "com.android.tools.ddms:ddmlib:26.2.0" shadow "com.android.tools.build:aapt2-proto:0.3.1" shadow "com.google.auto.value:auto-value:1.5.2" - apt "com.google.auto.value:auto-value:1.5.2" + annotationProcessor "com.google.auto.value:auto-value:1.5.2" shadow "com.google.errorprone:error_prone_annotations:2.2.0" shadow "com.google.guava:guava:26.0-jre" shadow "com.google.protobuf:protobuf-java:3.4.0" shadow "com.google.protobuf:protobuf-java-util:3.4.0" - compileWindows "com.android.tools.build:aapt2:3.2.0-alpha14-4748712:windows" - compileMacOs "com.android.tools.build:aapt2:3.2.0-alpha14-4748712:osx" - compileLinux "com.android.tools.build:aapt2:3.2.0-alpha14-4748712:linux" + compileWindows "com.android.tools.build:aapt2:3.2.0:windows" + compileMacOs "com.android.tools.build:aapt2:3.2.0:osx" + compileLinux "com.android.tools.build:aapt2:3.2.0-:linux" testCompile "com.android.tools.build:aapt2-proto:0.3.1" testCompile "com.google.auto.value:auto-value-annotations:1.5.2" - testApt "com.google.auto.value:auto-value:1.5.2" + testAnnotationProcessor "com.google.auto.value:auto-value:1.5.2" testCompile "com.google.errorprone:error_prone_annotations:2.2.0" testCompile "com.google.guava:guava:26.0-jre" testCompile "com.google.truth.extensions:truth-java8-extension:0.42" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f51202dd..32a96c59 100755 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,4 +1,4 @@ -distributionUrl=https\://services.gradle.org/distributions/gradle-4.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-bin.zip distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStorePath=wrapper/dists From 3c9c4126dbe5edfb47fc3a9320cfd6881beda844 Mon Sep 17 00:00:00 2001 From: Martin Zeitler Date: Thu, 27 Sep 2018 03:59:16 +0200 Subject: [PATCH 2/4] typo fixed. --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 436a4549..ca69f3a7 100755 --- a/build.gradle +++ b/build.gradle @@ -46,7 +46,7 @@ dependencies { compileWindows "com.android.tools.build:aapt2:3.2.0:windows" compileMacOs "com.android.tools.build:aapt2:3.2.0:osx" - compileLinux "com.android.tools.build:aapt2:3.2.0-:linux" + compileLinux "com.android.tools.build:aapt2:3.2.0:linux" testCompile "com.android.tools.build:aapt2-proto:0.3.1" testCompile "com.google.auto.value:auto-value-annotations:1.5.2" From 0ae44ed7249cbec381a4c49710b984a02d5f4f31 Mon Sep 17 00:00:00 2001 From: Martin Zeitler Date: Thu, 27 Sep 2018 04:06:57 +0200 Subject: [PATCH 3/4] apt plugin removed. ShadowJar imported. --- build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index ca69f3a7..929394e3 100755 --- a/build.gradle +++ b/build.gradle @@ -1,3 +1,5 @@ +import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar + buildscript { repositories { jcenter() @@ -7,7 +9,6 @@ buildscript { } dependencies { classpath "com.google.protobuf:protobuf-gradle-plugin:0.8.3" - classpath "net.ltgt.gradle:gradle-apt-plugin:0.14" classpath "com.github.jengelman.gradle.plugins:shadow:2.0.2" } } @@ -16,7 +17,6 @@ apply plugin: "com.github.johnrengelman.shadow" apply plugin: "com.google.protobuf" apply plugin: "java" apply plugin: "maven" -apply plugin: "net.ltgt.apt" repositories { mavenLocal() @@ -130,7 +130,7 @@ shadowJar { } // Artifact to use as standalone command line tool. -task executableJar(type: com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar) { +task executableJar(type: ShadowJar) { baseName = 'bundletool' classifier = 'all' from sourceSets.main.output From de1765e1cd4a2155f2b478909512412b04e5cfc9 Mon Sep 17 00:00:00 2001 From: Martin Zeitler Date: Thu, 27 Sep 2018 04:45:04 +0200 Subject: [PATCH 4/4] protobuf updated to 3.6.1 ( task :generateProto should use TaskInputs.files() instead of TaskInputs.file() ). --- build.gradle | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 929394e3..d6b7d8cd 100755 --- a/build.gradle +++ b/build.gradle @@ -35,14 +35,13 @@ dependencies { compile "com.android.tools:r8:1.0.37" compile "com.android.tools.build:apkzlib:3.2.0" compile "com.android.tools.ddms:ddmlib:26.2.0" - shadow "com.android.tools.build:aapt2-proto:0.3.1" shadow "com.google.auto.value:auto-value:1.5.2" annotationProcessor "com.google.auto.value:auto-value:1.5.2" shadow "com.google.errorprone:error_prone_annotations:2.2.0" shadow "com.google.guava:guava:26.0-jre" - shadow "com.google.protobuf:protobuf-java:3.4.0" - shadow "com.google.protobuf:protobuf-java-util:3.4.0" + shadow "com.google.protobuf:protobuf-java:3.6.1" + shadow "com.google.protobuf:protobuf-java-util:3.6.1" compileWindows "com.android.tools.build:aapt2:3.2.0:windows" compileMacOs "com.android.tools.build:aapt2:3.2.0:osx" @@ -79,7 +78,7 @@ test { protobuf { protoc { - artifact = "com.google.protobuf:protoc:3.4.0" + artifact = "com.google.protobuf:protoc:3.6.1" } }