From 8dde9809bfa0a53ab50672947eb291405725eb07 Mon Sep 17 00:00:00 2001 From: Luna712 <142361265+Luna712@users.noreply.github.com> Date: Fri, 26 Jun 2026 18:15:21 -0600 Subject: [PATCH 1/2] Use androidx.core:core rather than -ktx version Starting in 1.19.0 the ktx version is deprecated. We can replace now anyway. Needs compileSdk 37 in order to bump to 1.19.0 though. --- app/build.gradle.kts | 4 ++-- gradle/libs.versions.toml | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 75a9698c8c4..fe7425693c0 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -216,7 +216,7 @@ dependencies { // Testing testImplementation(libs.junit) testImplementation(libs.json) - androidTestImplementation(libs.core) + androidTestImplementation(libs.androidx.test.core) androidTestImplementation(libs.espresso.core) androidTestImplementation(libs.ext.junit) androidTestImplementation(libs.instancio.core) @@ -224,8 +224,8 @@ dependencies { androidTestImplementation(libs.kotlin.test) // Android Core & Lifecycle - implementation(libs.core.ktx) implementation(libs.activity.ktx) + implementation(libs.androidx.core) implementation(libs.annotation) implementation(libs.appcompat) implementation(libs.fragment.ktx) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 99f1aca8046..e9cde9a645c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,6 +3,8 @@ [versions] activityKtx = "1.13.0" androidGradlePlugin = "9.1.1" +androidxCore = "1.18.0" +androidxTestCore = "1.7.0" animeDb = "1.0.2" annotation = "1.10.0" appcompat = "1.7.1" @@ -12,7 +14,6 @@ coil = { strictly = "3.3.0" } # Later versions require jvmTarget 11 or later colorpicker = "6b46b49" conscryptAndroid = { strictly = "2.5.2" } # 2.5.3 crashes everything constraintlayout = "2.2.1" -coreKtx = "1.18.0" cryptography = "0.6.0" desugar_jdk_libs_nio = "2.1.5" dokkaGradlePlugin = "2.2.0" @@ -67,6 +68,8 @@ versionName = "4.7.0" [libraries] activity-ktx = { module = "androidx.activity:activity-ktx", version.ref = "activityKtx" } +androidx-core = { module = "androidx.core:core", version.ref = "androidxCore" } +androidx-test-core = { module = "androidx.test:core", version.ref = "androidxTestCore" } anime-db = { module = "com.github.recloudstream:anime-db", version.ref = "animeDb" } annotation = { module = "androidx.annotation:annotation", version.ref = "annotation" } appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" } @@ -76,8 +79,6 @@ coil-network-okhttp = { module = "io.coil-kt.coil3:coil-network-okhttp", version colorpicker = { module = "com.github.recloudstream:color-picker-android", version.ref = "colorpicker" } conscrypt-android = { module = "org.conscrypt:conscrypt-android", version.ref = "conscryptAndroid" } constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "constraintlayout" } -core = { module = "androidx.test:core" } -core-ktx = { module = "androidx.core:core-ktx", version.ref = "coreKtx" } cryptography-core = { module = "dev.whyoleg.cryptography:cryptography-core", version.ref = "cryptography" } cryptography-provider-optimal = { module = "dev.whyoleg.cryptography:cryptography-provider-optimal", version.ref = "cryptography" } databinding = { module = "androidx.databinding:viewbinding", version.ref = "androidGradlePlugin" } From 22cee8fe042008a594cbe3a149e22a9c4db3760e Mon Sep 17 00:00:00 2001 From: Luna712 <142361265+Luna712@users.noreply.github.com> Date: Sat, 27 Jun 2026 11:08:39 -0600 Subject: [PATCH 2/2] Move more for clarity --- app/build.gradle.kts | 10 +++++----- gradle/libs.versions.toml | 17 ++++++++--------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index fe7425693c0..e693f5d166b 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -214,14 +214,14 @@ android { dependencies { // Testing - testImplementation(libs.junit) - testImplementation(libs.json) androidTestImplementation(libs.androidx.test.core) - androidTestImplementation(libs.espresso.core) - androidTestImplementation(libs.ext.junit) + androidTestImplementation(libs.androidx.test.espresso.core) + androidTestImplementation(libs.androidx.test.ext.junit) + androidTestImplementation(libs.androidx.test.ext.junit.ktx) androidTestImplementation(libs.instancio.core) - androidTestImplementation(libs.junit.ktx) androidTestImplementation(libs.kotlin.test) + testImplementation(libs.json) + testImplementation(libs.junit) // Android Core & Lifecycle implementation(libs.activity.ktx) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e9cde9a645c..386c9f853aa 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,6 +5,8 @@ activityKtx = "1.13.0" androidGradlePlugin = "9.1.1" androidxCore = "1.18.0" androidxTestCore = "1.7.0" +androidxTestEspressoCore = "3.7.0" +androidxTestExtJunit = "1.3.0" animeDb = "1.0.2" annotation = "1.10.0" appcompat = "1.7.1" @@ -17,15 +19,12 @@ constraintlayout = "2.2.1" cryptography = "0.6.0" desugar_jdk_libs_nio = "2.1.5" dokkaGradlePlugin = "2.2.0" -espressoCore = "3.7.0" fragmentKtx = "1.8.9" instancioCore = "5.6.0" jacksonModuleKotlin = { strictly = "2.13.1" } # Later versions don't support minSdk <26 (Crashes on Android TV's and FireSticks) json = "20260522" jsoup = "1.22.1" junit = "4.13.2" -junitKtx = "1.3.0" -junitVersion = "1.3.0" juniversalchardet = "2.5.0" kotlinGradlePlugin = "2.3.20" kotlinxAtomicfu = "0.33.0" @@ -70,6 +69,9 @@ versionName = "4.7.0" activity-ktx = { module = "androidx.activity:activity-ktx", version.ref = "activityKtx" } androidx-core = { module = "androidx.core:core", version.ref = "androidxCore" } androidx-test-core = { module = "androidx.test:core", version.ref = "androidxTestCore" } +androidx-test-espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "androidxTestEspressoCore" } +androidx-test-ext-junit = { module = "androidx.test.ext:junit", version.ref = "androidxTestExtJunit" } +androidx-test-ext-junit-ktx = { module = "androidx.test.ext:junit-ktx", version.ref = "androidxTestExtJunit" } anime-db = { module = "com.github.recloudstream:anime-db", version.ref = "animeDb" } annotation = { module = "androidx.annotation:annotation", version.ref = "annotation" } appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" } @@ -83,17 +85,14 @@ cryptography-core = { module = "dev.whyoleg.cryptography:cryptography-core", ver cryptography-provider-optimal = { module = "dev.whyoleg.cryptography:cryptography-provider-optimal", version.ref = "cryptography" } databinding = { module = "androidx.databinding:viewbinding", version.ref = "androidGradlePlugin" } desugar_jdk_libs_nio = { module = "com.android.tools:desugar_jdk_libs_nio", version.ref = "desugar_jdk_libs_nio" } -espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "espressoCore" } -ext-junit = { module = "androidx.test.ext:junit", version.ref = "junitVersion" } fragment-ktx = { module = "androidx.fragment:fragment-ktx", version.ref = "fragmentKtx" } -instancio-core = { group = "org.instancio", name = "instancio-core", version.ref = "instancioCore" } +instancio-core = { module = "org.instancio:instancio-core", version.ref = "instancioCore" } jackson-module-kotlin = { module = "com.fasterxml.jackson.module:jackson-module-kotlin", version.ref = "jacksonModuleKotlin" } json = { module = "org.json:json", version.ref = "json" } jsoup = { module = "org.jsoup:jsoup", version.ref = "jsoup" } junit = { module = "junit:junit", version.ref = "junit" } -junit-ktx = { module = "androidx.test.ext:junit-ktx", version.ref = "junitKtx" } juniversalchardet = { module = "com.github.albfernandez:juniversalchardet", version.ref = "juniversalchardet" } -kotlin-test = { group = "org.jetbrains.kotlin", name = "kotlin-test", version.ref = "kotlinGradlePlugin" } +kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlinGradlePlugin" } kotlinx-atomicfu = { module = "org.jetbrains.kotlinx:atomicfu", version.ref = "kotlinxAtomicfu" } kotlinx-collections-immutable = { module = "org.jetbrains.kotlinx:kotlinx-collections-immutable", version.ref = "kotlinxCollectionsImmutable" } kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinxCoroutinesCore" } @@ -107,7 +106,7 @@ material = { module = "com.google.android.material:material", version.ref = "mat media3-cast = { module = "androidx.media3:media3-cast", version.ref = "media3" } media3-common = { module = "androidx.media3:media3-common", version.ref = "media3" } media3-container = { module = "androidx.media3:media3-container", version.ref = "media3" } -media3-datasource-cronet = { group = "androidx.media3", name = "media3-datasource-cronet", version.ref = "media3" } +media3-datasource-cronet = { module = "androidx.media3:media3-datasource-cronet", version.ref = "media3" } media3-datasource-okhttp = { module = "androidx.media3:media3-datasource-okhttp", version.ref = "media3" } media3-exoplayer = { module = "androidx.media3:media3-exoplayer", version.ref = "media3" } media3-exoplayer-dash = { module = "androidx.media3:media3-exoplayer-dash", version.ref = "media3" }