Skip to content

Commit

Permalink
Update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
Mygod committed Jan 25, 2021
1 parent 292b281 commit 7600853
Showing 5 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions buildSrc/src/main/kotlin/Helpers.kt
Original file line number Diff line number Diff line change
@@ -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<BaseExtension>("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)
8 changes: 4 additions & 4 deletions core/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -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")
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions mobile/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -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")
2 changes: 1 addition & 1 deletion repositories.gradle.kts
Original file line number Diff line number Diff line change
@@ -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")
}

0 comments on commit 7600853

Please sign in to comment.