From 523f2afc5389ab0bf69792d6f823a32e86f92512 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Sun, 31 May 2020 13:12:15 +0530 Subject: build: Upgrade all dependencies (#803) * build: upgrade all dependencies We've accumulated a fat backlog here that's gonna need some heavy testing * build: adjust for WhatTheStack upgrade This is now automatically initialized * build: downgrade security-crypto * build: upgrade to Gradle 6.4 * idea: sync from AS 4.1.x * build: bump AGP to 4.0.0 * build: disable Jetifier Signed-off-by: Harsh Shandilya Co-authored-by: Fabian Henneke --- .idea/jarRepositories.xml | 30 ++++++++++++ app/build.gradle | 5 +- .../main/java/com/zeapo/pwdstore/Application.kt | 2 - build.gradle | 3 +- dependencies.gradle | 51 +++++++++++---------- gradle.properties | 2 +- gradle/wrapper/gradle-wrapper.jar | Bin 58694 -> 58910 bytes gradle/wrapper/gradle-wrapper.properties | 4 +- gradlew | 2 + gradlew.bat | 1 + 10 files changed, 67 insertions(+), 33 deletions(-) create mode 100644 .idea/jarRepositories.xml diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 00000000..eb2873e7 --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 2e203705..7be17e71 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,7 +22,7 @@ android { } } - viewBinding.enabled = true + buildFeatures.viewBinding = true defaultConfig { applicationId 'dev.msfjarvis.aps' @@ -107,12 +107,13 @@ dependencies { implementation deps.third_party.ssh_auth implementation deps.third_party.timber implementation deps.third_party.timberkt - implementation deps.third_party.whatthestack if (isSnapshot()) { implementation deps.third_party.leakcanary + implementation deps.third_party.whatthestack } else { debugImplementation deps.third_party.leakcanary + debugImplementation deps.third_party.whatthestack } // Testing-only dependencies diff --git a/app/src/main/java/com/zeapo/pwdstore/Application.kt b/app/src/main/java/com/zeapo/pwdstore/Application.kt index ec115639..b0c4eec0 100644 --- a/app/src/main/java/com/zeapo/pwdstore/Application.kt +++ b/app/src/main/java/com/zeapo/pwdstore/Application.kt @@ -13,7 +13,6 @@ import androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_YES import androidx.preference.PreferenceManager import com.github.ajalt.timberkt.Timber.DebugTree import com.github.ajalt.timberkt.Timber.plant -import com.haroldadmin.whatthestack.WhatTheStack import org.bouncycastle.jce.provider.BouncyCastleProvider import java.security.Security @@ -27,7 +26,6 @@ class Application : android.app.Application(), SharedPreferences.OnSharedPrefere prefs = PreferenceManager.getDefaultSharedPreferences(this) if (BuildConfig.ENABLE_DEBUG_FEATURES || prefs?.getBoolean("enable_debug_logging", false) == true) { plant(DebugTree()) - WhatTheStack(this).init() } prefs?.registerOnSharedPreferenceChangeListener(this) setNightMode() diff --git a/build.gradle b/build.gradle index fa9a99e9..c7393224 100644 --- a/build.gradle +++ b/build.gradle @@ -63,6 +63,7 @@ subprojects { } tasks.wrapper { + gradleVersion = "6.4" distributionType = Wrapper.DistributionType.ALL - distributionSha256Sum = "0f316a67b971b7b571dac7215dcf2591a30994b3450e0629925ffcfe2c68cc5c" + distributionSha256Sum = "d08f7e24d061910382c2fda9915e6ed42dd1480ae2e99211f92c70190cb697e0" } diff --git a/dependencies.gradle b/dependencies.gradle index 545a7426..381cbb08 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -11,64 +11,65 @@ ext.versions = [ ext.deps = [ gradle_plugin: [ - android: 'com.android.tools.build:gradle:3.6.3', + android: 'com.android.tools.build:gradle:4.0.0', kotlin: 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72', ], kotlin: [ coroutines: [ - android: 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.5', - core: 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.5', + android: 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.7', + core: 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.7', ], - stdlib8: 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.71' + stdlib8: 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72' ], androidx: [ - annotation: 'androidx.annotation:annotation:1.1.0', - activity_ktx: 'androidx.activity:activity-ktx:1.2.0-alpha03', - appcompat: 'androidx.appcompat:appcompat:1.2.0-beta01', + annotation: 'androidx.annotation:annotation:1.2.0-alpha01', + activity_ktx: 'androidx.activity:activity-ktx:1.2.0-alpha05', + appcompat: 'androidx.appcompat:appcompat:1.3.0-alpha01', biometric: 'androidx.biometric:biometric:1.0.1', - constraint_layout: 'androidx.constraintlayout:constraintlayout:2.0.0-beta4', - core_ktx: 'androidx.core:core-ktx:1.3.0-rc01', + constraint_layout: 'androidx.constraintlayout:constraintlayout:2.0.0-beta6', + core_ktx: 'androidx.core:core-ktx:1.4.0-alpha01', documentfile: 'androidx.documentfile:documentfile:1.0.1', - fragment_ktx: 'androidx.fragment:fragment-ktx:1.3.0-alpha03', - lifecycle_common: 'androidx.lifecycle:lifecycle-common-java8:2.3.0-alpha01', - lifecycle_livedata_ktx: 'androidx.lifecycle:lifecycle-livedata-ktx:2.3.0-alpha01', - lifecycle_viewmodel_ktx: 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.0-alpha01', + fragment_ktx: 'androidx.fragment:fragment-ktx:1.3.0-alpha05', + lifecycle_common: 'androidx.lifecycle:lifecycle-common-java8:2.3.0-alpha03', + lifecycle_livedata_ktx: 'androidx.lifecycle:lifecycle-livedata-ktx:2.3.0-alpha03', + lifecycle_viewmodel_ktx: 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.0-alpha03', local_broadcast_manager: 'androidx.localbroadcastmanager:localbroadcastmanager:1.1.0-alpha01', material: 'com.google.android.material:material:1.2.0-alpha06', preference: 'androidx.preference:preference:1.1.1', - recycler_view: 'androidx.recyclerview:recyclerview:1.2.0-alpha02', + recycler_view: 'androidx.recyclerview:recyclerview:1.2.0-alpha03', recycler_view_selection: 'androidx.recyclerview:recyclerview-selection:1.1.0-rc01', + // Frozen at 1.0.0-beta01 for the foreseeable future due to Tink and R8 interacting badly security: 'androidx.security:security-crypto:1.0.0-beta01', swiperefreshlayout: 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-rc01' ], third_party: [ + bouncycastle: 'org.bouncycastle:bcprov-jdk15on:1.65', commons_io: 'commons-io:commons-io:2.5', commons_codec: 'commons-codec:commons-codec:1.13', - fastscroll: 'me.zhanghai.android.fastscroll:library:1.1.3', + fastscroll: 'me.zhanghai.android.fastscroll:library:1.1.4', jsch: 'com.jcraft:jsch:0.1.55', jgit: 'org.eclipse.jgit:org.eclipse.jgit:3.7.1.201504261725-r', - sshj: 'com.hierynomus:sshj:0.29.0', - bouncycastle: 'org.bouncycastle:bcprov-jdk15on:1.65', - leakcanary: 'com.squareup.leakcanary:leakcanary-android:2.2', + leakcanary: 'com.squareup.leakcanary:leakcanary-android:2.3', openpgp_ktx: 'com.github.android-password-store:openpgp-ktx:2.0.0', + sshj: 'com.hierynomus:sshj:0.29.0', ssh_auth: 'org.sufficientlysecure:sshauthentication-api:1.0', timber: 'com.jakewharton.timber:timber:4.7.1', timberkt: 'com.github.ajalt:timberkt:1.5.1', - whatthestack: 'com.github.haroldadmin:WhatTheStack:0.0.1', + whatthestack: 'com.github.haroldadmin:WhatTheStack:0.0.2', ], testing: [ junit: 'junit:junit:4.13', - kotlin_test_junit: 'org.jetbrains.kotlin:kotlin-test-junit:1.3.71', + kotlin_test_junit: 'org.jetbrains.kotlin:kotlin-test-junit:1.3.72', androidx: [ - runner: 'androidx.test:runner:1.3.0-alpha05', - rules: 'androidx.test:rules:1.3.0-alpha05', - junit: 'androidx.test.ext:junit:1.1.2-alpha05', - espresso_core: 'androidx.test.espresso:espresso-core:3.3.0-alpha05', - espresso_intents: 'androidx.test.espresso:espresso-intents:3.3.0-alpha05' + runner: 'androidx.test:runner:1.3.0-beta02', + rules: 'androidx.test:rules:1.3.0-beta02', + junit: 'androidx.test.ext:junit:1.1.2-beta02', + espresso_core: 'androidx.test.espresso:espresso-core:3.3.0-beta02', + espresso_intents: 'androidx.test.espresso:espresso-intents:3.3.0-beta02' ] ] ] diff --git a/gradle.properties b/gradle.properties index d1ca41ca..604a659b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ # AndroidX -android.enableJetifier=true +android.enableJetifier=false android.useAndroidX=true # R8 Full mode diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 490fda85..62d4c053 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 6e06308f..d3ffac12 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=0f316a67b971b7b571dac7215dcf2591a30994b3450e0629925ffcfe2c68cc5c -distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip +distributionSha256Sum=d08f7e24d061910382c2fda9915e6ed42dd1480ae2e99211f92c70190cb697e0 +distributionUrl=https\://services.gradle.org/distributions/gradle-6.4-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 2fe81a7d..fbd7c515 100755 --- a/gradlew +++ b/gradlew @@ -82,6 +82,7 @@ esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then @@ -129,6 +130,7 @@ fi if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` # We build the pattern for arguments to be converted via cygpath diff --git a/gradlew.bat b/gradlew.bat index 9109989e..a9f778a7 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -84,6 +84,7 @@ set CMD_LINE_ARGS=%* set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + @rem Execute Gradle "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% -- cgit v1.2.3