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

Use default hierarchy template #297

Merged
merged 3 commits into from
Dec 2, 2023
Merged

Use default hierarchy template #297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4d572dc
Use default hierarchy template
twyatt Nov 22, 2023
e4e1ccf
Merge branch 'main' into twyatt/default-hierarchy-template
twyatt Nov 27, 2023
40add66
Merge branch 'main' into twyatt/default-hierarchy-template
twyatt Dec 2, 2023
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
27 changes: 5 additions & 22 deletions axis/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,30 +23,13 @@ kotlin {
iosArm64()

sourceSets {
val commonMain by getting {
dependencies {
api(projects.scale)
api(projects.selection)
}
commonMain.dependencies {
api(projects.scale)
api(projects.selection)
}

val commonTest by getting {
dependencies {
implementation(kotlin("test-common"))
implementation(kotlin("test-annotations-common"))
}
}

val jvmTest by getting {
dependencies {
implementation(kotlin("test-junit"))
}
}

val jsTest by getting {
dependencies {
implementation(kotlin("test-js"))
}
commonTest.dependencies {
implementation(kotlin("test"))
}
}
}
64 changes: 15 additions & 49 deletions box/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,59 +16,25 @@ kotlin {
iosArm64()

sourceSets {
val commonMain by getting {
dependencies {
api(projects.axis)
api(projects.color)
api(projects.element)
api(projects.hierarchy)
api(projects.interpolate)
api(projects.kanvas)
api(projects.scale)
api(projects.selection)
api(projects.shape)
api(projects.time)
}
commonMain.dependencies {
api(projects.axis)
api(projects.color)
api(projects.element)
api(projects.hierarchy)
api(projects.interpolate)
api(projects.kanvas)
api(projects.scale)
api(projects.selection)
api(projects.shape)
api(projects.time)
}

val commonTest by getting {
dependencies {
implementation(kotlin("reflect"))
implementation(kotlin("test-common"))
implementation(kotlin("test-annotations-common"))
}
androidMain.dependencies {
api(projects.elementView)
}

val androidMain by getting {
dependencies {
api(projects.elementView)
}
}

val androidUnitTest by getting {
dependencies {
implementation(kotlin("test-junit"))
implementation(libs.androidx.test)
implementation(libs.robolectric)
}
}

val jvmTest by getting {
dependencies {
implementation(kotlin("test-junit"))
}
}

val jsMain by getting {
dependencies {
api(projects.elementView)
}
}

val jsTest by getting {
dependencies {
implementation(kotlin("test-js"))
}
jsMain.dependencies {
api(projects.elementView)
}
}
}
Expand Down
19 changes: 2 additions & 17 deletions color/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,23 +24,8 @@ kotlin {
iosArm64()

sourceSets {
val commonTest by getting {
dependencies {
implementation(kotlin("test-common"))
implementation(kotlin("test-annotations-common"))
}
}

val jvmTest by getting {
dependencies {
implementation(kotlin("test-junit"))
}
}

val jsTest by getting {
dependencies {
implementation(kotlin("test-js"))
}
commonTest.dependencies {
implementation(kotlin("test"))
}
}
}
30 changes: 12 additions & 18 deletions compose/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,29 +14,23 @@ kotlin {
explicitApi()
jvmToolchain(libs.versions.jvm.toolchain.get().toInt())

androidTarget() { publishAllLibraryVariants() }
androidTarget().publishAllLibraryVariants()
jvm("desktop")

sourceSets {
val commonMain by getting {
dependencies {
api(projects.kanvas)
api(projects.element)
api(compose.runtime)
api(compose.foundation)
api(compose.material)
implementation(libs.datetime)
}
commonMain.dependencies {
api(projects.kanvas)
api(projects.element)
api(compose.runtime)
api(compose.foundation)
api(compose.material)
implementation(libs.datetime)
}
val commonTest by getting {
dependencies {
implementation(kotlin("test"))
}
commonTest.dependencies {
implementation(kotlin("test"))
}
val desktopMain by getting {
dependencies {
api(compose.preview)
}
getByName("desktopMain").dependencies {
api(compose.preview)
}
}
}
Expand Down
41 changes: 12 additions & 29 deletions element-view/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,41 +14,24 @@ kotlin {
js().browser()

sourceSets {
val commonMain by getting {
dependencies {
api(projects.element)
api(libs.coroutines.core)
}
commonMain.dependencies {
api(projects.element)
api(libs.coroutines.core)
}

val commonTest by getting {
dependencies {
implementation(kotlin("reflect"))
implementation(kotlin("test-common"))
implementation(kotlin("test-annotations-common"))
}
commonTest.dependencies {
implementation(kotlin("test"))
}

val androidMain by getting {
dependencies {
implementation(libs.androidx.appcompat)
implementation(libs.androidx.lifecycle.runtime)
implementation(libs.coroutines.android)
}
androidMain.dependencies {
implementation(libs.androidx.appcompat)
implementation(libs.androidx.lifecycle.runtime)
implementation(libs.coroutines.android)
}

val androidUnitTest by getting {
dependencies {
implementation(kotlin("test-junit"))
implementation(libs.androidx.test)
implementation(libs.robolectric)
}
}

val jsTest by getting {
dependencies {
implementation(kotlin("test-js"))
}
getByName("androidUnitTest").dependencies {
implementation(libs.androidx.test)
implementation(libs.robolectric)
}
}
}
Expand Down
25 changes: 4 additions & 21 deletions element/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,29 +23,12 @@ kotlin {
iosArm64()

sourceSets {
val commonMain by getting {
dependencies {
api(projects.kanvas)
}
commonMain.dependencies {
api(projects.kanvas)
}

val commonTest by getting {
dependencies {
implementation(kotlin("test-common"))
implementation(kotlin("test-annotations-common"))
}
}

val jvmTest by getting {
dependencies {
implementation(kotlin("test-junit"))
}
}

val jsTest by getting {
dependencies {
implementation(kotlin("test-js"))
}
commonTest.dependencies {
implementation(kotlin("test"))
}
}
}
19 changes: 2 additions & 17 deletions hierarchy/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,23 +23,8 @@ kotlin {
iosArm64()

sourceSets {
val commonTest by getting {
dependencies {
implementation(kotlin("test-common"))
implementation(kotlin("test-annotations-common"))
}
}

val jvmTest by getting {
dependencies {
implementation(kotlin("test-junit"))
}
}

val jsTest by getting {
dependencies {
implementation(kotlin("test-js"))
}
commonTest.dependencies {
implementation(kotlin("test"))
}
}
}
29 changes: 6 additions & 23 deletions interpolate/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,31 +23,14 @@ kotlin {
iosArm64()

sourceSets {
val commonMain by getting {
dependencies {
api(projects.kanvas)
api(libs.datetime)
implementation(projects.time)
}
commonMain.dependencies {
api(projects.kanvas)
api(libs.datetime)
implementation(projects.time)
}

val commonTest by getting {
dependencies {
implementation(kotlin("test-common"))
implementation(kotlin("test-annotations-common"))
}
}

val jvmTest by getting {
dependencies {
implementation(kotlin("test-junit"))
}
}

val jsTest by getting {
dependencies {
implementation(kotlin("test-js"))
}
commonTest.dependencies {
implementation(kotlin("test"))
}
}
}
Loading