Fixed compilation from clean environment in gradle

Author: davidvedvick

android/app/build.gradle.kts

@@ -128,18 +128,18 @@ val androidxTestVersion = "1.5.0"
 dependencies {
     implementation(libs.androidx.appcompat)
     api(libs.androidx.activity.compose)
-    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.4")
+    coreLibraryDesugaring(libs.desugar.jdk.libs)
     implementation(libs.kotlinx.coroutines.android)
     implementation(libs.kotlinx.serialization.json)
     implementation(libs.libpebblecommon)
     implementation(libs.kotlin.reflect)
-    implementation("androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVersion")
-    implementation("androidx.lifecycle:lifecycle-livedata-ktx:$lifecycleVersion")
-    implementation("androidx.lifecycle:lifecycle-service:$lifecycleVersion")
-    implementation("com.jakewharton.timber:timber:$timberVersion")
-    implementation("androidx.core:core-ktx:$androidxCoreVersion")
+    implementation(libs.androidx.lifecycle.runtime.ktx)
+    implementation(libs.androidx.lifecycle.livedata.ktx)
+    implementation(libs.androidx.lifecycle.service)
+    implementation(libs.timber)
+    implementation(libs.androidx.core.ktx.v1131)
     implementation(libs.androidx.work.runtime.ktx)
-    implementation("com.squareup.okio:okio:$okioVersion")
+    implementation(libs.okio)
     implementation(libs.androidx.room.runtime)
     implementation(libs.kotlinx.datetime)
     implementation(libs.dagger)
@@ -151,9 +151,9 @@ dependencies {
     implementation(project(":shared"))
     kapt(libs.dagger.compiler)
 
-    testImplementation("junit:junit:$junitVersion")
-    androidTestImplementation("androidx.test:runner:$androidxTestVersion")
-    androidTestImplementation("androidx.test:rules:$androidxTestVersion")
+    testImplementation(libs.junit)
+    androidTestImplementation(libs.androidx.runner.v150)
+    androidTestImplementation(libs.androidx.rules.v150)
 }
 
 android.buildTypes.getByName("release").ndk.debugSymbolLevel = "FULL"

android/buildSrc/build.gradle.kts

@@ -1,5 +1,6 @@
 plugins {
     id("org.jetbrains.kotlin.jvm") version "1.8.22"
+    `kotlin-dsl`
 }
 
 repositories {

android/gradle/libs.versions.toml

@@ -2,9 +2,12 @@
 activityCompose = "1.9.3"
 android-minSdk = "29"
 android-targetSdk = "34"
+androidxCoreVersion = "1.13.1"
+androidxTestVersion = "1.5.0"
 androidxVersion = "1.15.0"
 coroutinesVersion = "1.8.1"
 daggerVersion = "2.51.1"
+desugar_jdk_libs = "2.1.4"
 gradle = "8.7.2"
 koinVersion = "4.0.0"
 kotlin = "2.1.0-RC"
@@ -13,7 +16,10 @@ kotlinxSerializationJson = "1.7.1"
 ksp = "2.1.0-RC-1.0.27"
 libpebblecommonVersion = "0.1.27"
 errorproneVersion = "2.26.1"
+lifecycleVersion = "2.8.2"
+okioVersion = "3.9.0"
 rruleVersion = "1.0.3"
+rules = "1.5.0"
 spotbugsVersion = "4.8.6"
 atomicfu = "0.25.0"
 securityCrypto = "1.1.0-alpha06"
@@ -55,16 +61,24 @@ jetbrains-kotlinx-atomicfu = { id = "org.jetbrains.kotlinx.atomicfu", version.re
 [libraries]
 androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "activityCompose" }
 androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "androidxVersion" }
+androidx-core-ktx-v1131 = { module = "androidx.core:core-ktx", version.ref = "androidxCoreVersion" }
+androidx-lifecycle-livedata-ktx = { module = "androidx.lifecycle:lifecycle-livedata-ktx", version.ref = "lifecycleVersion" }
+androidx-lifecycle-runtime-ktx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "lifecycleVersion" }
+androidx-lifecycle-service = { module = "androidx.lifecycle:lifecycle-service", version.ref = "lifecycleVersion" }
+androidx-rules-v150 = { module = "androidx.test:rules", version.ref = "rules" }
+androidx-runner-v150 = { module = "androidx.test:runner", version.ref = "androidxTestVersion" }
 androidx-test-rules = { module = "androidx.test:rules", version.ref = "androidxTest" }
 androidx-test-runner = { module = "androidx.test:runner", version.ref = "androidxTest" }
 androidx-test-monitor = { module = "androidx.test:monitor", version.ref = "androidxTest" }
 androidx-security-crypto-ktx = { module = "androidx.security:security-crypto-ktx", version.ref = "securityCrypto" }
 androidx-work-runtime-ktx = { module = "androidx.work:work-runtime-ktx", version.ref = "workManagerVersion" }
 dagger = { module = "com.google.dagger:dagger", version.ref = "daggerVersion" }
 dagger-compiler = { module = "com.google.dagger:dagger-compiler", version.ref = "daggerVersion" }
+desugar_jdk_libs = { module = "com.android.tools:desugar_jdk_libs", version.ref = "desugar_jdk_libs" }
 gradle = { module = "com.android.tools.build:gradle", version.ref = "gradle" }
 kgp = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
 errorprone-annotations = { module = "com.google.errorprone:error_prone_annotations", version.ref = "errorproneVersion" }
+okio = { module = "com.squareup.okio:okio", version.ref = "okioVersion" }
 rrule = { module = "com.github.PhilJay:RRule", version.ref = "rruleVersion" }
 spotbugs-annotations = { module = "com.github.spotbugs:spotbugs-annotations", version.ref = "spotbugsVersion" }
 

android/pebblekit_android/build.gradle.kts

@@ -1,5 +1,6 @@
 plugins {
     alias(libs.plugins.android.library)
+    alias(libs.plugins.android.kotlin)
 }
 
 android {
@@ -26,12 +27,16 @@ android {
         sourceCompatibility = JavaVersion.VERSION_1_8
         targetCompatibility = JavaVersion.VERSION_1_8
     }
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
 }
 
 dependencies {
 
     implementation(libs.androidx.appcompat)
     implementation(libs.material)
+    implementation(libs.androidx.core.ktx)
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.junit)
     androidTestImplementation(libs.androidx.espresso.core)

android/shared/src/commonTest/kotlin/io/rebble/cobble/domain/api/AppstoreClientTest.kt

@@ -1443,7 +1443,7 @@ class AppstoreClientTest {
                 else -> error("Unhandled ${request.url.encodedPath}")
             }
         }
-        val client = AppstoreClient("https://appstore-api.rebble.io/api", "x", mockEngine)
+        val client = AppstoreClient("https://appstore-api.rebble.io/api", "x")
         val locker = client.getLocker()
         assertEquals(13, locker.size)
     }