Skip to content

fix: [ANDROAPP-7018] clean up resource directories in build.gradle.kts #4130

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 29, 2025
Merged

fix: [ANDROAPP-7018] clean up resource directories in build.gradle.kts #4130

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
067dbfb
fix: clean up resource directories in build.gradle.kts
andresmr Apr 28, 2025
a5c1a44
fix: allow resources in commons instead of Android
andresmr Apr 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions aggregates/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ kotlin {
}

sourceSets {
commonMain{
resources.srcDirs("src/commonMain/composeResources")
}

commonMain.dependencies {
implementation(compose.runtime)
implementation(compose.foundation)
Expand All @@ -46,9 +50,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
Expand Down Expand Up @@ -92,8 +94,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")

defaultConfig {
minSdk = libs.versions.minSdk.get().toInt()
Expand Down
Loading