Skip to content
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

Jump to bottom

Use default hierarchical template #77

Merged
merged 1 commit into from
Jun 4, 2024
Merged

Use default hierarchical template #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 3 additions & 5 deletions android/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,9 @@ kotlin {
androidTarget()

sourceSets {
val androidMain by getting {
dependencies {
implementation(projects.library)
implementation(libs.bundles.compose)
}
androidMain.dependencies {
implementation(projects.library)
implementation(libs.bundles.compose)
}
}
}
Expand Down
17 changes: 5 additions & 12 deletions library/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ kotlin {
iosSimulatorArm64()
js().browser()

applyDefaultHierarchyTemplate()

val xcf = XCFramework()
listOf(
iosArm64(),
Expand Down Expand Up @@ -75,28 +77,19 @@ kotlin {
}
}

val androidMain by getting {
getByName("androidMain") {
dependsOn(bundledMain)
kotlin.srcDir("$buildDir/generated/sources/datadog/$name/kotlin")
}

val iosMain by creating {
dependsOn(commonMain)
getByName("iosMain") {
kotlin.srcDir("$buildDir/generated/sources/datadog/$name/kotlin")
dependencies {
api(libs.nserrorkt)
}
}

val iosArm64Main by getting {
dependsOn(iosMain)
}

val iosSimulatorArm64Main by getting {
dependsOn(iosMain)
}

val jsMain by getting {
getByName("jsMain") {
dependsOn(bundledMain)
kotlin.srcDir("$buildDir/generated/sources/datadog/$name/kotlin")
}
Expand Down
6 changes: 2 additions & 4 deletions webapp/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,8 @@ kotlin {
}

sourceSets {
val jsMain by getting {
dependencies {
implementation(projects.library)
}
jsMain.dependencies {
implementation(projects.library)
}
}
}