Build and release fixes (#37)

* make buildSrc use the same jvm and Kotlin versions as main project

* bump qoomon git versioning,

* allow 'tags on branches'

* rm unneeded project-report plugin from buildSrc

Author: aSemy

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")
 }
 
@@ -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}" }
   }

buildSrc/build.gradle.kts

@@ -3,8 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 plugins {
   idea
   `kotlin-dsl`
-  kotlin("jvm") version "1.6.20"
-  `project-report`
+  kotlin("jvm") version "1.6.21"
 }
 
 
@@ -23,17 +22,17 @@ dependencies {
   implementation(libs.kotlinx.knit.gradlePlugin)
 
   implementation(libs.gradleNodePlugin)
+
+  implementation(libs.qoomonGitVersioning)
 }
 
-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 +44,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)
   }
 }
 

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]