diff --git a/CHANGELOG.md b/CHANGELOG.md index c44b773..db03266 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## 0.5.2 +* Add support for native targets + ## 0.5.1 * `Versions`: diff --git a/extensions.gradle b/extensions.gradle index 4312fc0..30f41e8 100644 --- a/extensions.gradle +++ b/extensions.gradle @@ -14,6 +14,7 @@ allprojects { } mppProjectWithSerializationPresetPath = "${rootProject.projectDir.absolutePath}/mppProjectWithSerialization.gradle" + mppSampleProjectWithSerializationPresetPath = "${rootProject.projectDir.absolutePath}/mppSampleProjectWithSerialization.gradle" mppJavaProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppJavaProject.gradle" mppJsProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppJsProject.gradle" mppAndroidProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppAndroidProject.gradle" diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 0acd628..d8f2232 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,7 +5,7 @@ kotlin-coroutines = "1.8.1" kotlin-serialization = "1.6.3" dokka = "1.9.20" -microutils = "0.21.0" +microutils = "0.21.4" kslog = "1.3.4" uuid = "0.8.4" @@ -14,8 +14,8 @@ compose = "1.6.2" dexcount = "4.0.0" junit_version = "4.12" -test_ext_junit_version = "1.1.5" -espresso_core = "3.5.1" +test_ext_junit_version = "1.2.1" +espresso_core = "3.6.1" android-gradle-plugin = "8.1.4" android-minSdk = "21" diff --git a/mppProjectWithSerialization.gradle b/mppProjectWithSerialization.gradle index 00ee214..7cc6aec 100644 --- a/mppProjectWithSerialization.gradle +++ b/mppProjectWithSerialization.gradle @@ -18,6 +18,9 @@ kotlin { androidTarget { publishAllLibraryVariants() } + linuxX64() + mingwX64() + linuxArm64() sourceSets { commonMain { diff --git a/mppSampleProjectWithSerialization.gradle b/mppSampleProjectWithSerialization.gradle new file mode 100644 index 0000000..00ee214 --- /dev/null +++ b/mppSampleProjectWithSerialization.gradle @@ -0,0 +1,61 @@ +project.version = "$version" +project.group = "$group" + +// apply from: "$publishGradlePath" + +kotlin { + jvm { + compilations.main { + kotlinOptions { + jvmTarget = "17" + } + } + } + js (IR) { + browser() + nodejs() + } + androidTarget { + publishAllLibraryVariants() + } + + sourceSets { + commonMain { + dependencies { + implementation libs.kotlin + api libs.kotlin.serialization + } + } + commonTest { + dependencies { + implementation libs.kotlin.test.common + implementation libs.kotlin.test.annotations.common + } + } + jvmTest { + dependencies { + implementation libs.kotlin.test.junit + } + } + jsTest { + dependencies { + implementation libs.kotlin.test.js + implementation libs.kotlin.test.junit + } + } + androidUnitTest { + dependencies { + implementation libs.kotlin.test.junit + implementation libs.android.test.junit + implementation libs.android.test.espresso.core + } + } + } +} + +java { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 +} + +apply from: "$defaultAndroidSettingsPresetPath" diff --git a/sample/build.gradle b/sample/build.gradle index cae4a9d..fe8b1c6 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -5,7 +5,7 @@ plugins { alias(libs.plugins.compose) } -apply from: "$mppProjectWithSerializationPresetPath" +apply from: "$mppSampleProjectWithSerializationPresetPath" kotlin { js(IR) {