0.4.1

build-conventions/src/main/kotlin/convention.control.gradle.kts

@@ -45,17 +45,17 @@ fun control(targets: NamedDomainObjectCollection<KotlinTarget>) {
   val osxHostTargets = nativeTargets.matching { it.konanTarget.buildHost == Family.OSX }
   val mainHostTargets = targets.matching { it !in nativeTargets }
   linuxHostTargets.onlyBuildIf {
-    val enabled = !CI || SANDBOX || HostManager.hostIsLinux
+    val enabled = HostManager.hostIsLinux
     printlnCI("[${it.name}] ${!CI} || $SANDBOX || ${HostManager.hostIsLinux} = $enabled")
     enabled
   }
   osxHostTargets.onlyBuildIf {
-    val enabled = !CI || SANDBOX || HostManager.hostIsMac
+    val enabled = HostManager.hostIsMac
     printlnCI("[${it.name}] ${!CI} || $SANDBOX || ${HostManager.hostIsMac} = $enabled")
     enabled
   }
   windowsHostTargets.onlyBuildIf {
-    val enabled = !CI || SANDBOX || HostManager.hostIsMingw
+    val enabled = HostManager.hostIsMingw
     printlnCI("[${it.name}] ${!CI} || $SANDBOX || ${HostManager.hostIsMingw} = $enabled")
     enabled
   }

build-conventions/src/main/kotlin/convention.publishing-jvm.gradle.kts

@@ -1,5 +1,4 @@
 plugins {
-  kotlin("jvm")
   id("convention.publishing")
 }
 

build-conventions/src/main/kotlin/convention.publishing.gradle.kts

@@ -70,7 +70,7 @@ publishing {
       pom {
         name by project.name
         url by "https://github.com/$ghOwnerId/${rootProject.name}"
-        description by project.description
+        description by provider { project.description }
 
         licenses {
           license {

gradle.properties

@@ -22,7 +22,7 @@ [email protected]
 #======================================= Project ========================================
 group=dev.petuska
 description=Kotlin Multiplatform test snapshots (klips) manager
-version=0.4.0-SNAPSHOT
+version=0.4.1-SNAPSHOT
 #======================================== Build =========================================
 kotlin.js.test.browser=firefox-headless
 # linux | macos | windows

gradle/versions.properties

@@ -19,7 +19,6 @@ version.org.jetbrains.dokka..dokka-gradle-plugin=1.6.21
 version.com.github.gmazzo..gradle-buildconfig-plugin=3.0.3
 version.io.github.gradle-nexus..publish-plugin=1.1.0
 #====================================== Libraries =======================================
-version.dev.petuska..container-tasks-gradle-plugin=0.0.4
 version.com.github.tschuchortdev..kotlin-compile-testing=1.4.8
 version.kotlin=1.7.0
 version.kotest=5.3.0

klip-sandbox/build.gradle.kts

@@ -2,7 +2,8 @@ import util.withName
 
 plugins {
   id("convention.library-mpp")
-  id("dev.petuska.klip") version "0.4.0"
+  id("convention.control")
+  id("dev.petuska.klip") version "0.4.1-SNAPSHOT"
 }
 
 gradleEnterprise {
@@ -18,7 +19,6 @@ repositories {
 
 klip {
   debug.set(true)
-  update.set(false)
 }
 
 kotlin {

klip-sandbox/settings.gradle.kts

@@ -1,10 +1,10 @@
 pluginManagement {
   repositories {
+    mavenLocal()
     gradlePluginPortal()
     mavenCentral()
     google()
     maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
-    mavenLocal()
   }
 }
 

plugin/klip-gradle-plugin/build.gradle.kts

@@ -1,4 +1,7 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
 plugins {
+  kotlin("jvm")
   id("com.gradle.plugin-publish")
   `java-gradle-plugin`
   id("convention.publishing-jvm")
@@ -24,12 +27,18 @@ pluginBundle {
   tags = listOf("multiplatform", "test", "kotlin", "snapshots")
 }
 
+configurations.all {
+  resolutionStrategy {
+    force("org.jetbrains.kotlin:kotlin-stdlib:$embeddedKotlinVersion")
+  }
+}
+
 kotlin {
   sourceSets {
     main {
       dependencies {
+        compileOnly(kotlin("stdlib"))
         compileOnly(kotlin("gradle-plugin-api"))
-        api("dev.petuska:container-tasks-gradle-plugin:_")
         implementation("io.ktor:ktor-server-cio:_")
         implementation("io.ktor:ktor-server-cors:_")
         implementation("io.ktor:ktor-server-content-negotiation:_")
@@ -49,3 +58,11 @@ kotlin {
 java {
   withSourcesJar()
 }
+
+tasks {
+  withType<KotlinCompile> {
+    kotlinOptions {
+      languageVersion = "1.4"
+    }
+  }
+}

plugin/klip-kotlin-plugin-native/build.gradle.kts

@@ -1,6 +1,7 @@
 import io.gitlab.arturbosch.detekt.Detekt
 
 plugins {
+  kotlin("jvm")
   id("convention.publishing-jvm")
 }
 

plugin/klip-kotlin-plugin/build.gradle.kts

@@ -1,4 +1,5 @@
 plugins {
+  kotlin("jvm")
   id("convention.publishing-jvm")
   id("convention.build-konfig")
 }

plugin/klip-kotlin-plugin/src/main/kotlin/transformer/KlippableFnIrTransformer.kt

@@ -47,7 +47,7 @@ class KlippableFnIrTransformer(
 
   override fun lower(irFile: IrFile) {
     val filePath = File(irFile.path)
-    klipPath = filePath.parentFile.resolve("__klips__/${filePath.name}.json").canonicalPath
+    klipPath = filePath.parentFile.resolve("__klips__/${filePath.name}.klip.json").canonicalPath
     index = 0
     scope = null
     scopeName = null