diff --git a/unified-prototype/unified-plugin/gradle/libs.versions.toml b/unified-prototype/unified-plugin/gradle/libs.versions.toml index ca1bb030..35985c1d 100644 --- a/unified-prototype/unified-plugin/gradle/libs.versions.toml +++ b/unified-prototype/unified-plugin/gradle/libs.versions.toml @@ -1,18 +1,18 @@ [versions] # Kotlin Libs # Find latest version at: https://kotlinlang.org/docs/releases.html#release-details -kotlin = "2.0.21" -ksp = "2.0.21-1.0.26" +kotlin = "2.0.20" +ksp = "2.0.20-1.0.25" # Android Libs # Find latest version at: https://developer.android.com/reference/tools/gradle-api -android = "8.7.1" -androidTools = "31.6.0" +android = "8.6.1" +androidTools = "31.3.0" baselineProfile = "1.3.0" -firebaseCrashlytics = "3.0.2" +firebaseCrashlytics = "2.9.9" firebasePerf = "1.4.2" -gms = "4.4.2" -hilt = "2.51" +gms = "4.4.1" +hilt = "2.52" room = "2.6.1" #Other Libs diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/java/org/gradle/api/experimental/android/extensions/ComposeSupport.java b/unified-prototype/unified-plugin/plugin-android/src/main/java/org/gradle/api/experimental/android/extensions/ComposeSupport.java index 637f0b5a..5a885865 100644 --- a/unified-prototype/unified-plugin/plugin-android/src/main/java/org/gradle/api/experimental/android/extensions/ComposeSupport.java +++ b/unified-prototype/unified-plugin/plugin-android/src/main/java/org/gradle/api/experimental/android/extensions/ComposeSupport.java @@ -26,11 +26,12 @@ public static void configureCompose(Project project, AndroidSoftware dslModel, C project.getPlugins().apply("org.jetbrains.kotlin.plugin.compose"); - androidLib.getComposeOptions().setKotlinCompilerExtensionVersion("1.5.8"); + // Use default version + // androidLib.getComposeOptions().setKotlinCompilerExtensionVersion("1.5.8"); - dslModel.getDependencies().getImplementation().add(project.getDependencies().platform("androidx.compose:compose-bom:2024.02.02")); - dslModel.getTesting().getDependencies().getImplementation().add(project.getDependencies().platform("androidx.compose:compose-bom:2024.02.02")); - dslModel.getTesting().getDependencies().getAndroidImplementation().add(project.getDependencies().platform("androidx.compose:compose-bom:2024.02.02")); + dslModel.getDependencies().getImplementation().add(project.getDependencies().platform("androidx.compose:compose-bom:2024.09.00")); + dslModel.getTesting().getDependencies().getImplementation().add(project.getDependencies().platform("androidx.compose:compose-bom:2024.09.00")); + dslModel.getTesting().getDependencies().getAndroidImplementation().add(project.getDependencies().platform("androidx.compose:compose-bom:2024.09.00")); // TODO: Are these necessary? Could they be removed and added explicitly per project as they are used? dslModel.getDependencies().getImplementation().add("androidx.compose.ui:ui-tooling-preview"); diff --git a/unified-prototype/unified-plugin/plugin-android/src/main/java/org/gradle/api/experimental/android/nia/NiaSupport.java b/unified-prototype/unified-plugin/plugin-android/src/main/java/org/gradle/api/experimental/android/nia/NiaSupport.java index d393a6bf..b675a00b 100644 --- a/unified-prototype/unified-plugin/plugin-android/src/main/java/org/gradle/api/experimental/android/nia/NiaSupport.java +++ b/unified-prototype/unified-plugin/plugin-android/src/main/java/org/gradle/api/experimental/android/nia/NiaSupport.java @@ -195,11 +195,11 @@ private static void configureFeature(Project project, AndroidSoftware dslModel, project.getDependencies().add("implementation", project.project(":core:designsystem")); project.getDependencies().add("implementation", "androidx.hilt:hilt-navigation-compose:1.2.0"); - project.getDependencies().add("implementation", "androidx.lifecycle:lifecycle-runtime-compose:2.7.0"); - project.getDependencies().add("implementation", "androidx.lifecycle:lifecycle-viewmodel-compose:2.7.0"); + project.getDependencies().add("implementation", "androidx.lifecycle:lifecycle-runtime-compose:2.8.6"); + project.getDependencies().add("implementation", "androidx.lifecycle:lifecycle-viewmodel-compose:2.8.6"); project.getDependencies().add("implementation", "androidx.tracing:tracing-ktx:1.3.0-alpha02"); - project.getDependencies().add("androidTestImplementation", "androidx.lifecycle:lifecycle-runtime-testing:2.7.0"); + project.getDependencies().add("androidTestImplementation", "androidx.lifecycle:lifecycle-runtime-testing:2.8.6"); } }