From dbd6b8adc3fcc168412403c704a59a700354cd42 Mon Sep 17 00:00:00 2001 From: BreadFish64 Date: Tue, 29 Dec 2020 12:38:16 -0600 Subject: [PATCH 1/2] Update Bitrise build stages --- bitrise.yml | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/bitrise.yml b/bitrise.yml index d5a5cb1ab..e95157a17 100644 --- a/bitrise.yml +++ b/bitrise.yml @@ -42,8 +42,8 @@ workflows: The next change in your repository that matches any of your trigger map event will start **deploy** workflow. steps: - - cache-pull@2.0.1: {} - - script@1.1.5: + - cache-pull@2.4.0: {} + - script@1.1.6: title: Install newer cmake inputs: - content: |- @@ -52,7 +52,7 @@ workflows: sudo apt remove cmake -y sudo apt purge --auto-remove cmake -y sudo apt install ninja-build -y - version=3.10 + version=3.19 build=2 mkdir ~/temp cd ~/temp @@ -60,13 +60,13 @@ workflows: sudo mkdir /opt/cmake sudo sh cmake-$version.$build-Linux-x86_64.sh --prefix=/opt/cmake --skip-license --exclude-subdir envman add --key PATH --value "/opt/cmake/bin:$PATH" - - install-missing-android-tools@2.3.3: + - install-missing-android-tools@2.3.8: inputs: - gradlew_path: "$PROJECT_LOCATION/gradlew" - change-android-versioncode-and-versionname@1.1.1: inputs: - build_gradle_path: "$PROJECT_LOCATION/$MODULE/build.gradle" - - android-lint@0.9.5: + - android-lint@0.9.8: inputs: - project_location: "$PROJECT_LOCATION" - module: "$MODULE" @@ -76,19 +76,19 @@ workflows: - project_location: "$PROJECT_LOCATION" - module: "$MODULE" - variant: "$TEST_VARIANT" - - android-build@0.9.5: + - android-build@0.10.3: inputs: - project_location: "$PROJECT_LOCATION" - module: "$MODULE" - variant: "$BUILD_VARIANT" - sign-apk@1.2.3: run_if: '{{getenv "BITRISEIO_ANDROID_KEYSTORE_URL" | ne ""}}' - - deploy-to-bitrise-io@1.3.18: {} - - cache-push@2.0.5: {} + - deploy-to-bitrise-io@1.11.1: {} + - cache-push@2.4.1: {} primary: steps: - - cache-pull@2.0.1: {} - - script@1.1.5: + - cache-pull@2.4.0: {} + - script@1.1.6: title: Install newer cmake inputs: - content: |- @@ -97,7 +97,7 @@ workflows: sudo apt remove cmake -y sudo apt purge --auto-remove cmake -y sudo apt install ninja-build -y - version=3.10 + version=3.19 build=2 mkdir ~/temp cd ~/temp @@ -105,20 +105,20 @@ workflows: sudo mkdir /opt/cmake sudo sh cmake-$version.$build-Linux-x86_64.sh --prefix=/opt/cmake --skip-license --exclude-subdir envman add --key PATH --value "/opt/cmake/bin:$PATH" - - install-missing-android-tools@2.3.3: + - install-missing-android-tools@2.3.8: inputs: - gradlew_path: "$PROJECT_LOCATION/gradlew" - - android-lint@0.9.5: + - android-lint@0.9.8: inputs: - project_location: "$PROJECT_LOCATION" - module: "$MODULE" - variant: "$TEST_VARIANT" - - android-build@0.9.5: + - android-build@0.10.3: inputs: - variant: Debug - project_location: "$PROJECT_LOCATION" - - deploy-to-bitrise-io@1.3.18: {} - - cache-push@2.0.5: {} + - deploy-to-bitrise-io@1.11.1: {} + - cache-push@2.4.1: {} app: envs: - opts: From b3915c23a0b3f982907fa89924a92db91562280b Mon Sep 17 00:00:00 2001 From: BreadFish64 Date: Tue, 29 Dec 2020 13:21:44 -0600 Subject: [PATCH 2/2] Update Gradle --- src/android/build.gradle | 2 +- src/android/gradle/wrapper/gradle-wrapper.properties | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/android/build.gradle b/src/android/build.gradle index df75d6a52..3dc54b304 100644 --- a/src/android/build.gradle +++ b/src/android/build.gradle @@ -7,7 +7,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.2.1' + classpath 'com.android.tools.build:gradle:4.0.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/src/android/gradle/wrapper/gradle-wrapper.properties b/src/android/gradle/wrapper/gradle-wrapper.properties index fa4a78943..5e8c8d351 100644 --- a/src/android/gradle/wrapper/gradle-wrapper.properties +++ b/src/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Nov 09 14:15:11 CST 2018 +#Tue Dec 29 13:07:24 CST 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip