Skip to content

build(deps): upgrade gradle and android plugin to latest stable #1612

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

Merged
merged 2 commits into from
Jul 8, 2020
Merged

build(deps): upgrade gradle and android plugin to latest stable #1612

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9fe5c68
build(deps): upgrade gradle and android plugin to latest stable
rigor789 May 12, 2020
5a4980e
chore: update version numbers in package.json
rigor789 May 12, 2020
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
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#Tue May 12 20:24:09 CEST 2020
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.4-all.zip
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
"**/*"
],
"gradle": {
"version": "5.4.1",
"android": "3.5.3"
"version": "6.4",
"android": "3.6.3"
},
"android_ndk_version": "21"
}
13 changes: 6 additions & 7 deletions test-app/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -778,6 +778,9 @@ task buildMetadata(type: BuildToolTask) {

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

workingDir "$BUILD_TOOLS_PATH"
main "-jar"

doFirst {
// get compiled classes to pass to metadata generator
// these need to be called after the classes have compiled
Expand Down Expand Up @@ -812,9 +815,6 @@ task buildMetadata(type: BuildToolTask) {
generatedClasses.each { out.println it }
}

workingDir "$BUILD_TOOLS_PATH"
main "-jar"

setOutputs outLogger

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

workingDir "$BUILD_TOOLS_PATH"
main "-jar"

doFirst {
delete "$TYPINGS_PATH"

workingDir "$BUILD_TOOLS_PATH"

main "-jar"

paramz.add("dts-generator.jar")
paramz.add("-input")

Expand Down
2 changes: 1 addition & 1 deletion test-app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.5.3'
classpath 'com.android.tools.build:gradle:3.6.3'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
}
}
Expand Down
4 changes: 2 additions & 2 deletions test-app/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Mon Aug 26 10:52:45 EEST 2019
#Tue May 12 21:42:57 CEST 2020
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.4-all.zip