Skip to content

kotlin 2.x : move to default hierarchy template (fixes: #152) #155

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

Open
championswimmer wants to merge 2 commits into
base: master
Choose a base branch
from
Open

kotlin 2.x : move to default hierarchy template (fixes: #152) #155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5d801b7
kotlin 2.x : move to default hierarchy template
championswimmer Jul 2, 2025
df4888e
Merge remote-tracking branch 'origin/master' into default-hierarchy-t…
championswimmer Dec 4, 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
4 changes: 2 additions & 2 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ allprojects {
}

group = "io.github.xxfast"
version = "1.0.0"
version = "2.0.0"

apply(plugin = "org.jetbrains.kotlin.plugin.serialization")
apply(plugin = "org.jetbrains.kotlinx.kover")
Expand All @@ -53,7 +53,7 @@ allprojects {
val javadocJar = tasks.register<Jar>("javadocJar") {
dependsOn(tasks.dokkaHtml)
archiveClassifier.set("javadoc")
from("$buildDir/dokka")
from("${layout.buildDirectory}/dokka")
}

publications {
Expand Down
107 changes: 17 additions & 90 deletions kstore-file/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,45 +1,14 @@
plugins {
kotlin("multiplatform")
id("com.android.library")
id("org.jetbrains.kotlinx.binary-compatibility-validator") version "0.17.0"
}

android {
compileSdk = 36

defaultConfig {
minSdk = 21
}

sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")

compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}

lint {
// TODO: Figure out why the linter is failing on CI
abortOnError = false
}

namespace = "io.github.xxfast.kstore.file"
}

kotlin {
explicitApi()

androidTarget {
compilations.all {
kotlinOptions {
jvmTarget = "1.8"
}
}
}

jvm("desktop") {
compilations.all {
kotlinOptions.jvmTarget = "1.8"
jvm {
compilerOptions {
jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8)
}
testRuns["test"].executionTask.configure {
useJUnitPlatform()
Expand All @@ -50,26 +19,16 @@ kotlin {
nodejs()
}

val macosX64 = macosX64()
val macosArm64 = macosArm64()
val iosArm64 = iosArm64()
val iosX64 = iosX64()
val iosSimulatorArm64 = iosSimulatorArm64()
val watchosArm32 = watchosArm32()
val watchosArm64 = watchosArm64()
val watchosX64 = watchosX64()
val watchosSimulatorArm64 = watchosSimulatorArm64()
val tvosArm64 = tvosArm64()
val tvosX64 = tvosX64()
val tvosSimulatorArm64 = tvosSimulatorArm64()

val appleTargets = listOf(
macosX64, macosArm64,
iosArm64, iosX64, iosSimulatorArm64,
watchosArm32, watchosArm64, watchosX64,
watchosSimulatorArm64,
tvosArm64, tvosX64, tvosSimulatorArm64,
macosX64(), macosArm64(),
iosArm64(), iosX64(), iosSimulatorArm64(),
watchosArm32(), watchosArm64(), watchosX64(),
watchosSimulatorArm64(),
tvosArm64(), tvosX64(), tvosSimulatorArm64(),
)


appleTargets.forEach { target ->
with(target) {
binaries {
Expand All @@ -80,12 +39,15 @@ kotlin {
}
}

linuxX64("linux")
mingwX64("windows")
linuxX64()
linuxArm64()
mingwX64()

applyDefaultHierarchyTemplate()

sourceSets {
sourceSets {
val commonMain by getting {
commonMain {
dependencies {
implementation(project(":kstore"))
api(libs.kotlinx.io)
Expand All @@ -94,48 +56,13 @@ kotlin {
}
}

val commonTest by getting {
commonTest {
dependencies {
implementation(kotlin("test"))
implementation(libs.kotlinx.coroutines.test)
implementation(libs.turbine)
}
}

val androidMain by getting
val androidUnitTest by getting

val desktopMain by getting {
dependencies {
}
}
val desktopTest by getting

val jsMain by getting

val jsTest by getting

val appleMain by creating {
dependsOn(commonMain)
}
val appleTest by creating

appleTargets.forEach { target ->
getByName("${target.targetName}Main") { dependsOn(appleMain) }
getByName("${target.targetName}Test") { dependsOn(appleTest) }
}

val linuxMain by getting {
dependencies {
}
}
val linuxTest by getting

val windowsMain by getting {
dependencies {
}
}
val windowsTest by getting
}
}
}
8 changes: 5 additions & 3 deletions kstore-storage/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension
import org.jetbrains.kotlin.gradle.targets.js.npm.tasks.KotlinNpmInstallTask

Expand All @@ -13,26 +14,27 @@ kotlin {
browser()
}

@OptIn(ExperimentalWasmDsl::class)
wasmJs {
binaries.executable()
browser()
}

sourceSets {
val commonMain by getting {
commonMain {
dependencies {
implementation(project(":kstore"))
implementation(libs.kotlinx.serialization.json)
}
}

val wasmJsMain by getting {
wasmJsMain {
dependencies {
implementation(libs.kotlinx.browser)
}
}

val commonTest by getting {
commonTest {
dependencies {
implementation(kotlin("test"))
implementation(libs.kotlinx.coroutines.test)
Expand Down
101 changes: 18 additions & 83 deletions kstore/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,55 +1,26 @@
import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension
import org.jetbrains.kotlin.gradle.targets.js.npm.tasks.KotlinNpmInstallTask

plugins {
kotlin("multiplatform")
id("com.android.library")
id("org.jetbrains.kotlinx.binary-compatibility-validator") version "0.17.0"
}

android {
compileSdk = 36

defaultConfig {
minSdk = 21
}

sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")

compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}

lint {
// TODO: Figure out why the linter is failing on CI
abortOnError = false
}

namespace = "io.github.xxfast.kstore"
}

kotlin {
explicitApi()

androidTarget {
compilations.all {
kotlinOptions {
jvmTarget = "1.8"
}
}
}

jvm("desktop") {
compilations.all {
kotlinOptions.jvmTarget = "1.8"
jvm {
compilerOptions {
jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8)
}
testRuns["test"].executionTask.configure {
useJUnitPlatform()
}
}


js(IR) {
browser()
nodejs()
Expand All @@ -61,24 +32,12 @@ kotlin {
nodejs()
}

val macosX64 = macosX64()
val macosArm64 = macosArm64()
val iosArm64 = iosArm64()
val iosX64 = iosX64()
val iosSimulatorArm64 = iosSimulatorArm64()
val watchosArm32 = watchosArm32()
val watchosArm64 = watchosArm64()
val watchosX64 = watchosX64()
val watchosSimulatorArm64 = watchosSimulatorArm64()
val tvosArm64 = tvosArm64()
val tvosX64 = tvosX64()
val tvosSimulatorArm64 = tvosSimulatorArm64()
val appleTargets = listOf(
macosX64, macosArm64,
iosArm64, iosX64, iosSimulatorArm64,
watchosArm32, watchosArm64, watchosX64,
watchosSimulatorArm64,
tvosArm64, tvosX64, tvosSimulatorArm64,
macosX64(), macosArm64(),
iosArm64(), iosX64(), iosSimulatorArm64(),
watchosArm32(), watchosArm64(), watchosX64(),
watchosSimulatorArm64(),
tvosArm64(), tvosX64(), tvosSimulatorArm64(),
)

appleTargets.forEach { target ->
Expand All @@ -91,59 +50,35 @@ kotlin {
}
}

linuxX64("linux")
mingwX64("windows")
linuxX64()
linuxArm64()
mingwX64()

applyDefaultHierarchyTemplate()

sourceSets {
val commonMain by getting {
commonMain {
dependencies {
implementation(libs.kotlinx.coroutines)
implementation(libs.kotlinx.serialization.json)
}
}

val commonTest by getting {
commonTest {
dependencies {
implementation(kotlin("test"))
implementation(libs.kotlinx.coroutines.test)
implementation(libs.turbine)
}
}

val androidMain by getting
val androidUnitTest by getting {
jvmTest {
dependencies {
implementation(libs.junit)
implementation(libs.junit.jupiter.api)
implementation(libs.junit.jupiter.engine)
implementation(libs.androidx.test.junit)
}
}

val desktopMain by getting
val desktopTest by getting

val jsMain by getting
val jsTest by getting

val wasmJsMain by getting
val wasmJsTest by getting

val appleMain by creating {
dependsOn(commonMain)
}
val appleTest by creating

appleTargets.forEach { target ->
getByName("${target.targetName}Main") { dependsOn(appleMain) }
getByName("${target.targetName}Test") { dependsOn(appleTest) }
}

val linuxMain by getting
val linuxTest by getting

val windowsMain by getting
val windowsTest by getting
}
}

Expand Down