wip

Vampire · Sep 14, 2024 · 48b9ebc · 48b9ebc
1 parent 7f4d362
commit 48b9ebc
Show file tree

Hide file tree

Showing 11 changed files with 1,050 additions and 79 deletions.
diff --git a/gradle/build-logic/build-logic.gradle.kts b/gradle/build-logic/build-logic.gradle.kts
@@ -24,6 +24,7 @@ plugins {
 
 dependencies {
     implementation(files(libs.javaClass.superclass.protectionDomain.codeSource.location))
+    implementation(files(kotlinWrappers.javaClass.superclass.protectionDomain.codeSource.location))
     implementation(plugin(libs.plugins.versions))
     implementation(plugin(libs.plugins.dependency.analysis))
     implementation(plugin(libs.plugins.release))

diff --git a/gradle/build-logic/settings.gradle.kts b/gradle/build-logic/settings.gradle.kts
@@ -82,9 +82,13 @@ dependencyResolutionManagement {
     repositoriesMode.set(FAIL_ON_PROJECT_REPOS)
 
     versionCatalogs {
-        create("libs") {
+        val libs by registering {
             from(files("../libs.versions.toml"))
         }
+
+        val kotlinWrappers by registering {
+            from("org.jetbrains.kotlin-wrappers:kotlin-wrappers-catalog:0.0.1-pre.807")
+        }
     }
 }
 

diff --git a/gradle/build-logic/src/main/kotlin/net/kautler/ncc_packer.gradle.kts b/gradle/build-logic/src/main/kotlin/net/kautler/ncc_packer.gradle.kts
@@ -18,6 +18,7 @@ package net.kautler
 
 import net.kautler.util.npm
 import org.gradle.accessors.dm.LibrariesForLibs
+import org.gradle.accessors.dm.LibrariesForKotlinWrappers
 import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsExec
 import org.jetbrains.kotlin.gradle.tasks.IncrementalSyncTask
 
@@ -26,6 +27,7 @@ plugins {
 }
 
 val libs = the<LibrariesForLibs>()
+val kotlinWrappers = the<LibrariesForKotlinWrappers>()
 
 kotlin {
     js {
@@ -38,9 +40,8 @@ kotlin {
         jsMain {
             dependencies {
                 implementation(libs.kotlinx.coroutines.core)
-                implementation(dependencies.platform(libs.kotlin.wrappers.bom))
-                implementation(libs.kotlin.wrapper.js)
-                implementation(libs.kotlin.wrapper.node)
+                implementation(kotlinWrappers.js)
+                implementation(kotlinWrappers.node)
                 implementation(npm(libs.build.vercel.ncc))
             }
         }

diff --git a/gradle/build-logic/src/main/kotlin/net/kautler/node.gradle.kts b/gradle/build-logic/src/main/kotlin/net/kautler/node.gradle.kts
@@ -19,6 +19,7 @@ package net.kautler
 import net.kautler.dao.action.GitHubAction
 import net.kautler.util.npm
 import org.gradle.accessors.dm.LibrariesForLibs
+import org.gradle.accessors.dm.LibrariesForKotlinWrappers
 import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsExec
 import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension
 import org.jetbrains.kotlin.gradle.tasks.IncrementalSyncTask
@@ -29,6 +30,7 @@ plugins {
 }
 
 val libs = the<LibrariesForLibs>()
+val kotlinWrappers = the<LibrariesForKotlinWrappers>()
 
 kotlin {
     js {
@@ -41,10 +43,9 @@ kotlin {
         jsMain {
             dependencies {
                 implementation(libs.kotlinx.coroutines.core)
-                implementation(dependencies.platform(libs.kotlin.wrappers.bom))
-                implementation(libs.kotlin.wrapper.actions.toolkit)
-                implementation(libs.kotlin.wrapper.js)
-                implementation(libs.kotlin.wrapper.node)
+                implementation(kotlinWrappers.actions.toolkit)
+                implementation(kotlinWrappers.js)
+                implementation(kotlinWrappers.node)
                 implementation(npm(libs.semver))
                 implementation(npm(libs.nullWritable))
             }

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -26,7 +26,6 @@ build-node = "20.11.0"
 build-snakeyaml = "2.0"
 build-vercel-ncc = "0.36.1"
 kotlin = "2.0.20"
-kotlin-wrappers = "1.0.0-pre.529"
 kotlinx-coroutines = "1.6.4"
 nullWritable = "1.0.5"
 semver = "7.3.8"
@@ -40,10 +39,6 @@ build-kotlinx-serialization-core = { module = "org.jetbrains.kotlinx:kotlinx-ser
 build-kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json" }
 build-snakeyaml = { module = "org.yaml:snakeyaml", version.ref = "build-snakeyaml" }
 build-vercel-ncc = { module = "vercel:ncc", version.ref = "build-vercel-ncc" }
-kotlin-wrapper-actions-toolkit = { module = "org.jetbrains.kotlin-wrappers:kotlin-actions-toolkit" }
-kotlin-wrapper-js = { module = "org.jetbrains.kotlin-wrappers:kotlin-js" }
-kotlin-wrapper-node = { module = "org.jetbrains.kotlin-wrappers:kotlin-node" }
-kotlin-wrappers-bom = { module = "org.jetbrains.kotlin-wrappers:kotlin-wrappers-bom", version.ref = "kotlin-wrappers" }
 kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" }
 nullWritable = { module = "<unscoped>:null-writable", version.ref = "nullWritable" }
 semver = { module = "<unscoped>:semver", version.ref = "semver" }