Merge branch 'main' into infra/ci-code-suggest

Author: petertrr

.github/workflows/build_and_test.yml

@@ -9,7 +9,7 @@ on:
 jobs:
  build_and_test_with_code_coverage:
  name: Build, test and upload code coverage
- runs-on: ubuntu-20.04
+ runs-on: ubuntu-22.04
  env:
  CI: true
 

.github/workflows/release.yml

@@ -13,7 +13,7 @@ env:
 jobs:
  release_linux:
  name: Build release on main platform (Linux)
- runs-on: ubuntu-20.04
+ runs-on: ubuntu-22.04
  steps:
  - name: Checkout
  uses: actions/checkout@v3

build.gradle.kts

@@ -1,5 +1,4 @@
 import io.github.petertrr.configurePublishing
-import io.github.petertrr.configureVersioning
 import io.gitlab.arturbosch.detekt.Detekt
 import org.jetbrains.kotlin.gradle.targets.jvm.tasks.KotlinJvmTest
 
@@ -9,7 +8,6 @@ plugins {
  alias(libs.plugins.detekt)
 }
 
-configureVersioning()
 group = "io.github.petertrr"
 description = "A multiplatform Kotlin library for calculating text differences"
 

buildSrc/build.gradle.kts

@@ -9,7 +9,6 @@ repositories {
 
 val libs = extensions.getByType<VersionCatalogsExtension>().named("libs")
 dependencies {
- implementation("org.ajoberstar.reckon:reckon-gradle:0.16.1")
  implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.8.10")
  implementation("io.github.gradle-nexus:publish-plugin:1.3.0")
  implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:${libs.findVersion("kotlin").get()}")

buildSrc/src/main/kotlin/io/github/petertrr/VersioningConfiguration.kt

@@ -1,7 +1,7 @@
 [versions]
 kotlin = "1.8.21"
 junit = "5.9.3"
-detekt = "1.22.0"
+detekt = "1.23.0"
 
 [plugins]
 kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }

gradle/libs.versions.toml

@@ -1,7 +1,8 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=e111cb9948407e26351227dabce49822fb88c37ee72f1d1582a69c68af2e702f
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionSha256Sum=38f66cd6eef217b4c35855bb11ea4e9fbc53594ccccb5fb82dfd317ef8c2c5a3
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.jar

@@ -130,10 +130,13 @@ location of your Java installation."
  fi
 else
  JAVACMD=java
- which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+ if ! command -v java >/dev/null 2>&1
+ then
+ die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+ fi
 fi
 
 # Increase the maximum file descriptors if we can.

gradle/wrapper/gradle-wrapper.properties

@@ -6,7 +6,8 @@ pluginManagement {
 }
 
 plugins {
- id("com.gradle.enterprise") version("3.13.1")
+ id("com.gradle.enterprise") version("3.13.4")
+ id("org.ajoberstar.reckon.settings") version("0.18.0")
 }
 
 rootProject.name = "kotlin-multiplatform-diff"
@@ -17,6 +18,12 @@ dependencyResolutionManagement {
  }
 }
 
+extensions.configure<org.ajoberstar.reckon.gradle.ReckonExtension> {
+ setDefaultInferredScope("minor")
+ scopeFromProp()
+ stageFromProp("alpha", "rc", "final") // version string will be based on last commit; when checking out a tag, that
+}
+
 if (System.getenv("CI") != null) {
  gradleEnterprise {
  buildScan {