From 410964a44bae7dc77f7982039fd158237d8c52e2 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Tue, 16 Jul 2024 14:02:36 +0600 Subject: [PATCH 1/2] start 0.21.4 --- CHANGELOG.md | 2 ++ gradle.properties | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 80996abcc47..22e442f2544 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # Changelog +## 0.21.4 + ## 0.21.3 * `Colors`: diff --git a/gradle.properties b/gradle.properties index 3c0574944f5..780ec2fb0fb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,5 +15,5 @@ crypto_js_version=4.1.1 # Project data group=dev.inmo -version=0.21.3 -android_code_version=262 +version=0.21.4 +android_code_version=263 From 4425f24a2012b667138848464e96c76d50e2fe3f Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Tue, 16 Jul 2024 14:16:08 +0600 Subject: [PATCH 2/2] add support of native platforms in common compose and coroutines compose --- CHANGELOG.md | 7 ++ common/compose/build.gradle | 2 +- coroutines/compose/build.gradle | 2 +- extensions.gradle | 1 + ...sAndroidLinuxMingwLinuxArm64Project.gradle | 97 +++++++++++++++++++ 5 files changed, 107 insertions(+), 2 deletions(-) create mode 100644 mppComposeJvmJsAndroidLinuxMingwLinuxArm64Project.gradle diff --git a/CHANGELOG.md b/CHANGELOG.md index 22e442f2544..fd813e78fba 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ ## 0.21.4 +* `Common`: + * `Compose`: + * Add support of mingw, linux, arm64 targets +* `Coroutines`: + * `Compose`: + * Add support of mingw, linux, arm64 targets + ## 0.21.3 * `Colors`: diff --git a/common/compose/build.gradle b/common/compose/build.gradle index 0b3570ad169..9b26194b637 100644 --- a/common/compose/build.gradle +++ b/common/compose/build.gradle @@ -5,7 +5,7 @@ plugins { alias(libs.plugins.jb.compose) } -apply from: "$mppProjectWithSerializationAndComposePresetPath" +apply from: "$mppComposeJvmJsAndroidLinuxMingwLinuxArm64ProjectPresetPath" kotlin { sourceSets { diff --git a/coroutines/compose/build.gradle b/coroutines/compose/build.gradle index 7405e30efa0..fe1537c3ab1 100644 --- a/coroutines/compose/build.gradle +++ b/coroutines/compose/build.gradle @@ -5,7 +5,7 @@ plugins { alias(libs.plugins.jb.compose) } -apply from: "$mppProjectWithSerializationAndComposePresetPath" +apply from: "$mppComposeJvmJsAndroidLinuxMingwLinuxArm64ProjectPresetPath" kotlin { sourceSets { diff --git a/extensions.gradle b/extensions.gradle index d782e25b3ec..3632203fc15 100644 --- a/extensions.gradle +++ b/extensions.gradle @@ -32,6 +32,7 @@ allprojects { mppJvmJsLinuxMingwProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppJvmJsLinuxMingwProject.gradle" mppJvmJsLinuxMingwLinuxArm64ProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppJvmJsLinuxMingwLinuxArm64Project.gradle" mppJvmJsAndroidLinuxMingwLinuxArm64ProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppJvmJsAndroidLinuxMingwLinuxArm64Project.gradle" + mppComposeJvmJsAndroidLinuxMingwLinuxArm64ProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppComposeJvmJsAndroidLinuxMingwLinuxArm64Project.gradle" mppAndroidProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppAndroidProject.gradle" defaultAndroidSettingsPresetPath = "${rootProject.projectDir.absolutePath}/defaultAndroidSettings.gradle" diff --git a/mppComposeJvmJsAndroidLinuxMingwLinuxArm64Project.gradle b/mppComposeJvmJsAndroidLinuxMingwLinuxArm64Project.gradle new file mode 100644 index 00000000000..7cf4d24aa97 --- /dev/null +++ b/mppComposeJvmJsAndroidLinuxMingwLinuxArm64Project.gradle @@ -0,0 +1,97 @@ +project.version = "$version" +project.group = "$group" + +apply from: "$publishGradlePath" + +kotlin { + jvm { + compilations.main { + kotlinOptions { + jvmTarget = "17" + } + } + } + js (IR) { + browser() + nodejs() + } + androidTarget { + publishAllLibraryVariants() + compilations.all { + kotlinOptions { + jvmTarget = "17" + } + } + } + linuxX64() + mingwX64() + linuxArm64() + + sourceSets { + commonMain { + dependencies { + implementation kotlin('stdlib') + implementation compose.runtime + api libs.kt.serialization + } + } + commonTest { + dependencies { + implementation kotlin('test-common') + implementation kotlin('test-annotations-common') + implementation libs.kt.coroutines.test + } + } + + androidUnitTest { + dependencies { + implementation kotlin('test-junit') + implementation libs.android.test.junit + implementation libs.android.espresso + implementation compose.uiTest + } + } + androidInstrumentedTest { + dependencies { + implementation kotlin('test-junit') + implementation libs.android.test.junit + implementation libs.android.espresso + } + } + jvmMain { + dependencies { + implementation compose.desktop.currentOs + } + } + jvmTest { + dependencies { + implementation kotlin('test-junit') + implementation compose.uiTest + } + } + jsMain { + dependencies { + implementation compose.web.core + } + } + jsTest { + dependencies { + implementation kotlin('test-js') + implementation kotlin('test-junit') + } + } + nativeMain.dependsOn commonMain + linuxX64Main.dependsOn nativeMain + mingwX64Main.dependsOn nativeMain + linuxArm64Main.dependsOn nativeMain + + androidMain.dependsOn jvmMain + } +} + +apply from: "$defaultAndroidSettingsPresetPath" + +java { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 +}