Commit b873348b authored by Mygod's avatar Mygod

Update dependencies

Fixes #2699.
parent 3b9ea26d
// 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.36.0" id("com.github.ben-manes.versions") version "0.38.0"
} }
buildscript { buildscript {
...@@ -17,12 +17,12 @@ buildscript { ...@@ -17,12 +17,12 @@ buildscript {
val kotlinVersion = rootProject.extra["kotlinVersion"].toString() val kotlinVersion = rootProject.extra["kotlinVersion"].toString()
classpath(rootProject.extra["androidPlugin"].toString()) classpath(rootProject.extra["androidPlugin"].toString())
classpath(kotlin("gradle-plugin", kotlinVersion)) 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.4")
classpath("com.google.firebase:firebase-crashlytics-gradle:2.4.1") classpath("com.google.firebase:firebase-crashlytics-gradle:2.5.2")
classpath("com.google.gms:google-services:4.3.5") classpath("com.google.gms:google-services:4.3.5")
classpath("com.vanniktech:gradle-maven-publish-plugin:0.13.0") classpath("com.vanniktech:gradle-maven-publish-plugin:0.14.2")
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:1.4.20") classpath("org.jetbrains.dokka:dokka-gradle-plugin:1.4.30")
} }
} }
......
...@@ -46,7 +46,7 @@ fun Project.setupCommon() { ...@@ -46,7 +46,7 @@ fun Project.setupCommon() {
} }
dependencies { dependencies {
add("testImplementation", "junit:junit:4.13.1") add("testImplementation", "junit:junit:4.13.2")
add("androidTestImplementation", "androidx.test:runner:1.3.0") add("androidTestImplementation", "androidx.test:runner:1.3.0")
add("androidTestImplementation", "androidx.test.espresso:espresso-core:3.3.0") add("androidTestImplementation", "androidx.test.espresso:espresso-core:3.3.0")
} }
......
...@@ -64,14 +64,14 @@ tasks.clean.dependsOn("cargoClean") ...@@ -64,14 +64,14 @@ tasks.clean.dependsOn("cargoClean")
dependencies { dependencies {
val coroutinesVersion = "1.4.2" val coroutinesVersion = "1.4.2"
val roomVersion = "2.2.6" val roomVersion = "2.3.0-rc01"
val workVersion = "2.5.0" val workVersion = "2.5.0"
api(project(":plugin")) api(project(":plugin"))
api("androidx.appcompat:appcompat:1.2.0") api("androidx.appcompat:appcompat:1.2.0")
api("androidx.core:core-ktx:1.5.0-beta01") api("androidx.core:core-ktx:1.5.0-rc01")
api("androidx.fragment:fragment-ktx:1.3.0-rc02") api("androidx.fragment:fragment-ktx:1.3.2")
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")
...@@ -80,8 +80,8 @@ dependencies { ...@@ -80,8 +80,8 @@ dependencies {
api("androidx.work:work-runtime-ktx:$workVersion") api("androidx.work:work-runtime-ktx:$workVersion")
api("com.google.android.gms:play-services-oss-licenses:17.0.0") api("com.google.android.gms:play-services-oss-licenses:17.0.0")
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:18.0.2") api("com.google.firebase:firebase-analytics-ktx:18.0.3")
api("com.google.firebase:firebase-crashlytics:17.3.1") api("com.google.firebase:firebase-crashlytics:17.4.1")
api("com.jakewharton.timber:timber:4.7.1") api("com.jakewharton.timber:timber:4.7.1")
api("dnsjava:dnsjava:3.3.1") api("dnsjava:dnsjava:3.3.1")
api("org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion") api("org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion")
......
Subproject commit fff5600d027e74d7cf51bd93c0b7833b789f281e Subproject commit f805b5d3503e5ca0f85c22dabdeac3341618ec86
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
...@@ -12,12 +12,12 @@ setupApp() ...@@ -12,12 +12,12 @@ setupApp()
android.defaultConfig.applicationId = "com.github.shadowsocks" android.defaultConfig.applicationId = "com.github.shadowsocks"
dependencies { dependencies {
val cameraxVersion = "1.0.0-rc02" val cameraxVersion = "1.0.0-rc04"
implementation("androidx.browser:browser:1.3.0") implementation("androidx.browser:browser:1.3.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-alpha21") implementation("androidx.camera:camera-view:1.0.0-alpha23")
implementation("androidx.constraintlayout:constraintlayout:2.0.4") implementation("androidx.constraintlayout:constraintlayout:2.0.4")
implementation("androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVersion") implementation("androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVersion")
implementation("com.google.mlkit:barcode-scanning:16.1.1") implementation("com.google.mlkit:barcode-scanning:16.1.1")
......
rootProject.extra.apply { rootProject.extra.apply {
set("androidPlugin", "com.android.tools.build:gradle:4.1.2") set("androidPlugin", "com.android.tools.build:gradle:4.2.0-rc01")
set("kotlinVersion", "1.4.30") set("kotlinVersion", "1.4.32")
} }
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-beta01") implementation("androidx.leanback:leanback-preference:1.1.0-rc01")
} }
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