From 0a32eb4e4634ad144392c157c225e452c8368116 Mon Sep 17 00:00:00 2001
From: Adam <897017+aSemy@users.noreply.github.com>
Date: Thu, 2 Jun 2022 16:04:58 +0200
Subject: [PATCH 1/4] make buildSrc use the same jvm and Kotlin versions as
 main project

---
 buildSrc/build.gradle.kts | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index c5aa19e4..3df8a3fd 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 plugins {
   idea
   `kotlin-dsl`
-  kotlin("jvm") version "1.6.20"
+  kotlin("jvm") version "1.6.21"
   `project-report`
 }
 
@@ -25,15 +25,13 @@ dependencies {
   implementation(libs.gradleNodePlugin)
 }
 
-val gradleJvmTarget = "11"
-val gradleKotlinTarget = "1.6"
 
 tasks.withType<KotlinCompile>().configureEach {
 
   kotlinOptions {
-    jvmTarget = gradleJvmTarget
-    apiVersion = gradleKotlinTarget
-    languageVersion = gradleKotlinTarget
+    jvmTarget = libs.versions.jvmTarget.get()
+    apiVersion = libs.versions.kotlinTarget.get()
+    languageVersion = libs.versions.kotlinTarget.get()
   }
 
   kotlinOptions.freeCompilerArgs += listOf(
@@ -45,11 +43,17 @@ tasks.withType<KotlinCompile>().configureEach {
 
 kotlin {
   jvmToolchain {
-    (this as JavaToolchainSpec).languageVersion.set(JavaLanguageVersion.of(gradleJvmTarget))
+    (this as JavaToolchainSpec).languageVersion.set(
+      libs.versions.jvmTarget.map {
+        JavaLanguageVersion.of(
+          it.substringAfter(".")
+        )
+      }
+    )
   }
 
   kotlinDslPluginOptions {
-    jvmTarget.set(gradleJvmTarget)
+    jvmTarget.set(libs.versions.jvmTarget)
   }
 }
 

From 2035c4276cc5b313170009b23f46822155a8bd1b Mon Sep 17 00:00:00 2001
From: Adam <897017+aSemy@users.noreply.github.com>
Date: Thu, 2 Jun 2022 16:47:33 +0200
Subject: [PATCH 2/4] bump qoomon git versioning,

---
 build.gradle.kts          | 2 +-
 buildSrc/build.gradle.kts | 2 ++
 gradle/libs.versions.toml | 6 ++++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 23a84af9..b4d628a2 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -3,7 +3,7 @@ import buildsrc.config.excludeGeneratedGradleDsl
 plugins {
   base
   idea
-  id("me.qoomon.git-versioning") version "5.1.5"
+  id("me.qoomon.git-versioning")
   id("org.jetbrains.kotlinx.kover")
 }
 
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 3df8a3fd..4eaa5209 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -23,6 +23,8 @@ dependencies {
   implementation(libs.kotlinx.knit.gradlePlugin)
 
   implementation(libs.gradleNodePlugin)
+
+  implementation(libs.qoomonGitVersioning)
 }
 
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 493a8962..28fe0828 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -23,6 +23,9 @@ classgraph = "4.8.143"
 
 gradleNodePlugin = "3.3.0"
 
+#qoomonGitVersioning = "6.1.1" // bugged: https://github.com/qoomon/gradle-git-versioning-plugin/issues/76
+qoomonGitVersioning = "5.2.0"
+
 [libraries]
 
 kotlin-bom = { group = "org.jetbrains.kotlin", name = "kotlin-bom", version.ref = "kotlin" }
@@ -68,6 +71,9 @@ kotlinx-knit = { group = "org.jetbrains.kotlinx", name = "kotlinx-knit", version
 kotlinx-knit-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-knit-test", version.ref = "kotlinx-knit" }
 kotlinx-knit-gradlePlugin = { group = "org.jetbrains.kotlinx", name = "kotlinx-knit", version.ref = "kotlinx-knit" }
 
+
+qoomonGitVersioning = { group = "me.qoomon", name = "gradle-git-versioning-plugin", version.ref = "qoomonGitVersioning" }
+
 [bundles]
 
 [plugins]

From 338726fbb95de9ff3063e494a319db7e28b8000f Mon Sep 17 00:00:00 2001
From: Adam <897017+aSemy@users.noreply.github.com>
Date: Thu, 2 Jun 2022 16:47:47 +0200
Subject: [PATCH 3/4] allow 'tags on branches'

---
 build.gradle.kts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build.gradle.kts b/build.gradle.kts
index b4d628a2..cd5b625d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -12,6 +12,7 @@ project.group = "dev.adamko.kxstsgen"
 project.version = "0.0.0-SNAPSHOT"
 gitVersioning.apply {
   refs {
+    considerTagsOnBranches = true
     branch(".+") { version = "\${ref}-SNAPSHOT" }
     tag("v(?<version>.*)") { version = "\${ref.version}" }
   }

From 78ec46faba0a6c64d3692d254d8cb0cadc1c4226 Mon Sep 17 00:00:00 2001
From: Adam <897017+aSemy@users.noreply.github.com>
Date: Thu, 2 Jun 2022 16:48:19 +0200
Subject: [PATCH 4/4] rm unneeded project-report plugin from buildSrc

---
 buildSrc/build.gradle.kts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 4eaa5209..fb658464 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -4,7 +4,6 @@ plugins {
   idea
   `kotlin-dsl`
   kotlin("jvm") version "1.6.21"
-  `project-report`
 }