Merge pull request #22 from rickclephas/feature/embeddable-compiler

Support embeddable compiler jar
rickclephas · Nov 19, 2021 · 96dc5ea · 96dc5ea
2 parents 9d85373 + 6a4781a
commit 96dc5ea
Show file tree

Hide file tree

Showing 7 changed files with 56 additions and 3 deletions.
diff --git a/.github/workflows/run-integration-tests.yaml b/.github/workflows/run-integration-tests.yaml
@@ -26,7 +26,8 @@ jobs:
         xcode: [ 13.1 ]
         java: [ 11 ]
         platform: [ iOS, macOS, tvOS, watchOS ]
-    name: ${{ format('{0} ({1}, Xcode {2}, JDK {3})', matrix.platform, matrix.os, matrix.xcode, matrix.java) }}
+        embeddable-compiler: [ true, false ]
+    name: ${{ format('{0} (embeddable {1}) ({2}, Xcode {3}, JDK {4})', matrix.platform, matrix.embeddable-compiler, matrix.os, matrix.xcode, matrix.java) }}
     runs-on: ${{ matrix.os }}
     defaults:
       run:
@@ -49,6 +50,10 @@ jobs:
         uses: ./.github/actions/cache-gradle
       - name: Cache Konan
         uses: ./.github/actions/cache-konan
+      - name: Set kotlin.native.useEmbeddableCompilerJar
+        env:
+          KOTLIN_NATIVE_EMBEDDABLE_COMPILER: ${{ matrix.embeddable-compiler }}
+        run: echo "kotlin.native.useEmbeddableCompilerJar=KOTLIN_NATIVE_EMBEDDABLE_COMPILER" >> gradle.properties
       - name: Install CocoaPods dependencies
         run: |
           ./gradlew :shared:generateDummyFramework

diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt
@@ -4,6 +4,7 @@ object Dependencies {
         private const val version = "1.6.0"
         const val gradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$version"
         const val compiler = "org.jetbrains.kotlin:kotlin-compiler:$version"
+        const val embeddableCompiler = "org.jetbrains.kotlin:kotlin-compiler-embeddable:$version"
     }
 
     object Kotlinx {

diff --git a/kmp-nativecoroutines-compiler-embeddable/.gitignore b/kmp-nativecoroutines-compiler-embeddable/.gitignore
@@ -0,0 +1 @@
+src/
diff --git a/kmp-nativecoroutines-compiler-embeddable/build.gradle.kts b/kmp-nativecoroutines-compiler-embeddable/build.gradle.kts
@@ -0,0 +1,45 @@
+plugins {
+    kotlin("jvm")
+    `kmp-nativecoroutines-publish`
+}
+
+dependencies {
+    compileOnly(Dependencies.Kotlin.embeddableCompiler)
+}
+
+val syncSources by tasks.registering(Sync::class) {
+    from(project(":kmp-nativecoroutines-compiler").sourceSets.main.get().allSource)
+    into("src/main/kotlin")
+    filter {
+        when (it) {
+            "import com.intellij.mock.MockProject" -> "import org.jetbrains.kotlin.com.intellij.mock.MockProject"
+            else -> it
+        }
+    }
+}
+
+tasks.compileKotlin.configure {
+    dependsOn(syncSources)
+    kotlinOptions {
+        jvmTarget = "11"
+        freeCompilerArgs = listOf("-Xjvm-default=all")
+    }
+}
+
+tasks.clean.configure {
+    delete("src")
+}
+
+val sourcesJar by tasks.registering(Jar::class) {
+    archiveClassifier.set("sources")
+    from(sourceSets.main.get().allSource)
+}
+
+publishing {
+    publications {
+        create<MavenPublication>("maven") {
+            from(components["kotlin"])
+            artifact(sourcesJar)
+        }
+    }
+}
diff --git a/.../src/main/kotlin/com/rickclephas/kmp/nativecoroutines/gradle/KmpNativeCoroutinesPlugin.kt b/.../src/main/kotlin/com/rickclephas/kmp/nativecoroutines/gradle/KmpNativeCoroutinesPlugin.kt
@@ -39,5 +39,5 @@ class KmpNativeCoroutinesPlugin: KotlinCompilerPluginSupportPlugin {
         SubpluginArtifact("com.rickclephas.kmp", "kmp-nativecoroutines-compiler", VERSION)
 
     override fun getPluginArtifact(): SubpluginArtifact =
-        throw UnsupportedOperationException("KMP-NativeCoroutines only supports Kotlin\\Native!")
+        SubpluginArtifact("com.rickclephas.kmp", "kmp-nativecoroutines-compiler-embeddable", VERSION)
 }
diff --git a/sample/settings.gradle.kts b/sample/settings.gradle.kts
@@ -11,7 +11,7 @@ include(":shared")
 
 includeBuild("..") {
     dependencySubstitution {
-        listOf("annotations", "compiler", "core", "gradle-plugin").forEach {
+        listOf("annotations", "compiler", "compiler-embeddable", "core", "gradle-plugin").forEach {
             substitute(module("com.rickclephas.kmp:kmp-nativecoroutines-$it"))
                 .using(project(":kmp-nativecoroutines-$it"))
         }

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -10,4 +10,5 @@ rootProject.name = "kmp-nativecoroutines"
 include(":kmp-nativecoroutines-core")
 include(":kmp-nativecoroutines-annotations")
 include(":kmp-nativecoroutines-compiler")
+include(":kmp-nativecoroutines-compiler-embeddable")
 include(":kmp-nativecoroutines-gradle-plugin")