From 2734c78a491e526c5aa757046a455e90d1dad4ad Mon Sep 17 00:00:00 2001
From: Geert Mulders <gmulders@gmail.com>
Date: Thu, 7 Mar 2024 14:59:18 +0100
Subject: [PATCH] Upgrade configurations

---
 .github/workflows/run-test.yml           | 16 +++++++++-------
 build.gradle.kts                         |  2 +-
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 measure/build.gradle.kts                 | 19 ++++++++-----------
 settings.gradle.kts                      |  3 +--
 5 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/run-test.yml b/.github/workflows/run-test.yml
index cdc5796..7efa908 100644
--- a/.github/workflows/run-test.yml
+++ b/.github/workflows/run-test.yml
@@ -13,14 +13,16 @@ jobs:
         os: [ubuntu-latest]
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-java@v3
+    - name: Checkout repo
+      uses: actions/checkout@v4
+    - name: Set up Java
+      uses: actions/setup-java@v3
       with:
         distribution: temurin
-        java-version: 11
-        
+        java-version: 17
+
     - name: Setup Gradle
-      uses: gradle/gradle-build-action@v2
-    
+      uses: gradle/actions/setup-gradle@v3
+
     - name: Execute Gradle build
-      run: ./gradlew test
\ No newline at end of file
+      run: ./gradlew :measure:test
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
index ff093c4..22e856e 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -4,5 +4,5 @@
 
 plugins {
     // Apply the org.jetbrains.kotlin.jvm Plugin to add support for Kotlin.
-    id("org.jetbrains.kotlin.jvm") version "1.5.0" apply false
+    id("org.jetbrains.kotlin.jvm") version "1.9.23" apply false
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 700380c..be2cff0 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -4,6 +4,6 @@
 
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/measure/build.gradle.kts b/measure/build.gradle.kts
index 4fcdec9..e09062f 100644
--- a/measure/build.gradle.kts
+++ b/measure/build.gradle.kts
@@ -2,14 +2,6 @@
 //
 // SPDX-License-Identifier: MPL-2.0
 
-/*
- * This file was generated by the Gradle 'init' task.
- *
- * This generated file contains a sample Kotlin library project to get you started.
- * For more details take a look at the 'Building Java & JVM projects' chapter in the Gradle
- * User Manual available at https://docs.gradle.org/6.7.1/userguide/building_java_projects.html
- */
-
 plugins {
     // Apply the org.jetbrains.kotlin.jvm Plugin to add support for Kotlin.
     id("org.jetbrains.kotlin.jvm")
@@ -28,8 +20,7 @@ group = "com.alliander"
 version = "1.2"
 
 repositories {
-    // Use JCenter for resolving dependencies.
-    jcenter()
+    mavenCentral()
 }
 
 dependencies {
@@ -44,9 +35,15 @@ dependencies {
     testImplementation("io.kotest:kotest-property:4.3.2")
 }
 
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of("17"))
+    }
+}
+
 tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "17"
     }
 }
 
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 68b7be8..068c3e1 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -11,13 +11,12 @@
  * in the user manual at https://docs.gradle.org/6.7.1/userguide/multi_project_builds.html
  */
 
-rootProject.name = "Measure"
+rootProject.name = "measure"
 include("measure")
 include("measure-generator")
 
 pluginManagement {
     repositories {
         gradlePluginPortal()
-        jcenter()
     }
 }