Merge pull request icerockdev#57 from icerockdev/develop

Release 0.6.0
ema987 · Aug 7, 2022 · bca5b65 · bca5b65
2 parents 78aafdb + ccd6771
commit bca5b65
Show file tree

Hide file tree

Showing 40 changed files with 330 additions and 432 deletions.
diff --git a/README.md b/README.md
@@ -64,7 +64,7 @@ buildscript {
         gradlePluginPortal()
     }
     dependencies {
-        classpath("dev.icerock.moko:kswift-gradle-plugin:0.5.0")
+        classpath("dev.icerock.moko:kswift-gradle-plugin:0.6.0")
     }
 }
 ```
@@ -95,7 +95,7 @@ project where framework compiles `build.gradle`
 
 ```groovy
 plugins {
-    id("dev.icerock.moko.kswift") version "0.5.0"
+    id("dev.icerock.moko.kswift") version "0.6.0"
 }
 ```
 
@@ -115,7 +115,7 @@ project `build.gradle`
 
 ```groovy
 dependencies {
-    commonMainApi("dev.icerock.moko:kswift-runtime:0.5.0") // if you want use annotations
+    commonMainApi("dev.icerock.moko:kswift-runtime:0.6.0") // if you want use annotations
 }
 ```
 

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -10,7 +10,11 @@ buildscript {
     }
 
     dependencies {
-        classpath(":kswift-build-logic")
+        classpath(libs.mobileMultiplatformGradlePlugin)
+        classpath(libs.kotlinGradlePlugin)
+        classpath(libs.mokoGradlePlugin)
+        classpath(libs.androidGradlePlugin)
+        classpath(libs.detektGradlePlugin)
         classpath("dev.icerock.moko:kswift-gradle-plugin")
     }
 }

diff --git a/gradle.properties b/gradle.properties
@@ -10,3 +10,14 @@ kotlin.mpp.enableCompatibilityMetadataVariant=true
 android.useAndroidX=true
 
 mobile.multiplatform.iosTargetWarning=false
+
+moko.android.targetSdk=31
+moko.android.compileSdk=31
+moko.android.minSdk=16
+
+moko.publish.name=MOKO KSwift
+moko.publish.description=Swift-friendly api generator for Kotlin/Native frameworks
+moko.publish.repo.org=icerockdev
+moko.publish.repo.name=moko-kswift
+moko.publish.license=Apache-2.0
+moko.publish.developers=alex009|Aleksey Mikhailov|Aleksey.Mikhailov@icerockdev.com
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -6,7 +6,7 @@ androidLifecycleVersion = "2.1.0"
 androidCoreTestingVersion = "2.1.0"
 coroutinesVersion = "1.6.0-native-mt"
 mokoTestVersion = "0.4.0"
-mokoKSwiftVersion = "0.5.0"
+mokoKSwiftVersion = "0.6.0"
 
 mokoMvvmVersion = "0.11.0"
 mokoResourcesVersion = "0.16.2"
@@ -36,7 +36,11 @@ kotlinCompilerEmbeddable = { module = "org.jetbrains.kotlin:kotlin-compiler-embe
 kotlinxMetadataKLib = { module = "org.jetbrains.kotlinx:kotlinx-metadata-klib", version.ref = "kotlinxMetadataKLibVersion" }
 kotlinTestJUnit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlinVersion" }
 
+# gradle plugins
 kotlinGradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlinVersion" }
-mobileMultiplatformGradlePlugin = { module = "dev.icerock:mobile-multiplatform", version = "0.13.0" }
+# we use next version of kotlin gradle plugin in gradle plugin api to support 1.6 and 1.7 both
+kotlinGradlePluginNext = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version = "1.7.0" }
+mokoGradlePlugin = { module = "dev.icerock.moko:moko-gradle-plugin", version = "0.2.0" }
+mobileMultiplatformGradlePlugin = { module = "dev.icerock:mobile-multiplatform", version = "0.14.1" }
 androidGradlePlugin = { module = "com.android.tools.build:gradle", version = "7.0.4" }
 detektGradlePlugin = { module = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin", version = "1.15.0" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/kswift-build-logic/build.gradle.kts b/kswift-build-logic/build.gradle.kts
diff --git a/kswift-build-logic/settings.gradle.kts b/kswift-build-logic/settings.gradle.kts
diff --git a/kswift-build-logic/src/main/kotlin/android-app-convention.gradle.kts b/kswift-build-logic/src/main/kotlin/android-app-convention.gradle.kts
diff --git a/kswift-build-logic/src/main/kotlin/android-base-convention.gradle.kts b/kswift-build-logic/src/main/kotlin/android-base-convention.gradle.kts
diff --git a/kswift-build-logic/src/main/kotlin/android-library-convention.gradle.kts b/kswift-build-logic/src/main/kotlin/android-library-convention.gradle.kts
diff --git a/kswift-build-logic/src/main/kotlin/android-publication-convention.gradle.kts b/kswift-build-logic/src/main/kotlin/android-publication-convention.gradle.kts
diff --git a/kswift-build-logic/src/main/kotlin/detekt-convention.gradle.kts b/kswift-build-logic/src/main/kotlin/detekt-convention.gradle.kts
diff --git a/kswift-build-logic/src/main/kotlin/gradle-plugin-convention.gradle.kts b/kswift-build-logic/src/main/kotlin/gradle-plugin-convention.gradle.kts
diff --git a/kswift-build-logic/src/main/kotlin/javadoc-stub-convention.gradle.kts b/kswift-build-logic/src/main/kotlin/javadoc-stub-convention.gradle.kts
diff --git a/kswift-build-logic/src/main/kotlin/multiplatform-library-convention.gradle.kts b/kswift-build-logic/src/main/kotlin/multiplatform-library-convention.gradle.kts
diff --git a/kswift-build-logic/src/main/kotlin/publication-convention.gradle.kts b/kswift-build-logic/src/main/kotlin/publication-convention.gradle.kts