From 723acbf7673d51e40b443db75b658c08901fe289 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Thu, 4 Feb 2021 23:11:39 +0530 Subject: Miscellaneous cleanups and updates (#1302) * build: upgrade to Gradle 6.8.1 Signed-off-by: Harsh Shandilya * github: remove animation commands from PR workflow The emulator runner action handles this for us Signed-off-by: Harsh Shandilya * build: upgrade LeakCanary and WhatTheStack Signed-off-by: Harsh Shandilya --- .github/workflows/pull_request.yml | 3 --- buildSrc/src/main/java/BaseProjectConfig.kt | 4 ++-- buildSrc/src/main/java/Dependencies.kt | 6 +++--- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 3ac736a9..8a82f0b8 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -51,9 +51,6 @@ jobs: api-level: ${{ matrix.api-level }} target: default script: | - adb shell settings put global animator_duration_scale 0 - adb shell settings put global transition_animation_scale 0 - adb shell settings put global window_animation_scale 0 ./gradlew :app:connectedFreeDebugAndroidTest - name: (Fail-only) upload test report diff --git a/buildSrc/src/main/java/BaseProjectConfig.kt b/buildSrc/src/main/java/BaseProjectConfig.kt index 38cef288..a6384047 100644 --- a/buildSrc/src/main/java/BaseProjectConfig.kt +++ b/buildSrc/src/main/java/BaseProjectConfig.kt @@ -25,9 +25,9 @@ internal fun Project.configureForRootProject() { delete(rootProject.buildDir) } tasks.withType { - gradleVersion = "6.8-rc-4" + gradleVersion = "6.8.1" distributionType = Wrapper.DistributionType.ALL - distributionSha256Sum = "8bea06ceea02f8809a056553a9d9a200b95f11eaf15017ff6a819790070d2a29" + distributionSha256Sum = "3db89524a3981819ff28c3f979236c1274a726e146ced0c8a2020417f9bc0782" } configureBinaryCompatibilityValidator() } diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt index 7f1b223b..fd90863a 100644 --- a/buildSrc/src/main/java/Dependencies.kt +++ b/buildSrc/src/main/java/Dependencies.kt @@ -60,14 +60,14 @@ object Dependencies { const val fastscroll = "me.zhanghai.android.fastscroll:library:1.1.5" const val jgit = "org.eclipse.jgit:org.eclipse.jgit:3.7.1.201504261725-r" const val kotlin_result = "com.michael-bull.kotlin-result:kotlin-result:1.1.10" - const val leakcanary = "com.squareup.leakcanary:leakcanary-android:2.5" + const val leakcanary = "com.squareup.leakcanary:leakcanary-android:2.6" const val modern_android_prefs = "de.Maxr1998.android:modernpreferences:1.2.0-alpha1" - const val plumber = "com.squareup.leakcanary:plumber-android:2.5" + const val plumber = "com.squareup.leakcanary:plumber-android:2.6" const val sshj = "com.hierynomus:sshj:0.30.0" const val ssh_auth = "org.sufficientlysecure:sshauthentication-api:1.0" const val timber = "com.jakewharton.timber:timber:4.7.1" const val timberkt = "com.github.ajalt:timberkt:1.5.1" - const val whatthestack = "com.github.haroldadmin:WhatTheStack:0.2.0" + const val whatthestack = "com.github.haroldadmin:WhatTheStack:0.3.0" } object NonFree { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ea95e444..517ae0d4 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=8bea06ceea02f8809a056553a9d9a200b95f11eaf15017ff6a819790070d2a29 -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-rc-4-all.zip +distributionSha256Sum=3db89524a3981819ff28c3f979236c1274a726e146ced0c8a2020417f9bc0782 +distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.1-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -- cgit v1.2.3