diff --git a/build.gradle.kts b/build.gradle.kts index 345df6ce5b..4c623c3449 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id("com.github.ben-manes.versions") version "0.29.0" + id("com.github.ben-manes.versions") version "0.33.0" } buildscript { @@ -14,13 +14,15 @@ buildscript { } dependencies { + val kotlinVersion = rootProject.extra.get("kotlinVersion").toString() classpath(rootProject.extra.get("androidPlugin").toString()) - classpath(kotlin("gradle-plugin", rootProject.extra.get("kotlinVersion").toString())) + classpath(kotlin("gradle-plugin", kotlinVersion)) classpath("com.google.android.gms:oss-licenses-plugin:0.10.2") - classpath("com.google.firebase:firebase-crashlytics-gradle:2.2.1") - classpath("com.google.gms:google-services:4.3.3") - classpath("com.vanniktech:gradle-maven-publish-plugin:0.12.0") + classpath("com.google.firebase:firebase-crashlytics-gradle:2.3.0") + classpath("com.google.gms:google-services:4.3.4") + classpath("com.vanniktech:gradle-maven-publish-plugin:0.13.0") classpath("gradle.plugin.org.mozilla.rust-android-gradle:plugin:0.8.3") + classpath("org.jetbrains.dokka:dokka-gradle-plugin:$kotlinVersion") } } diff --git a/buildSrc/src/main/kotlin/Helpers.kt b/buildSrc/src/main/kotlin/Helpers.kt index 841ab860a1..a5e5740276 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-alpha07" +const val lifecycleVersion = "2.3.0-beta01" private val Project.android get() = extensions.getByName("android") diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 9bdc4da34b..ba6322e525 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -75,7 +75,7 @@ dependencies { api("androidx.appcompat:appcompat:1.2.0") api("androidx.core:core-ktx:1.4.0-alpha01") - api("androidx.fragment:fragment-ktx:1.3.0-alpha08") + api("androidx.fragment:fragment-ktx:1.3.0-beta01") api("androidx.lifecycle:lifecycle-common-java8:$lifecycleVersion") api("androidx.lifecycle:lifecycle-livedata-core-ktx:$lifecycleVersion") api("androidx.preference:preference:1.1.1") @@ -86,9 +86,9 @@ dependencies { api("com.google.code.gson:gson:2.8.6") api("com.google.firebase:firebase-analytics-ktx:17.5.0") api("com.google.firebase:firebase-config-ktx:19.2.0") - api("com.google.firebase:firebase-crashlytics:17.2.1") + api("com.google.firebase:firebase-crashlytics:17.2.2") api("com.jakewharton.timber:timber:4.7.1") - api("dnsjava:dnsjava:3.2.2") + api("dnsjava:dnsjava:3.3.0") api("org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion") api("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:$coroutinesVersion") kapt("androidx.room:room-compiler:$roomVersion") diff --git a/core/src/main/rust/shadowsocks-rust b/core/src/main/rust/shadowsocks-rust index 5af929004e..988e69d4da 160000 --- a/core/src/main/rust/shadowsocks-rust +++ b/core/src/main/rust/shadowsocks-rust @@ -1 +1 @@ -Subproject commit 5af929004e3bef4d330de277de8a3fb32ce961b3 +Subproject commit 988e69d4dab676df9a61daf692765c353f5eb6f9 diff --git a/mobile/build.gradle.kts b/mobile/build.gradle.kts index 860465e169..7399805680 100644 --- a/mobile/build.gradle.kts +++ b/mobile/build.gradle.kts @@ -12,17 +12,17 @@ setupApp() android.defaultConfig.applicationId = "com.github.shadowsocks" dependencies { - val cameraxVersion = "1.0.0-beta08" + val cameraxVersion = "1.0.0-beta10" implementation("androidx.browser:browser:1.2.0") implementation("androidx.camera:camera-camera2:$cameraxVersion") implementation("androidx.camera:camera-lifecycle:$cameraxVersion") - implementation("androidx.camera:camera-view:1.0.0-alpha15") + implementation("androidx.camera:camera-view:1.0.0-alpha17") implementation("androidx.constraintlayout:constraintlayout:2.0.1") implementation("androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVersion") - implementation("com.google.firebase:firebase-ads:19.3.0") + implementation("com.google.firebase:firebase-ads:19.4.0") implementation("com.google.mlkit:barcode-scanning:16.0.3") - implementation("com.google.zxing:core:3.4.0") + implementation("com.google.zxing:core:3.4.1") implementation("com.takisoft.preferencex:preferencex-simplemenu:1.1.0") implementation("com.twofortyfouram:android-plugin-api-for-locale:1.0.4") implementation("me.zhanghai.android.fastscroll:library:1.1.4") diff --git a/mobile/src/main/java/com/github/shadowsocks/ScannerActivity.kt b/mobile/src/main/java/com/github/shadowsocks/ScannerActivity.kt index 5b63f6c1d1..1dd3fa8a78 100644 --- a/mobile/src/main/java/com/github/shadowsocks/ScannerActivity.kt +++ b/mobile/src/main/java/com/github/shadowsocks/ScannerActivity.kt @@ -98,7 +98,7 @@ class ScannerActivity : AppCompatActivity(), ImageAnalysis.Analyzer { CameraSelector.DEFAULT_BACK_CAMERA } else CameraSelector.DEFAULT_FRONT_CAMERA val preview = Preview.Builder().build() - preview.setSurfaceProvider(findViewById(R.id.barcode).createSurfaceProvider()) + preview.setSurfaceProvider(findViewById(R.id.barcode).surfaceProvider) try { cameraProvider.bindToLifecycle(this@ScannerActivity, selector, preview, imageAnalysis) } catch (e: IllegalArgumentException) { diff --git a/plugin/build.gradle.kts b/plugin/build.gradle.kts index 735968814b..4abbcd5274 100644 --- a/plugin/build.gradle.kts +++ b/plugin/build.gradle.kts @@ -22,7 +22,7 @@ mavenPublish.targets.getByName("uploadArchives") { } dependencies { - api("androidx.core:core-ktx:1.3.1") + api("androidx.core:core-ktx:1.3.2") // https://android-developers.googleblog.com/2019/07/android-q-beta-5-update.html api("androidx.drawerlayout:drawerlayout:1.1.1") api("com.google.android.material:material:1.2.1") diff --git a/repositories.gradle.kts b/repositories.gradle.kts index 5dac068384..f201578491 100644 --- a/repositories.gradle.kts +++ b/repositories.gradle.kts @@ -1,6 +1,6 @@ rootProject.extra.apply { - set("androidPlugin", "com.android.tools.build:gradle:4.1.0-rc02") - set("kotlinVersion", "1.4.0") + set("androidPlugin", "com.android.tools.build:gradle:4.1.0-rc03") + set("kotlinVersion", "1.4.10") } repositories { diff --git a/tv/build.gradle.kts b/tv/build.gradle.kts index 97881d7b44..21ab493f57 100644 --- a/tv/build.gradle.kts +++ b/tv/build.gradle.kts @@ -12,5 +12,5 @@ setupApp() android.defaultConfig.applicationId = "com.github.shadowsocks.tv" dependencies { - implementation("androidx.leanback:leanback-preference:1.1.0-alpha04") + implementation("androidx.leanback:leanback-preference:1.1.0-alpha05") }