From 34dc16f1c85892d84146ee593b822062fd739dd0 Mon Sep 17 00:00:00 2001
From: RoB Murdock <rob@zegreatrob.com>
Date: Sat, 4 Nov 2023 13:13:24 -0400
Subject: [PATCH] [patch] aligning everything on embedded kotlin for now, as
 this is almost entirely plugins

---
 .idea/kotlinc.xml                    | 2 +-
 tools/digger-core/build.gradle.kts   | 2 +-
 tools/digger-json/build.gradle.kts   | 4 ++--
 tools/digger-model/build.gradle.kts  | 2 +-
 tools/digger-plugin/build.gradle.kts | 2 +-
 tools/gradle/libs.versions.toml      | 3 ---
 tools/tagger-plugin/build.gradle.kts | 2 +-
 7 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
index fdf8d99..f8467b4 100644
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="KotlinJpsPluginSettings">
-    <option name="version" value="1.9.0" />
+    <option name="version" value="1.9.10" />
   </component>
 </project>
\ No newline at end of file
diff --git a/tools/digger-core/build.gradle.kts b/tools/digger-core/build.gradle.kts
index aebb931..efb9da6 100644
--- a/tools/digger-core/build.gradle.kts
+++ b/tools/digger-core/build.gradle.kts
@@ -19,7 +19,7 @@ java {
 dependencies {
     implementation(libs.org.ajoberstar.grgit.grgit.core)
     implementation(project(":digger-model"))
-    testImplementation(libs.org.jetbrains.kotlin.kotlin.test.junit5)
+    testImplementation(kotlin("test-junit5", embeddedKotlinVersion))
 }
 
 tasks {
diff --git a/tools/digger-json/build.gradle.kts b/tools/digger-json/build.gradle.kts
index 3d13068..e2fada8 100644
--- a/tools/digger-json/build.gradle.kts
+++ b/tools/digger-json/build.gradle.kts
@@ -2,7 +2,7 @@
 
 plugins {
     id("com.zegreatrob.tools.plugins.mp")
-    alias(libs.plugins.org.jetbrains.kotlin.plugin.serialization)
+    id("org.jetbrains.kotlin.plugin.serialization") version embeddedKotlinVersion
 }
 
 group = "com.zegreatrob.tools"
@@ -22,7 +22,7 @@ dependencies {
     commonMainImplementation("org.jetbrains.kotlinx:kotlinx-serialization-json")
     commonTestImplementation(kotlin("test"))
     commonTestImplementation("com.benasher44:uuid")
-    "jvmTestImplementation"(libs.org.jetbrains.kotlin.kotlin.test.junit5)
+    "jvmTestImplementation"(kotlin("test-junit5", embeddedKotlinVersion))
 }
 
 tasks {
diff --git a/tools/digger-model/build.gradle.kts b/tools/digger-model/build.gradle.kts
index 0cce031..3d008b5 100644
--- a/tools/digger-model/build.gradle.kts
+++ b/tools/digger-model/build.gradle.kts
@@ -18,7 +18,7 @@ kotlin {
 dependencies {
     commonMainApi(platform(project(":dependency-bom")))
     commonMainApi("org.jetbrains.kotlinx:kotlinx-datetime")
-    "jvmTestImplementation"(libs.org.jetbrains.kotlin.kotlin.test.junit5)
+    "jvmTestImplementation"(kotlin("test-junit5", embeddedKotlinVersion))
 }
 
 tasks {
diff --git a/tools/digger-plugin/build.gradle.kts b/tools/digger-plugin/build.gradle.kts
index a12113a..d832124 100644
--- a/tools/digger-plugin/build.gradle.kts
+++ b/tools/digger-plugin/build.gradle.kts
@@ -28,7 +28,7 @@ dependencies {
     implementation(project(":digger-core"))
     implementation(project(":digger-json"))
     implementation(libs.org.ajoberstar.grgit.gradle.plugin)
-    testImplementation(libs.org.jetbrains.kotlin.kotlin.test.junit5)
+    testImplementation(kotlin("test-junit5", embeddedKotlinVersion))
     "functionalTestImplementation"(platform(libs.org.junit.junit.bom))
 }
 
diff --git a/tools/gradle/libs.versions.toml b/tools/gradle/libs.versions.toml
index c87c9b7..fc77505 100644
--- a/tools/gradle/libs.versions.toml
+++ b/tools/gradle/libs.versions.toml
@@ -1,13 +1,11 @@
 [versions]
 org-ajoberstar-grgit = "5.2.1"
-org-jetbrains-kotlin = "1.9.10"
 
 [libraries]
 com-benasher44-uuid = "com.benasher44:uuid:0.8.1"
 # @keep
 org-ajoberstar-grgit-gradle-plugin = { module = "org.ajoberstar.grgit:org.ajoberstar.grgit.gradle.plugin", version.ref = "org-ajoberstar-grgit" }
 org-ajoberstar-grgit-grgit-core = { module = "org.ajoberstar.grgit:grgit-core", version.ref = "org-ajoberstar-grgit" }
-org-jetbrains-kotlin-kotlin-test-junit5 = { module = "org.jetbrains.kotlin:kotlin-test-junit5", version.ref = "org-jetbrains-kotlin" }
 org-jetbrains-kotlinx-kotlinx-datetime = "org.jetbrains.kotlinx:kotlinx-datetime:0.4.1"
 org-jetbrains-kotlinx-kotlinx-serialization-bom = "org.jetbrains.kotlinx:kotlinx-serialization-bom:1.6.0"
 org-junit-junit-bom = "org.junit:junit-bom:5.10.0"
@@ -17,4 +15,3 @@ com-gradle-plugin-publish = "com.gradle.plugin-publish:1.2.1"
 io-github-gradle-nexus-publish-plugin = "io.github.gradle-nexus.publish-plugin:2.0.0-rc-1"
 nl-littlerobots-version-catalog-update = "nl.littlerobots.version-catalog-update:0.8.1"
 org-ajoberstar-grgit = { id = "org.ajoberstar.grgit", version.ref = "org-ajoberstar-grgit" }
-org-jetbrains-kotlin-plugin-serialization = "org.jetbrains.kotlin.plugin.serialization:1.9.20"
diff --git a/tools/tagger-plugin/build.gradle.kts b/tools/tagger-plugin/build.gradle.kts
index d0625a9..71be4a5 100644
--- a/tools/tagger-plugin/build.gradle.kts
+++ b/tools/tagger-plugin/build.gradle.kts
@@ -26,7 +26,7 @@ configurations["functionalTestImplementation"].extendsFrom(configurations["testI
 
 dependencies {
     implementation(libs.org.ajoberstar.grgit.gradle.plugin)
-    testImplementation(libs.org.jetbrains.kotlin.kotlin.test.junit5)
+    testImplementation(kotlin("test-junit5", embeddedKotlinVersion))
     "functionalTestImplementation"(platform(libs.org.junit.junit.bom))
 }