Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

versions updated; deprecated configurations updated. #31

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

versions updated; deprecated configurations updated. #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
06477df
versions updated; deprecated configurations updated.
syslogic Sep 27, 2018
3c9c412
typo fixed.
syslogic Sep 27, 2018
0ae44ed
apt plugin removed. ShadowJar imported.
syslogic Sep 27, 2018
de1765e
protobuf updated to 3.6.1 ( task :generateProto should use TaskInputs…
syslogic Sep 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@
/out
/.idea
/.gradle
/local.properties
Copy link
Contributor

@plecesne plecesne Sep 27, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: Move before the "/out" to keep in alphabetical order (although I realize now that the gradle is incorrectly placed...)

27 changes: 13 additions & 14 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar

buildscript {
repositories {
jcenter()
Expand All @@ -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"
}
}
Expand All @@ -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()
Expand All @@ -33,24 +33,23 @@ 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"
syslogic marked this conversation as resolved.
Show resolved Hide resolved
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"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you could switch to 3.6.0 instead, that would be helpful. We can't use 3.6.1 on our internal branch at the moment.

shadow "com.google.protobuf:protobuf-java-util:3.6.1"

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"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the stable version is: 3.2.0-4818971

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"
Expand Down Expand Up @@ -79,7 +78,7 @@ test {

protobuf {
protoc {
artifact = "com.google.protobuf:protoc:3.4.0"
artifact = "com.google.protobuf:protoc:3.6.1"
}
}

Expand Down Expand Up @@ -130,7 +129,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
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any reason to stay so low? 4.10.2 is latest

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that's just the current "least" version for build-tools 3.2.0.

distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
Expand Down