Updated Stale Dependencies

.github/workflows/gradle-wrapper-validation.yml

@@ -15,5 +15,5 @@ jobs:
       - name: Checkout latest code
         uses: actions/checkout@v4.1.1
       - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v1
+        uses: gradle/actions/wrapper-validation@v4
 

app/build.gradle.kts

@@ -1,4 +1,5 @@
 import com.google.firebase.crashlytics.buildtools.gradle.CrashlyticsExtension
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.konan.properties.Properties
 
 plugins {
@@ -18,7 +19,7 @@ android {
 
     defaultConfig {
         minSdk = libs.versions.min.sdk.version.get().toInt()
-        targetSdk = libs.versions.compile.sdk.version.get().toInt()
+        targetSdk = libs.versions.target.sdk.version.get().toInt()
         namespace = "dev.simonas.quies"
 
         applicationId = AppCoordinates.APP_ID
@@ -38,13 +39,6 @@ android {
         sourceCompatibility = JavaVersion.VERSION_21
         targetCompatibility = JavaVersion.VERSION_21
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
-    }
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_21.toString()
-        freeCompilerArgs = listOf("-Xcontext-receivers")
-    }
     signingConfigs {
         getByName("debug") {
             keyAlias = "androiddebugkey"
@@ -105,6 +99,13 @@ android {
     }
 }
 
+kotlin {
+    compilerOptions {
+        jvmTarget = JvmTarget.JVM_21
+        freeCompilerArgs.add("-Xcontext-receivers")
+    }
+}
+
 dependencies {
     implementation(libs.androidx.activity.compose)
     implementation(libs.androidx.appcompat)
@@ -127,6 +128,7 @@ dependencies {
     implementation(libs.hilt.navigation.compose)
     implementation(libs.javapoet)
     implementation(libs.kotlin.math)
+    implementation(platform(libs.compose.bom))
     implementation(platform(libs.firebase.bom))
     implementation(project(":data"))
     implementation(libs.datastore)
@@ -147,6 +149,7 @@ dependencies {
     testImplementation(libs.turbine)
     testImplementation(libs.truth)
 
+    androidTestImplementation(platform(libs.compose.bom))
     androidTestImplementation(libs.hilt.android)
     androidTestImplementation(libs.androidx.test.ext.junit)
     androidTestImplementation(libs.androidx.test.ext.junit.ktx)

app/lint-baseline.xml

@@ -1,4 +1,103 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.1.4" type="baseline" client="gradle" dependencies="false" name="AGP (8.1.4)" variant="all" version="8.1.4">
+<issues format="6" by="lint 8.13.0" type="baseline" client="gradle" dependencies="false" name="AGP (8.13.0)" variant="all" version="8.13.0">
+
+    <issue
+        id="ConfigurationScreenWidthHeight"
+        message="Using Configuration.screenHeightDp instead of LocalWindowInfo.current.containerSize"
+        errorLine1="    return LocalConfiguration.current.screenHeightDp.dp + top + bottom"
+        errorLine2="           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/dev/simonas/quies/utils/ComposeKtx.kt"
+            line="39"
+            column="12"/>
+    </issue>
+
+    <issue
+        id="UseOfNonLambdaOffsetOverload"
+        message="State backed values should use the lambda overload of Modifier.offset"
+        errorLine1="            .offset("
+        errorLine2="             ~~~~~~">
+        <location
+            file="src/main/java/dev/simonas/quies/card/CardScreen.kt"
+            line="336"
+            column="14"/>
+    </issue>
+
+    <issue
+        id="UseOfNonLambdaOffsetOverload"
+        message="State backed values should use the lambda overload of Modifier.offset"
+        errorLine1="            .offset(x = ((470 + 64 + (128 - 128 * showCloseQuestionAnimation)) * (1 - closeCardAnim)).dp),"
+        errorLine2="             ~~~~~~">
+        <location
+            file="src/main/java/dev/simonas/quies/card/CardScreen.kt"
+            line="349"
+            column="14"/>
+    </issue>
+
+    <issue
+        id="UseOfNonLambdaOffsetOverload"
+        message="State backed values should use the lambda overload of Modifier.offset"
+        errorLine1="            .offset(x = ((470 + 64) - (470 + 64) * level1Anim).dp)"
+        errorLine2="             ~~~~~~">
+        <location
+            file="src/main/java/dev/simonas/quies/card/CardScreen.kt"
+            line="446"
+            column="14"/>
+    </issue>
+
+    <issue
+        id="UseOfNonLambdaOffsetOverload"
+        message="State backed values should use the lambda overload of Modifier.offset"
+        errorLine1="                    it.offset(x = (128 * (1 - startupAnimation) + 128 * pickedCardAnim).dp)"
+        errorLine2="                       ~~~~~~">
+        <location
+            file="src/main/java/dev/simonas/quies/card/CardScreen.kt"
+            line="449"
+            column="24"/>
+    </issue>
+
+    <issue
+        id="UseOfNonLambdaOffsetOverload"
+        message="State backed values should use the lambda overload of Modifier.offset"
+        errorLine1="            .offset(x = ((470 + 64) - (470 + 64) * level2Anim).dp)"
+        errorLine2="             ~~~~~~">
+        <location
+            file="src/main/java/dev/simonas/quies/card/CardScreen.kt"
+            line="479"
+            column="14"/>
+    </issue>
+
+    <issue
+        id="UseOfNonLambdaOffsetOverload"
+        message="State backed values should use the lambda overload of Modifier.offset"
+        errorLine1="                    it.offset(x = (128 * (1 - startupAnimation) + 128 * pickedCardAnim).dp)"
+        errorLine2="                       ~~~~~~">
+        <location
+            file="src/main/java/dev/simonas/quies/card/CardScreen.kt"
+            line="482"
+            column="24"/>
+    </issue>
+
+    <issue
+        id="UseOfNonLambdaOffsetOverload"
+        message="State backed values should use the lambda overload of Modifier.offset"
+        errorLine1="            .offset(x = ((470 + 64) - (470 + 64) * level3Anim).dp)"
+        errorLine2="             ~~~~~~">
+        <location
+            file="src/main/java/dev/simonas/quies/card/CardScreen.kt"
+            line="512"
+            column="14"/>
+    </issue>
+
+    <issue
+        id="UseOfNonLambdaOffsetOverload"
+        message="State backed values should use the lambda overload of Modifier.offset"
+        errorLine1="                    it.offset(x = (128 * (1 - startupAnimation) + 128 * pickedCardAnim).dp)"
+        errorLine2="                       ~~~~~~">
+        <location
+            file="src/main/java/dev/simonas/quies/card/CardScreen.kt"
+            line="515"
+            column="24"/>
+    </issue>
 
 </issues>

app/src/androidTest/java/dev/simonas/quies/UITest.kt

@@ -11,7 +11,6 @@ import dev.simonas.quies.storage.Store
 import dev.simonas.quies.utils.instrumentationExec
 import javax.inject.Inject
 import kotlinx.coroutines.runBlocking
-import kotlinx.coroutines.test.TestCoroutineDispatcher
 import org.junit.Before
 import org.junit.Rule
 import org.junit.rules.RuleChain

buildSrc/build.gradle.kts

@@ -14,12 +14,6 @@ dependencies {
     implementation(libs.javapoet)
 }
 
-tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_21.toString()
-    }
-}
-
 kotlin {
     jvmToolchain(21)
 }

data/build.gradle.kts

@@ -1,4 +1,3 @@
-@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed
 plugins {
     id("com.android.library")
     kotlin("android")
@@ -13,7 +12,6 @@ android {
         minSdk = libs.versions.min.sdk.version.get().toInt()
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles("consumer-rules.pro")
         externalNativeBuild {
             cmake {
                 cppFlags += ""

gradle.properties

@@ -7,7 +7,15 @@ org.gradle.caching=true
 org.gradle.vfs.watch=true
 
 android.useAndroidX=true
-# Automatically convert third-party libraries to use AndroidX
-android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
+android.defaults.buildfeatures.resvalues=true
+android.sdk.defaultTargetSdkToCompileSdkIfUnset=false
+android.enableAppCompileTimeRClass=false
+android.usesSdkInManifest.disallowed=false
+android.uniquePackageNames=false
+android.dependency.useConstraints=true
+android.r8.strictFullModeForKeepRules=false
+android.r8.optimizedResourceShrinking=false
+android.builtInKotlin=false
+android.newDsl=false

gradle/libs.versions.toml

@@ -1,24 +1,23 @@
 [versions]
-agp = "8.13.0"
-androidx_activity_compose = "1.8.0"
-androidx_test = "1.5.0"
-androidx_test_ext = "1.1.5"
-appcompat = "1.6.1"
+agp = "9.2.1"
+androidx_activity_compose = "1.13.0"
+androidx_test = "1.7.0"
+androidx_test_ext = "1.3.0"
+appcompat = "1.7.1"
 benmanesversion = "0.47.0"
 colormath = "3.3.2"
 colormath-ext-jetpack-compose = "3.3.2"
-compile_sdk_version = "36"
-compose-lifecycle = "2.6.2"
-compose-navigation = "2.7.5"
-compose_compiler = "1.5.4"
-compose_material3 = "1.1.2"
+compile_sdk_version = "37"
+compose-lifecycle = "2.10.0"
+compose-navigation = "2.9.8"
+compose_bom = "2026.05.00"
 constraint_layout = "2.1.4"
-core_ktx = "1.10.1"
-coroutines = "1.7.3"
+core_ktx = "1.18.0"
+coroutines = "1.10.2"
 datastore = "1.1.1"
 datastore-preferences = "1.1.1"
-detekt = "1.23.1"
-espresso_core = "3.5.1"
+detekt = "1.23.8"
+espresso_core = "3.7.0"
 firebase_analytics = "22.0.0"
 firebase_bom = "33.0.0"
 firebase_crashlytics = "19.0.0"
@@ -28,22 +27,21 @@ hilt = "2.56.2"
 hilt-navigation-compose = "1.2.0"
 javapoet = "1.13.0"
 junit = "4.13.2"
-junit-jupiter = "5.8.1"
+junit-jupiter = "5.11.4"
 kaml = "0.55.0"
 kotlin = "2.2.20"
 kotlin-math = "1.5.3"
-ksp = "2.2.20-2.0.2"
+ksp = "2.3.2"
 ktlint_gradle = "11.5.0"
 min_sdk_version = "28"
-mixpanel-android = "7.5.2"
+mixpanel-android = "8.2.1"
 mockito-android = "5.4.0"
 mockito-kotlin = "5.1.0"
 play_publisher = "3.9.1"
 simple_flank = "0.4.0"
-target_sdk_version = "35"
+target_sdk_version = "37"
 truth = "1.1.5"
 turbine = "1.0.0"
-org-jetbrains-kotlin-jvm = "1.8.0"
 material = "1.12.0"
 
 [libraries]
@@ -59,13 +57,14 @@ androidx_test_runner = { module = "androidx.test:runner", version.ref = "android
 colormath = { module = "com.github.ajalt.colormath:colormath", version.ref = "colormath" }
 colormath-ext-jetpack-compose = { module = "com.github.ajalt.colormath:colormath-ext-jetpack-compose", version.ref = "colormath-ext-jetpack-compose" }
 compose-navigation = { module = "androidx.navigation:navigation-compose", version.ref = "compose-navigation" }
-compose_foundation = { module = "androidx.compose.foundation:foundation", version.ref = "compose_compiler" }
+compose_bom = { module = "androidx.compose:compose-bom", version.ref = "compose_bom" }
+compose_foundation = { module = "androidx.compose.foundation:foundation" }
 compose_lifecycle = { module = "androidx.lifecycle:lifecycle-runtime-compose", version.ref = "compose-lifecycle" }
-compose_material3 = { module = "androidx.compose.material3:material3", version.ref = "compose_material3" }
-compose_ui = { module = "androidx.compose.ui:ui", version.ref = "compose_compiler" }
-compose_ui_test_junit4 = { module = "androidx.compose.ui:ui-test-junit4", version.ref = "compose_compiler" }
-compose_ui_test_manifest = { module = "androidx.compose.ui:ui-test-manifest", version.ref = "compose_compiler" }
-compose_ui_tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "compose_compiler" }
+compose_material3 = { module = "androidx.compose.material3:material3" }
+compose_ui = { module = "androidx.compose.ui:ui" }
+compose_ui_test_junit4 = { module = "androidx.compose.ui:ui-test-junit4" }
+compose_ui_test_manifest = { module = "androidx.compose.ui:ui-test-manifest" }
+compose_ui_tooling = { module = "androidx.compose.ui:ui-tooling" }
 coroutines_android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" }
 coroutines_core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }
 coroutines_test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }
@@ -104,7 +103,6 @@ ktlint = { id = "org.jlleitschuh.gradle.ktlint", version.ref = "ktlint.gradle" }
 play_publisher = { id = "com.github.triplet.play", version.ref = "play_publisher" }
 simple_flank = { id = "io.github.flank.gradle.simple-flank", version.ref = "simple_flank" }
 versions = { id = "com.github.ben-manes.versions", version.ref = "benmanesversion" }
-org-jetbrains-kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "org-jetbrains-kotlin-jvm" }
 com-android-library = { id = "com.android.library", version.ref = "agp" }
-kotlinx-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version = "1.9.0" }
+kotlinx-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
 compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,6 @@
-#Sun Mar 03 13:55:21 EET 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME