diff --git a/log4k-slf4j/build.gradle.kts b/log4k-slf4j/build.gradle.kts index 646c499..c399ad8 100644 --- a/log4k-slf4j/build.gradle.kts +++ b/log4k-slf4j/build.gradle.kts @@ -7,7 +7,7 @@ plugins { kotlin { androidTarget { publishAllLibraryVariants() } - ios() + iosArm64() iosSimulatorArm64() js { nodejs() @@ -18,19 +18,13 @@ kotlin { } jvm { testRuns["test"].executionTask.configure { useJUnitPlatform() } } - sourceSets["androidMain"].dependencies { - implementation("org.slf4j:slf4j-api:1.7.36") - } - sourceSets["commonMain"].dependencies { - implementation(project(":log4k")) - } - sourceSets["commonTest"].dependencies { - implementation(kotlin("test")) - } - sourceSets["iosSimulatorArm64Main"].dependsOn(sourceSets["iosMain"]) - sourceSets["iosSimulatorArm64Test"].dependsOn(sourceSets["iosTest"]) - sourceSets["jvmMain"].dependencies { - implementation("org.slf4j:slf4j-api:1.7.36") + applyDefaultHierarchyTemplate() + + sourceSets { + commonMain.dependencies { implementation(project(":log4k")) } + commonTest.dependencies { implementation(kotlin("test")) } + androidMain.dependencies { implementation("org.slf4j:slf4j-api:1.7.36") } + jvmMain.dependencies { implementation("org.slf4j:slf4j-api:1.7.36") } } } @@ -98,4 +92,4 @@ signing { else -> useInMemoryPgpKeys(sonatypeGpgKey, sonatypeGpgKeyPassword) } sign(publishing.publications) -} \ No newline at end of file +} diff --git a/log4k/build.gradle.kts b/log4k/build.gradle.kts index a6d873a..edb7036 100644 --- a/log4k/build.gradle.kts +++ b/log4k/build.gradle.kts @@ -7,7 +7,7 @@ plugins { kotlin { androidTarget { publishAllLibraryVariants() } - ios() + iosArm64() iosSimulatorArm64() js { nodejs() @@ -18,11 +18,11 @@ kotlin { } jvm { testRuns["test"].executionTask.configure { useJUnitPlatform() } } - sourceSets["commonTest"].dependencies { - implementation(kotlin("test")) + applyDefaultHierarchyTemplate() + + sourceSets { + commonTest.dependencies { implementation(kotlin("test")) } } - sourceSets["iosSimulatorArm64Main"].dependsOn(sourceSets["iosMain"]) - sourceSets["iosSimulatorArm64Test"].dependsOn(sourceSets["iosTest"]) } java.toolchain.languageVersion.set(JavaLanguageVersion.of(17)) @@ -89,4 +89,4 @@ signing { else -> useInMemoryPgpKeys(sonatypeGpgKey, sonatypeGpgKeyPassword) } sign(publishing.publications) -} \ No newline at end of file +} diff --git a/settings.gradle.kts b/settings.gradle.kts index b2c2604..cee5852 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -5,7 +5,7 @@ pluginManagement { } plugins { - kotlin("multiplatform") version "1.9.10" + kotlin("multiplatform") version "1.9.23" id("com.android.library") version "8.2.2" } }