Defer reflection stuff till execution time (after konan downloaded)

Author: kpgalligan

gradle.properties

@@ -14,7 +14,7 @@ android.useAndroidX=true
 org.gradle.jvmargs=-Xmx2g
 
 GROUP=co.touchlab
-CKLIB_VERSION=0.3.2
+CKLIB_VERSION=0.3.3
 
 POM_NAME=CKlib
 POM_DESCRIPTION=C/C++ Bitcode Into Klib

plugin/src/main/kotlin/co/touchlab/cklib/gradle/CKlibGradleExtension.kt

@@ -13,6 +13,7 @@ package co.touchlab.cklib.gradle
 import co.touchlab.cklib.gradle.reflection.PlatformManager
 import org.gradle.api.GradleException
 import org.gradle.api.Project
+import org.jetbrains.kotlin.konan.target.Distribution
 import org.jetbrains.kotlin.konan.target.HostManager
 import org.jetbrains.kotlin.konan.target.TargetSupportException
 import javax.inject.Inject
@@ -50,7 +51,7 @@ get() = "${System.getProperty("user.home")}/.cklib"
 internal val Project.platformManager: PlatformManager
     get() {
         val cklibExtension = extensions.getByType(CompileToBitcodeExtension::class.java)
-        return PlatformManager(cklibExtension.config.konanHome)
+        return PlatformManager(Distribution(cklibExtension.config.konanHome), cklibExtension.config.konanHome)
     }
 
 internal val Project.llvmHome: String

plugin/src/main/kotlin/co/touchlab/cklib/gradle/CompileToBitcode.kt

@@ -20,7 +20,8 @@ import javax.inject.Inject
 open class CompileToBitcode @Inject constructor(
     srcRoot: File,
     @Input val compileName: String,
-    @Input val target: String
+    @Input val target: String,
+    val enabled: ()->Boolean
 ) : DefaultTask() {
 
     enum class Language {
@@ -179,6 +180,9 @@ open class CompileToBitcode @Inject constructor(
 
     @TaskAction
     fun compile() {
+        if(!enabled()){
+            return
+        }
         objDir.mkdirs()
 
         val plugin = ExecClang(project)

plugin/src/main/kotlin/co/touchlab/cklib/gradle/CompileToBitcodeExtension.kt

@@ -32,18 +32,21 @@ open class CompileToBitcodeExtension @Inject constructor(val project: Project) {
             it.description = "Compiles '$name' to bitcode for all targets"
         }.get()
 
-        val allTaskProviders = kmpExt.kotlinNativeTargets.filter { project.platformManager.isEnabled(it.konanTarget) }.map { knTarget ->
+        val allTaskProviders = kmpExt.kotlinNativeTargets.map { knTarget ->
+
+            val compileKotlinTask = project.tasks.getByPath("compileKotlin${knTarget.name.capitalize()}")
 
             val taskName = "${knTarget.name}${name.snakeCaseToCamelCase().capitalize()}"
 
             val taskProvider = project.tasks.register(
                 taskName,
                 CompileToBitcode::class.java,
-                srcDir, name, knTarget.konanTarget.name
+                srcDir, name, knTarget.konanTarget.name, { project.platformManager.isEnabled(knTarget.konanTarget) }
             )
 
             //tasks.getByName("compileKotlin${targetName.capitalize()}").dependsOn("${it.second}Quickjs")
-            project.tasks.getByPath("compileKotlin${knTarget.name.capitalize()}")
+
+            compileKotlinTask
                 .dependsOn(taskName)
 
             taskProvider.configure { compileToBitcodeTask ->

plugin/src/main/kotlin/co/touchlab/cklib/gradle/reflection/PlatformManager.kt

@@ -10,14 +10,15 @@
 
 package co.touchlab.cklib.gradle.reflection
 
+import org.jetbrains.kotlin.konan.target.Distribution
 import org.jetbrains.kotlin.konan.target.KonanTarget
 import java.io.File
 import java.net.URLClassLoader
 
 /**
  * Use reflection to grab what we want from the konan distribution
  */
-class PlatformManager(konanHome: String) {
+class PlatformManager(dist: Distribution, konanHome:String) {
     private val kotlinNativeJar = "${konanHome}/konan/lib/kotlin-native.jar"
     private val pmClass:Class<*>
     private val blindDelegate:Any
@@ -26,8 +27,8 @@ class PlatformManager(konanHome: String) {
         val child = URLClassLoader(arrayOf(File(kotlinNativeJar).toURL()), this.javaClass.classLoader)
         pmClass = Class.forName("org.jetbrains.kotlin.konan.target.PlatformManager", true, child)
         blindDelegate = pmClass.declaredConstructors.find {
-            it.parameters.size == 2 && it.parameters[1].type == String::class.java
-        }!!.newInstance(konanHome, null)
+            it.parameters.size == 2 && it.parameters[0].type == Distribution::class.java
+        }!!.newInstance(dist, false)
     }
 
     //targetManager(targetName).target