Commit 1783420a authored by Mygod's avatar Mygod

Update dependencies

parent 70d509e1
// Top-level build file where you can add configuration options common to all sub-projects/modules. // Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins { plugins {
id("com.github.ben-manes.versions") version "0.29.0" id("com.github.ben-manes.versions") version "0.33.0"
} }
buildscript { buildscript {
...@@ -14,13 +14,15 @@ buildscript { ...@@ -14,13 +14,15 @@ buildscript {
} }
dependencies { dependencies {
val kotlinVersion = rootProject.extra.get("kotlinVersion").toString()
classpath(rootProject.extra.get("androidPlugin").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.android.gms:oss-licenses-plugin:0.10.2")
classpath("com.google.firebase:firebase-crashlytics-gradle:2.2.1") classpath("com.google.firebase:firebase-crashlytics-gradle:2.3.0")
classpath("com.google.gms:google-services:4.3.3") classpath("com.google.gms:google-services:4.3.4")
classpath("com.vanniktech:gradle-maven-publish-plugin:0.12.0") classpath("com.vanniktech:gradle-maven-publish-plugin:0.13.0")
classpath("gradle.plugin.org.mozilla.rust-android-gradle:plugin:0.8.3") classpath("gradle.plugin.org.mozilla.rust-android-gradle:plugin:0.8.3")
classpath("org.jetbrains.dokka:dokka-gradle-plugin:$kotlinVersion")
} }
} }
......
...@@ -11,7 +11,7 @@ import org.gradle.kotlin.dsl.getByName ...@@ -11,7 +11,7 @@ import org.gradle.kotlin.dsl.getByName
import org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions import org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions
import java.util.* import java.util.*
const val lifecycleVersion = "2.3.0-alpha07" const val lifecycleVersion = "2.3.0-beta01"
private val Project.android get() = extensions.getByName<BaseExtension>("android") private val Project.android get() = extensions.getByName<BaseExtension>("android")
......
...@@ -75,7 +75,7 @@ dependencies { ...@@ -75,7 +75,7 @@ dependencies {
api("androidx.appcompat:appcompat:1.2.0") api("androidx.appcompat:appcompat:1.2.0")
api("androidx.core:core-ktx:1.4.0-alpha01") 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-common-java8:$lifecycleVersion")
api("androidx.lifecycle:lifecycle-livedata-core-ktx:$lifecycleVersion") api("androidx.lifecycle:lifecycle-livedata-core-ktx:$lifecycleVersion")
api("androidx.preference:preference:1.1.1") api("androidx.preference:preference:1.1.1")
...@@ -86,9 +86,9 @@ dependencies { ...@@ -86,9 +86,9 @@ dependencies {
api("com.google.code.gson:gson:2.8.6") api("com.google.code.gson:gson:2.8.6")
api("com.google.firebase:firebase-analytics-ktx:17.5.0") 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-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("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-android:$coroutinesVersion")
api("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:$coroutinesVersion") api("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:$coroutinesVersion")
kapt("androidx.room:room-compiler:$roomVersion") kapt("androidx.room:room-compiler:$roomVersion")
......
Subproject commit 5af929004e3bef4d330de277de8a3fb32ce961b3 Subproject commit 988e69d4dab676df9a61daf692765c353f5eb6f9
...@@ -12,17 +12,17 @@ setupApp() ...@@ -12,17 +12,17 @@ setupApp()
android.defaultConfig.applicationId = "com.github.shadowsocks" android.defaultConfig.applicationId = "com.github.shadowsocks"
dependencies { dependencies {
val cameraxVersion = "1.0.0-beta08" val cameraxVersion = "1.0.0-beta10"
implementation("androidx.browser:browser:1.2.0") implementation("androidx.browser:browser:1.2.0")
implementation("androidx.camera:camera-camera2:$cameraxVersion") implementation("androidx.camera:camera-camera2:$cameraxVersion")
implementation("androidx.camera:camera-lifecycle:$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.constraintlayout:constraintlayout:2.0.1")
implementation("androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVersion") 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.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.takisoft.preferencex:preferencex-simplemenu:1.1.0")
implementation("com.twofortyfouram:android-plugin-api-for-locale:1.0.4") implementation("com.twofortyfouram:android-plugin-api-for-locale:1.0.4")
implementation("me.zhanghai.android.fastscroll:library:1.1.4") implementation("me.zhanghai.android.fastscroll:library:1.1.4")
......
...@@ -98,7 +98,7 @@ class ScannerActivity : AppCompatActivity(), ImageAnalysis.Analyzer { ...@@ -98,7 +98,7 @@ class ScannerActivity : AppCompatActivity(), ImageAnalysis.Analyzer {
CameraSelector.DEFAULT_BACK_CAMERA CameraSelector.DEFAULT_BACK_CAMERA
} else CameraSelector.DEFAULT_FRONT_CAMERA } else CameraSelector.DEFAULT_FRONT_CAMERA
val preview = Preview.Builder().build() val preview = Preview.Builder().build()
preview.setSurfaceProvider(findViewById<PreviewView>(R.id.barcode).createSurfaceProvider()) preview.setSurfaceProvider(findViewById<PreviewView>(R.id.barcode).surfaceProvider)
try { try {
cameraProvider.bindToLifecycle(this@ScannerActivity, selector, preview, imageAnalysis) cameraProvider.bindToLifecycle(this@ScannerActivity, selector, preview, imageAnalysis)
} catch (e: IllegalArgumentException) { } catch (e: IllegalArgumentException) {
......
...@@ -22,7 +22,7 @@ mavenPublish.targets.getByName("uploadArchives") { ...@@ -22,7 +22,7 @@ mavenPublish.targets.getByName("uploadArchives") {
} }
dependencies { 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 // https://android-developers.googleblog.com/2019/07/android-q-beta-5-update.html
api("androidx.drawerlayout:drawerlayout:1.1.1") api("androidx.drawerlayout:drawerlayout:1.1.1")
api("com.google.android.material:material:1.2.1") api("com.google.android.material:material:1.2.1")
......
rootProject.extra.apply { rootProject.extra.apply {
set("androidPlugin", "com.android.tools.build:gradle:4.1.0-rc02") set("androidPlugin", "com.android.tools.build:gradle:4.1.0-rc03")
set("kotlinVersion", "1.4.0") set("kotlinVersion", "1.4.10")
} }
repositories { repositories {
......
...@@ -12,5 +12,5 @@ setupApp() ...@@ -12,5 +12,5 @@ setupApp()
android.defaultConfig.applicationId = "com.github.shadowsocks.tv" android.defaultConfig.applicationId = "com.github.shadowsocks.tv"
dependencies { dependencies {
implementation("androidx.leanback:leanback-preference:1.1.0-alpha04") implementation("androidx.leanback:leanback-preference:1.1.0-alpha05")
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment