diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 0b4b193be..bb4a05a8f 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -78,10 +78,7 @@ dependencies { implementation("com.github.topjohnwu:indeterminate-checkbox:1.0.7") implementation("com.github.topjohnwu:lz4-java:1.7.1") implementation("com.jakewharton.timber:timber:4.7.1") - - val vBC = "1.69" - implementation("org.bouncycastle:bcprov-jdk15on:${vBC}") - implementation("org.bouncycastle:bcpkix-jdk15on:${vBC}") + implementation("org.bouncycastle:bcpkix-jdk15on:1.70") val vBAdapt = "4.0.0" val bindingAdapter = "me.tatarka.bindingcollectionadapter2:bindingcollectionadapter" @@ -104,15 +101,15 @@ dependencies { implementation("com.squareup.retrofit2:converter-moshi:${vRetrofit}") implementation("com.squareup.retrofit2:converter-scalars:${vRetrofit}") - val vOkHttp = "4.9.2" + val vOkHttp = "4.9.3" implementation("com.squareup.okhttp3:okhttp:${vOkHttp}") implementation("com.squareup.okhttp3:logging-interceptor:${vOkHttp}") - val vMoshi = "1.12.0" + val vMoshi = "1.13.0" implementation("com.squareup.moshi:moshi:${vMoshi}") kapt("com.squareup.moshi:moshi-kotlin-codegen:${vMoshi}") - val vRoom = "2.3.0" + val vRoom = "2.4.0-rc01" implementation("androidx.room:room-runtime:${vRoom}") implementation("androidx.room:room-ktx:${vRoom}") kapt("androidx.room:room-compiler:${vRoom}") @@ -124,7 +121,7 @@ dependencies { implementation("androidx.biometric:biometric:1.1.0") implementation("androidx.constraintlayout:constraintlayout:2.1.2") implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0") - implementation("androidx.browser:browser:1.4.0") + implementation("androidx.appcompat:appcompat:1.4.0") implementation("androidx.preference:preference:1.1.1") implementation("androidx.recyclerview:recyclerview:1.2.1") implementation("androidx.fragment:fragment-ktx:1.4.0") diff --git a/app/shared/build.gradle.kts b/app/shared/build.gradle.kts index ce53671e1..576bd3ad4 100644 --- a/app/shared/build.gradle.kts +++ b/app/shared/build.gradle.kts @@ -11,5 +11,5 @@ android { } dependencies { - api("io.michaelrocks:paranoid-core:0.3.5") + api("io.michaelrocks:paranoid-core:0.3.7") } diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 72a964ba8..a772cd3d9 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -16,9 +16,9 @@ gradlePlugin { } dependencies { - implementation(kotlin("gradle-plugin", "1.5.31")) + implementation(kotlin("gradle-plugin", "1.6.0")) implementation("com.android.tools.build:gradle:7.0.4") implementation("androidx.navigation:navigation-safe-args-gradle-plugin:2.4.0-beta02") - implementation("io.michaelrocks:paranoid-gradle-plugin:0.3.5") + implementation("io.michaelrocks:paranoid-gradle-plugin:0.3.7") implementation("org.eclipse.jgit:org.eclipse.jgit:5.12.0.202106070339-r") } diff --git a/gradle.properties b/gradle.properties index 1900df163..5f8343943 100644 --- a/gradle.properties +++ b/gradle.properties @@ -22,12 +22,9 @@ org.gradle.caching=true # Android android.useAndroidX=true -android.enableJetifier=false android.enableR8.fullMode=true android.databinding.incremental=true - android.injected.testOnly=false -kapt.incremental.apt=true # Magisk magisk.stubVersion=22 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 517110a2f..fbce071a3 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Wed Apr 14 22:32:11 PDT 2021 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip