From acb45a1dea61dd844fba839cc31c79a7aca4bbe4 Mon Sep 17 00:00:00 2001
From: Fabian Mastenbroek <mail.fabianm@gmail.com>
Date: Fri, 4 Nov 2022 16:53:22 +0100
Subject: build: Increase minimum Java version to Java 17

This change updates the Gradle configuration to target Java 17 (instead
of Java 11) as the lowest denominator when running/building OpenDC. This
version of Java has been available for more than a year and is the
latest LTS release.
---
 buildSrc/src/main/kotlin/Libs.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'buildSrc/src/main/kotlin/Libs.kt')

diff --git a/buildSrc/src/main/kotlin/Libs.kt b/buildSrc/src/main/kotlin/Libs.kt
index 6a73e1b9..97dc36ca 100644
--- a/buildSrc/src/main/kotlin/Libs.kt
+++ b/buildSrc/src/main/kotlin/Libs.kt
@@ -50,6 +50,6 @@ public class Libs(project: Project) {
         /**
          * The JVM version to target.
          */
-        val jvmTarget = JavaVersion.VERSION_11
+        val jvmTarget = JavaVersion.VERSION_17
     }
 }
-- 
cgit v1.2.3


From 83ad9c927952474f1adeb03bd67331288ed6d6d9 Mon Sep 17 00:00:00 2001
From: Fabian Mastenbroek <mail.fabianm@gmail.com>
Date: Sun, 13 Nov 2022 12:28:04 +0000
Subject: build: Make use of Gradle's Java Toolchains feature

This change updates the build configuration for Gradle to make use of
its Java Toolchains feature which enables running/testing multiple Java
versions at the same time. This feature can also provision a Java
installation if it is not available on the user's system.
---
 buildSrc/src/main/kotlin/Libs.kt | 37 ++++++++++++++++---------------------
 1 file changed, 16 insertions(+), 21 deletions(-)

(limited to 'buildSrc/src/main/kotlin/Libs.kt')

diff --git a/buildSrc/src/main/kotlin/Libs.kt b/buildSrc/src/main/kotlin/Libs.kt
index 97dc36ca..09432b06 100644
--- a/buildSrc/src/main/kotlin/Libs.kt
+++ b/buildSrc/src/main/kotlin/Libs.kt
@@ -24,32 +24,27 @@
 
 import org.gradle.api.JavaVersion
 import org.gradle.api.Project
+import org.gradle.api.artifacts.VersionCatalog
 import org.gradle.api.artifacts.VersionCatalogsExtension
 import org.gradle.kotlin.dsl.getByType
 
 /**
- * This class makes the version catalog accessible for the build scripts until Gradle adds support for it.
- *
- * See https://github.com/gradle/gradle/issues/15383
+ * Obtain the default [VersionCatalog] of the project.
  */
-public class Libs(project: Project) {
-    /**
-     * The version catalog of the project.
-     */
-    private val versionCatalog = project.extensions.getByType(VersionCatalogsExtension::class).named("libs")
+public val Project.defaultVersionCatalog: VersionCatalog
+    get() = project.extensions.getByType(VersionCatalogsExtension::class).named("libs")
 
-    /**
-     * Obtain the version for the specified [dependency][name].
-     */
-    operator fun get(name: String): String {
-        val dep = versionCatalog.findLibrary(name).get().get()
-        return "${dep.module.group}:${dep.module.name}:${dep.versionConstraint.displayName}"
-    }
+/**
+ * Obtain the dependency string for the specified [name].
+ */
+public operator fun VersionCatalog.get(name: String): String {
+    val dep = findLibrary(name).get().get()
+    return "${dep.module.group}:${dep.module.name}:${dep.versionConstraint.displayName}"
+}
 
-    companion object {
-        /**
-         * The JVM version to target.
-         */
-        val jvmTarget = JavaVersion.VERSION_17
-    }
+/**
+ * Obtain the string representation of the version with the given [name].
+ */
+public fun VersionCatalog.getVersion(name: String): String {
+    return findVersion(name).get().displayName
 }
-- 
cgit v1.2.3