From 067dbfb69b39f8eeb9b2b946ed603931b748dc4d Mon Sep 17 00:00:00 2001 From: andresmr Date: Mon, 28 Apr 2025 11:41:39 +0200 Subject: [PATCH 1/2] fix: clean up resource directories in build.gradle.kts --- aggregates/build.gradle.kts | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/aggregates/build.gradle.kts b/aggregates/build.gradle.kts index 26367b4b8c..3b7bdb02cf 100644 --- a/aggregates/build.gradle.kts +++ b/aggregates/build.gradle.kts @@ -46,9 +46,7 @@ kotlin { implementation(libs.koin.compose) implementation(libs.koin.composeVM) } - commonTest{ - resources.srcDirs("aggregates/src/commonMain/composeResources") - } + commonTest.dependencies { implementation(kotlin("test")) // Koin Test features @@ -92,8 +90,7 @@ android { compileSdk = libs.versions.sdk.get().toInt() sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml") - sourceSets["main"].res.srcDirs("src/androidMain/res", "aggregates/src/commonMain/composeResources") - sourceSets["main"].resources.srcDirs("aggregates/src/commonMain/composeResources") + sourceSets["main"].res.srcDirs("src/androidMain/res", "src/commonMain/composeResources") defaultConfig { minSdk = libs.versions.minSdk.get().toInt() From a5c1a441cb6ab9d9072bffa0d7f9116a99369a81 Mon Sep 17 00:00:00 2001 From: andresmr Date: Tue, 29 Apr 2025 12:38:51 +0200 Subject: [PATCH 2/2] fix: allow resources in commons instead of Android --- aggregates/build.gradle.kts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/aggregates/build.gradle.kts b/aggregates/build.gradle.kts index 3b7bdb02cf..e2d6cbd805 100644 --- a/aggregates/build.gradle.kts +++ b/aggregates/build.gradle.kts @@ -27,6 +27,10 @@ kotlin { } sourceSets { + commonMain{ + resources.srcDirs("src/commonMain/composeResources") + } + commonMain.dependencies { implementation(compose.runtime) implementation(compose.foundation) @@ -90,7 +94,7 @@ android { compileSdk = libs.versions.sdk.get().toInt() sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml") - sourceSets["main"].res.srcDirs("src/androidMain/res", "src/commonMain/composeResources") + sourceSets["main"].res.srcDirs("src/androidMain/res") defaultConfig { minSdk = libs.versions.minSdk.get().toInt()