diff --git a/.github/workflows/renovate_check.yml b/.github/workflows/renovate_check.yml index 0bea5bcf..c8972a1f 100644 --- a/.github/workflows/renovate_check.yml +++ b/.github/workflows/renovate_check.yml @@ -46,7 +46,7 @@ jobs: KEYSTORE_LOCATION: ${{ steps.decode_keystore.outputs.filePath }} - name: Debug Android Test - run: ./gradlew :composeApp:pixel2Api33DebugAndroidTest -Pandroid.testoptions.manageddevices.emulator.gpu=swiftshader_indirect -Pandroid.experimental.testOptions.managedDevices.emulator.showKernelLogging=true -Pandroid.experimental.testOptions.managedDevices.maxConcurrentDevices=1 -Pandroid.experimental.testOptions.managedDevices.setupTimeoutMinutes=180 + run: ./gradlew :composeApp:pixel2Api35DebugAndroidTest -Pandroid.testoptions.manageddevices.emulator.gpu=swiftshader_indirect -Pandroid.experimental.testOptions.managedDevices.emulator.showKernelLogging=true -Pandroid.experimental.testOptions.managedDevices.maxConcurrentDevices=1 -Pandroid.experimental.testOptions.managedDevices.setupTimeoutMinutes=180 env: CI: 'true' KEYSTORE_LOCATION: ${{ steps.decode_keystore.outputs.filePath }} diff --git a/baselineprofile/build.gradle.kts b/baselineprofile/build.gradle.kts index 5a77da8a..2f2f94d6 100644 --- a/baselineprofile/build.gradle.kts +++ b/baselineprofile/build.gradle.kts @@ -13,10 +13,6 @@ android { targetCompatibility = JavaVersion.VERSION_1_8 } - kotlinOptions { - jvmTarget = "1.8" - } - defaultConfig { minSdk = 28 targetSdk = 34 diff --git a/composeApp/build.gradle.kts b/composeApp/build.gradle.kts index 235fea32..a4dc2764 100644 --- a/composeApp/build.gradle.kts +++ b/composeApp/build.gradle.kts @@ -268,9 +268,9 @@ android { managedDevices { allDevices { - create("pixel2Api33") { + create("pixel2Api35") { device = "Pixel 2" - apiLevel = 33 + apiLevel = 35 systemImageSource = "aosp-atd" } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e00bc29d..39ce4255 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -13,7 +13,7 @@ kermit = "2.0.8" koalaplotCore = "0.6.4" koin = "4.1.1" koinCompose = "4.1.1" -kotlin = "2.2.21" +kotlin = "2.3.0" kotlinxDatetime = "0.7.1-0.6.x-compat" kotlinxSerialization = "1.9.0" ktor = "3.3.3" @@ -37,7 +37,7 @@ baselineprofile = "1.4.1" profileinstaller = "1.4.1" skiko = "0.9.39" room = "2.8.4" -ksp = "2.3.3" +ksp = "2.3.4" sqlite = "2.6.2" slf4j = "2.0.17" apollographql = "4.3.3" diff --git a/renovate.json b/renovate.json index 60c36d0d..da910ef7 100644 --- a/renovate.json +++ b/renovate.json @@ -13,6 +13,12 @@ "ryanw-mobile" ], "packageRules": [ + { + "matchPackageNames": [ + "io.github.koalaplot:koalaplot-core" + ], + "enabled": false + }, { "groupName": "kotlin", "matchPackageNames": [