diff --git a/gradle/sweet-dependency/sweet-dependency-config.yaml b/gradle/sweet-dependency/sweet-dependency-config.yaml index 3391510..da568fa 100644 --- a/gradle/sweet-dependency/sweet-dependency-config.yaml +++ b/gradle/sweet-dependency/sweet-dependency-config.yaml @@ -7,6 +7,8 @@ repositories: scope: PLUGINS google: maven-central: + jetbrains-compose-dev: + url: https://maven.pkg.jetbrains.space/public/p/compose/dev plugins: org.jetbrains.kotlin.multiplatform: @@ -14,7 +16,7 @@ plugins: version: 1.9.20 org.jetbrains.compose: alias: jetbrains-compose - version: 1.5.10 + version: 1.6.0-dev1276 com.android.application: alias: android-application version: 8.1.2 @@ -23,6 +25,13 @@ plugins: version-ref: android-application libraries: + # Use a placeholder for the alpha compose version + # In the project to use "androidx.compose.android.version" to obtain the version + # and use the "resolutionStrategy" to replace all the current "stable" versions + androidx.compose.runtime: + runtime-android: + alias: androidx-compose-android + version: 1.6.0-alpha08 com.highcapable.betterandroid: ui-component: version: 1.0.0 diff --git a/samples/androidApp/build.gradle.kts b/samples/androidApp/build.gradle.kts index a8b82ee..edf6840 100644 --- a/samples/androidApp/build.gradle.kts +++ b/samples/androidApp/build.gradle.kts @@ -23,6 +23,8 @@ android { compileSdk = property.project.android.compileSdk sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml") + sourceSets["main"].res.srcDirs("src/androidMain/res") + sourceSets["main"].resources.srcDirs("src/commonMain/resources") defaultConfig { applicationId = property.project.sharedApp.packageName @@ -42,4 +44,13 @@ android { sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 } +} + +val composeAndroidVersion = dependencies.androidx.compose.android.version + +configurations.all { + resolutionStrategy.eachDependency { + if (requested.group.startsWith("androidx.compose.")) + useVersion(composeAndroidVersion) + } } \ No newline at end of file