Mirrors/tachiyomi
2
0
Fork 0
mirror of https://github.com/tachiyomiorg/tachiyomi.git synced 2024-12-23 15:21:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Upgrading bunch of libraries

Browse Source 
gradle -> 4.2.2
appcompat -> 1.3.0
material -> 1.4.0
recyclerview -> 1.2.1
core-ktx -> 1.6.0
kotlin serialization -> 1.2.1
conductor-support-preference -> upstream 3.0.0
firebase -> 19.0.0
junit -> 4.13.2
conscrypt -> 2.5.2
This commit is contained in:
Jays2Kings 2021-07-04 14:27:28 -04:00
parent 3a6507101a
commit a8a23c153d
3 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
app/build.gradle.kts
View File

@ -95,22 +95,22 @@ dependencies {
implementation("tachiyomi.sourceapi:source-api:1.1")
// Android X libraries
implementation("androidx.appcompat:appcompat:1.3.0-rc01")
implementation("androidx.appcompat:appcompat:1.3.0")
implementation("androidx.cardview:cardview:1.0.0")
implementation("com.google.android.material:material:1.4.0-beta01")
implementation("androidx.recyclerview:recyclerview:1.2.0")
implementation("com.google.android.material:material:1.4.0")
implementation("androidx.recyclerview:recyclerview:1.2.1")
implementation("androidx.preference:preference:1.1.1")
implementation("androidx.annotation:annotation:1.2.0")
implementation("androidx.browser:browser:1.3.0")
implementation("androidx.biometric:biometric:1.1.0")
implementation("androidx.palette:palette:1.0.0")
implementation("androidx.core:core-ktx:1.5.0")
implementation("androidx.core:core-ktx:1.6.0")
implementation("androidx.constraintlayout:constraintlayout:2.0.4")
implementation("androidx.multidex:multidex:2.0.1")
implementation("com.google.firebase:firebase-core:18.0.3")
implementation("com.google.firebase:firebase-core:19.0.0")
val lifecycleVersion = "2.2.0"
implementation("androidx.lifecycle:lifecycle-extensions:$lifecycleVersion")
@ -159,9 +159,10 @@ dependencies {
implementation(kotlin("reflect", version = Versions.kotlin))
// JSON
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:${Versions.kotlinSerialization}")
implementation("org.jetbrains.kotlinx:kotlinx-serialization-protobuf:${Versions.kotlinSerialization}")
implementation("com.google.code.gson:gson:2.8.6")
val kotlinSerialization = "1.2.1"
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:${kotlinSerialization}")
implementation("org.jetbrains.kotlinx:kotlinx-serialization-protobuf:${kotlinSerialization}")
implementation("com.google.code.gson:gson:2.8.7")
implementation("com.github.salomonbrys.kotson:kotson:2.5.0")
// JavaScript engine
@ -229,7 +230,7 @@ dependencies {
// Conductor
val conductorVersion = "3.0.0"
implementation("com.bluelinelabs:conductor:$conductorVersion")
implementation("com.github.jays2kings:conductor-support-preference:3.0.0")
implementation("com.github.tachiyomiorg:conductor-support-preference:$conductorVersion")
// RxBindings
implementation("com.jakewharton.rxbinding:rxbinding-kotlin:${Versions.RX_BINDING}")
@ -238,8 +239,8 @@ dependencies {
implementation("com.jakewharton.rxbinding:rxbinding-recyclerview-v7-kotlin:${Versions.RX_BINDING}")
// Tests
testImplementation("junit:junit:4.13")
testImplementation("org.assertj:assertj-core:3.12.2")
testImplementation("junit:junit:4.13.2")
testImplementation("org.assertj:assertj-core:3.16.1")
testImplementation("org.mockito:mockito-core:1.10.19")
testImplementation("org.robolectric:robolectric:${Versions.ROBO_ELECTRIC}")
@ -260,7 +261,7 @@ dependencies {
implementation("com.google.android.gms:play-services-oss-licenses:${Versions.OSS_LICENSE}")
// TLS 1.3 support for Android < 10
implementation("org.conscrypt:conscrypt-android:2.4.0")
implementation("org.conscrypt:conscrypt-android:2.5.2")
}

2
build.gradle.kts
View File

@ -23,7 +23,7 @@ subprojects {
buildscript {
dependencies {
classpath(LegacyPluginClassPath.fireBaseCrashlytics)
classpath(LegacyPluginClassPath.androidGradlePlugin)
classpath("com.android.tools.build:gradle:4.2.2")
classpath(LegacyPluginClassPath.googleServices)
classpath(LegacyPluginClassPath.kotlinPlugin)
classpath(LegacyPluginClassPath.aboutLibraries)

4
buildSrc/src/main/kotlin/Dependencies.kt
View File

@ -18,7 +18,6 @@ object Versions {
const val androidCardView = "1.0.0"
const val androidConstraintLayout = "1.1.3"
const val androidCoreKtx = "1.3.1"
const val androidGradlePlugin = "4.2.1"
const val androidLifecycle = "2.2.0"
const val androidMaterial = "1.1.0"
const val androidMultiDex = "2.0.1"
@ -50,8 +49,6 @@ object Versions {
const val jsoup = "1.13.1"
const val junit = "4.13"
const val kotlin = "1.5.10"
const val kotlinCoroutines = "1.3.9"
const val kotlinSerialization = "1.1.0"
const val kotson = "2.5.0"
const val ktlint = "9.4.0"
const val loadingButton = "2.2.0"
@ -92,7 +89,6 @@ object Versions {
object LegacyPluginClassPath {
const val aboutLibraries = "com.google.android.gms:oss-licenses-plugin:${Versions.aboutLibraries}"
const val androidGradlePlugin = "com.android.tools.build:gradle:${Versions.androidGradlePlugin}"
const val googleServices = "com.google.gms:google-services:${Versions.googleServices}"
const val kotlinPlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}"
const val kotlinSerializations = "org.jetbrains.kotlin:kotlin-serialization:${Versions.kotlin}"