Skip to content

Commit 9fe5c68

Browse files
committed
build(deps): upgrade gradle and android plugin to latest stable
1 parent e21296f commit 9fe5c68

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
#Tue May 12 20:24:09 CEST 2020
12
distributionBase=GRADLE_USER_HOME
23
distributionPath=wrapper/dists
34
zipStoreBase=GRADLE_USER_HOME
45
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.4-all.zip

test-app/app/build.gradle

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -778,6 +778,9 @@ task buildMetadata(type: BuildToolTask) {
778778

779779
outputs.files("$METADATA_OUT_PATH/treeNodeStream.dat", "$METADATA_OUT_PATH/treeStringsStream.dat", "$METADATA_OUT_PATH/treeValueStream.dat")
780780

781+
workingDir "$BUILD_TOOLS_PATH"
782+
main "-jar"
783+
781784
doFirst {
782785
// get compiled classes to pass to metadata generator
783786
// these need to be called after the classes have compiled
@@ -812,9 +815,6 @@ task buildMetadata(type: BuildToolTask) {
812815
generatedClasses.each { out.println it }
813816
}
814817

815-
workingDir "$BUILD_TOOLS_PATH"
816-
main "-jar"
817-
818818
setOutputs outLogger
819819

820820
def paramz = new ArrayList<String>()
@@ -840,13 +840,12 @@ task generateTypescriptDefinitions(type: BuildToolTask) {
840840
def paramz = new ArrayList<String>()
841841
def includeDirs = ["com.android.support", "/platforms/" + android.compileSdkVersion]
842842

843+
workingDir "$BUILD_TOOLS_PATH"
844+
main "-jar"
845+
843846
doFirst {
844847
delete "$TYPINGS_PATH"
845848

846-
workingDir "$BUILD_TOOLS_PATH"
847-
848-
main "-jar"
849-
850849
paramz.add("dts-generator.jar")
851850
paramz.add("-input")
852851

test-app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ buildscript {
1919
jcenter()
2020
}
2121
dependencies {
22-
classpath 'com.android.tools.build:gradle:3.5.3'
22+
classpath 'com.android.tools.build:gradle:3.6.3'
2323
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
2424
}
2525
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Mon Aug 26 10:52:45 EEST 2019
1+
#Tue May 12 21:42:57 CEST 2020
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.4-all.zip

0 commit comments

Comments
 (0)