From 76008532053bc9ed9f78684296d6fa20806e0267 Mon Sep 17 00:00:00 2001 From: Mygod Date: Tue, 26 Jan 2021 07:40:34 +0800 Subject: [PATCH] Update dependencies --- buildSrc/src/main/kotlin/Helpers.kt | 4 ++-- core/build.gradle.kts | 8 ++++---- gradle/wrapper/gradle-wrapper.properties | 2 +- mobile/build.gradle.kts | 4 ++-- repositories.gradle.kts | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/buildSrc/src/main/kotlin/Helpers.kt b/buildSrc/src/main/kotlin/Helpers.kt index 4de1ebd8cf..271ee3deab 100644 --- a/buildSrc/src/main/kotlin/Helpers.kt +++ b/buildSrc/src/main/kotlin/Helpers.kt @@ -11,7 +11,7 @@ import org.gradle.kotlin.dsl.getByName import org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions import java.util.* -const val lifecycleVersion = "2.3.0-beta01" +const val lifecycleVersion = "2.3.0-rc01" private val Project.android get() = extensions.getByName("android") @@ -67,7 +67,7 @@ fun Project.setupCore() { } ndkVersion = "21.3.6528147" } - dependencies.add("coreLibraryDesugaring", "com.android.tools:desugar_jdk_libs:1.0.9") + dependencies.add("coreLibraryDesugaring", "com.android.tools:desugar_jdk_libs:1.1.1") } private val abiCodes = mapOf("armeabi-v7a" to 1, "arm64-v8a" to 2, "x86" to 3, "x86_64" to 4) diff --git a/core/build.gradle.kts b/core/build.gradle.kts index f43a9fdc07..d59c1bea7e 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -64,13 +64,13 @@ tasks.clean.dependsOn("cargoClean") dependencies { val coroutinesVersion = "1.4.2" val roomVersion = "2.2.5" - val workVersion = "2.4.0" + val workVersion = "2.5.0-rc01" api(project(":plugin")) api("androidx.appcompat:appcompat:1.2.0") - api("androidx.core:core-ktx:1.5.0-alpha05") + api("androidx.core:core-ktx:1.5.0-beta01") - api("androidx.fragment:fragment-ktx:1.3.0-beta02") + api("androidx.fragment:fragment-ktx:1.3.0-rc01") api("androidx.lifecycle:lifecycle-common-java8:$lifecycleVersion") api("androidx.lifecycle:lifecycle-livedata-core-ktx:$lifecycleVersion") api("androidx.preference:preference:1.1.1") @@ -79,7 +79,7 @@ dependencies { api("androidx.work:work-gcm:$workVersion") api("com.google.android.gms:play-services-oss-licenses:17.0.0") api("com.google.code.gson:gson:2.8.6") - api("com.google.firebase:firebase-analytics-ktx:18.0.0") + api("com.google.firebase:firebase-analytics-ktx:18.0.1") api("com.google.firebase:firebase-crashlytics:17.3.0") api("com.jakewharton.timber:timber:4.7.1") api("dnsjava:dnsjava:3.3.1") diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 12d38de6a4..28ff446a21 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/mobile/build.gradle.kts b/mobile/build.gradle.kts index 7a4990b5a6..01de34b4e0 100644 --- a/mobile/build.gradle.kts +++ b/mobile/build.gradle.kts @@ -12,12 +12,12 @@ setupApp() android.defaultConfig.applicationId = "com.github.shadowsocks" dependencies { - val cameraxVersion = "1.0.0-beta12" + val cameraxVersion = "1.0.0-rc01" implementation("androidx.browser:browser:1.3.0") implementation("androidx.camera:camera-camera2:$cameraxVersion") implementation("androidx.camera:camera-lifecycle:$cameraxVersion") - implementation("androidx.camera:camera-view:1.0.0-alpha19") + implementation("androidx.camera:camera-view:1.0.0-alpha20") implementation("androidx.constraintlayout:constraintlayout:2.0.4") implementation("androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVersion") implementation("com.google.mlkit:barcode-scanning:16.1.0") diff --git a/repositories.gradle.kts b/repositories.gradle.kts index 5a9d1527e4..90979a169f 100644 --- a/repositories.gradle.kts +++ b/repositories.gradle.kts @@ -1,5 +1,5 @@ rootProject.extra.apply { - set("androidPlugin", "com.android.tools.build:gradle:4.1.1") + set("androidPlugin", "com.android.tools.build:gradle:4.1.2") set("kotlinVersion", "1.4.21") }