Merge pull request #38 from icerockdev/develop

Release 0.4.0

.gitignore

@@ -8,4 +8,5 @@ build
 *.iml
 Pods
 xcuserdata
-local.properties
+local.properties
+kotlin-js-store/

README.md

@@ -46,7 +46,7 @@ KSwift give you API for adding your own generator based on KLib metadata informa
 # Requirements
 
 - Gradle version 6.0+
-- Kotlin 1.5.20
+- Kotlin 1.6.10
 
 # Installation
 
@@ -62,11 +62,9 @@ buildscript {
         mavenCentral()
         google()
         gradlePluginPortal()
-
-        maven("https://jitpack.io")
     }
     dependencies {
-        classpath("dev.icerock.moko:kswift-gradle-plugin:0.3.0")
+        classpath("dev.icerock.moko:kswift-gradle-plugin:0.4.0")
     }
 }
 ```
@@ -89,8 +87,6 @@ pluginManagement {
         google()
         gradlePluginPortal()
         mavenCentral()
-
-        maven("https://jitpack.io")
     }
 }
 ```
@@ -99,7 +95,7 @@ project where framework compiles `build.gradle`
 
 ```groovy
 plugins {
-    id("dev.icerock.moko.kswift") version "0.3.0"
+    id("dev.icerock.moko.kswift") version "0.4.0"
 }
 ```
 
@@ -119,7 +115,7 @@ project `build.gradle`
 
 ```groovy
 dependencies {
-    commonMainApi("dev.icerock.moko:kswift-runtime:0.3.0") // if you want use annotations
+    commonMainApi("dev.icerock.moko:kswift-runtime:0.4.0") // if you want use annotations
 }
 ```
 
@@ -283,7 +279,7 @@ First create `buildSrc`, if you don't. `build.gradle` will contains:
 
 ```groovy
 plugins {
-    id("org.jetbrains.kotlin.jvm") version "1.5.21"
+    id("org.jetbrains.kotlin.jvm") version "1.6.10"
 }
 
 repositories {

build.gradle.kts

@@ -7,8 +7,6 @@ buildscript {
         mavenCentral()
         google()
         gradlePluginPortal()
-
-        maven("https://jitpack.io")
     }
 
     dependencies {
@@ -23,3 +21,8 @@ allprojects {
         version = libs.versions.mokoKSwiftVersion.get()
     }
 }
+
+// temporary fix for Apple Silicon (remove after 1.6.20 update)
+rootProject.plugins.withType<org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin> {
+    rootProject.the<org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension>().nodeVersion = "16.0.0"
+}

gradle/libs.versions.toml

@@ -1,21 +1,20 @@
 [versions]
-kotlinVersion = "1.5.20"
-androidGradleVersion = "4.1.2"
+kotlinVersion = "1.6.10"
 androidAppCompatVersion = "1.2.0"
 materialDesignVersion = "1.0.0"
 androidLifecycleVersion = "2.1.0"
 androidCoreTestingVersion = "2.1.0"
-coroutinesVersion = "1.5.0-native-mt"
+coroutinesVersion = "1.6.0-native-mt"
 mokoTestVersion = "0.4.0"
-mokoKSwiftVersion = "0.3.0"
+mokoKSwiftVersion = "0.4.0"
 
 mokoMvvmVersion = "0.11.0"
 mokoResourcesVersion = "0.16.2"
 
 kotlinxMetadataKLibVersion = "0.0.1"
 
 kotlinPoetVersion = "1.6.0"
-swiftPoetVersion = "1.1.2"
+swiftPoetVersion = "1.3.1"
 
 [libraries]
 appCompat = { module = "androidx.appcompat:appcompat", version.ref = "androidAppCompatVersion" }
@@ -31,11 +30,13 @@ mokoMvvmState = { module = "dev.icerock.moko:mvvm-state" , version.ref = "mokoMv
 mokoResources = { module = "dev.icerock.moko:resources" , version.ref = "mokoResourcesVersion" }
 
 kotlinPoet = { module = "com.squareup:kotlinpoet", version.ref = "kotlinPoetVersion" }
-swiftPoet = { module = "com.github.icerockdev:swiftpoet", version.ref = "swiftPoetVersion" }
+swiftPoet = { module = "io.outfoxx:swiftpoet", version.ref = "swiftPoetVersion" }
 
-#kotlinGradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin-api", version.ref = "kotlinVersion" }
-kotlinGradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlinVersion" }
-androidGradlePlugin = { module = "com.android.tools.build:gradle", version.ref = "androidGradleVersion" }
 kotlinCompilerEmbeddable = { module = "org.jetbrains.kotlin:kotlin-compiler-embeddable", version.ref = "kotlinVersion" }
 kotlinxMetadataKLib = { module = "org.jetbrains.kotlinx:kotlinx-metadata-klib", version.ref = "kotlinxMetadataKLibVersion" }
 kotlinTestJUnit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlinVersion" }
+
+kotlinGradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlinVersion" }
+mobileMultiplatformGradlePlugin = { module = "dev.icerock:mobile-multiplatform", version = "0.13.0" }
+androidGradlePlugin = { module = "com.android.tools.build:gradle", version = "7.0.4" }
+detektGradlePlugin = { module = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin", version = "1.15.0" }

kswift-build-logic/build.gradle.kts

@@ -10,8 +10,8 @@ repositories {
 }
 
 dependencies {
-    api("dev.icerock:mobile-multiplatform:0.12.0")
-    api("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.21")
-    api("com.android.tools.build:gradle:4.2.1")
-    api("io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.15.0")
+    api(libs.mobileMultiplatformGradlePlugin)
+    api(libs.kotlinGradlePlugin)
+    api(libs.androidGradlePlugin)
+    api(libs.detektGradlePlugin)
 }

kswift-build-logic/settings.gradle.kts

@@ -0,0 +1,18 @@
+/*
+ * Copyright 2022 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+enableFeaturePreview("VERSION_CATALOGS")
+
+dependencyResolutionManagement {
+    repositories {
+        mavenCentral()
+        google()
+    }
+
+    versionCatalogs {
+        create("libs") {
+            from(files("../gradle/libs.versions.toml"))
+        }
+    }
+}

kswift-build-logic/src/main/kotlin/multiplatform-library-convention.gradle.kts

@@ -14,10 +14,15 @@ kotlin {
         publishLibraryVariants("release", "debug")
     }
     ios()
+    iosSimulatorArm64()
 
-    macosX64("macOS")
+    macosX64()
+    macosArm64()
     tvos()
+    tvosSimulatorArm64()
     watchos()
+    watchosX86()
+    watchosSimulatorArm64()
 
     jvm()
     js(BOTH) {

kswift-gradle-plugin/build.gradle.kts

@@ -25,10 +25,17 @@ dependencies {
     testImplementation(libs.kotlinTestJUnit)
 }
 
-tasks.withType<Test>().configureEach {
+tasks.withType<AbstractTestTask> {
     testLogging {
+        exceptionFormat = org.gradle.api.tasks.testing.logging.TestExceptionFormat.FULL
+        events = setOf(
+            org.gradle.api.tasks.testing.logging.TestLogEvent.SKIPPED,
+            org.gradle.api.tasks.testing.logging.TestLogEvent.PASSED,
+            org.gradle.api.tasks.testing.logging.TestLogEvent.FAILED
+        )
         showStandardStreams = true
     }
+    outputs.upToDateWhen { false }
 }
 
 gradlePlugin {

kswift-gradle-plugin/settings.gradle.kts

@@ -25,8 +25,6 @@ dependencyResolutionManagement {
                 includeGroup("org.jetbrains.kotlinx")
             }
         }
-
-        maven("https://jitpack.io")
     }
 
     versionCatalogs {

kswift-gradle-plugin/src/main/kotlin/dev/icerock/moko/kswift/plugin/KLibProcessor.kt

@@ -34,7 +34,10 @@ class KLibProcessor(
             return
         }
 
-        val fileSpecBuilder: FileSpec.Builder = FileSpec.builder(library.nameWithoutExtension)
+        val fileName: String = metadata.name
+            .replace("[<>]".toRegex(), "")
+            .replace("[.:]".toRegex(), "_")
+        val fileSpecBuilder: FileSpec.Builder = FileSpec.builder(fileName)
 
         val processorContext = ProcessorContext(
             fileSpecBuilder = fileSpecBuilder,
@@ -47,7 +50,12 @@ class KLibProcessor(
             processFeatureContext(featureContext, processorContext)
         }
 
-        val fileSpec: FileSpec = fileSpecBuilder.build()
+        val fileSpec: FileSpec = fileSpecBuilder
+            .addComment(
+                "This file automatically generated by MOKO KSwift " +
+                        "(https://github.com/icerockdev/moko-kswift)\n"
+            )
+            .build()
         if (fileSpec.members.isNotEmpty()) {
             fileSpec.writeTo(outputDir)
         }
@@ -68,7 +76,7 @@ class KLibProcessor(
             try {
                 featureProcessor.process(featureContext, processorContext)
             } catch (exc: Exception) {
-                logger.error("can't process context $featureContext", exc)
+                logger.info("can't process context $featureContext", exc)
             }
         }
     }