Merge pull request #17 from mauritssilvis/updates

Update the Java darts project to Java 20

api/java-darts-api/.gitignore

@@ -1,5 +1,5 @@
-# Created by https://gitignore.io/api/java,intellij,gradle
-# Edit at https://gitignore.io?templates=java,intellij,gradle
+# Created by https://gitignore.io/api/java,gradle,intellij
+# Edit at https://gitignore.io?templates=java,gradle,intellij
 
 ### Intellij ###
 # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
@@ -163,12 +163,11 @@ gradle-app.setting
 # JDT-specific (Eclipse Java Development Tools)
 .classpath
 
-# Distribution
-bin/
-lib/
-
 ### Gradle Patch ###
 # Java heap dump
 *.hprof
 
-# End of https://gitignore.io/api/java,intellij,gradle
+# End of https://gitignore.io/api/java,gradle,intellij
+
+### Gradle refreshVersions ###
+versions.properties

api/java-darts-api/CHANGELOG.md

@@ -1,10 +1,19 @@
 # Changelog
 
-All notable changes to the `java-darts-api` project (see [darts](https://github.com/mauritssilvis/darts) > [APIs](https://github.com/mauritssilvis/darts/tree/main/api) > [Java](.)) are documented in this file.
+All notable changes to the `java-darts-api` project (see [darts](https://github.com/mauritssilvis/darts) > [APIs](https://github.com/mauritssilvis/darts/tree/main/api) > [Java](https://github.com/mauritssilvis/darts/tree/main/api/java-darts-api)) are documented in this file.
 
 The file format is based on [keep a changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [semantic versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.7.0] - 2023-04-02
+
+### Changed
+
+#### Dependencies
+
+- Update the Java version to 20.
+- Update the Gradle version to 8.1-RC2.
+
 ## [0.6.0] - 2023-03-20
 
 ### Changed

api/java-darts-api/build.gradle.kts

@@ -7,25 +7,25 @@ plugins {
     `java-library`
     `maven-publish`
     signing
-    id("io.github.gradle-nexus.publish-plugin") version "1.3.0"
+    alias(libs.plugins.io.github.gradle.nexus.publish.plugin)
 }
 
 group = "nl.mauritssilvis.darts.java"
-version = "0.6.0"
+version = libs.versions.java.darts.get()
 
 repositories {
     mavenCentral()
 }
 
 dependencies {
-    compileOnly("org.projectlombok:lombok:1.18.26")
+    compileOnly(libs.lombok)
 
-    annotationProcessor("org.projectlombok:lombok:1.18.26")
+    annotationProcessor(libs.lombok)
 }
 
 java {
     toolchain {
-        languageVersion.set(JavaLanguageVersion.of(17))
+        languageVersion.set(JavaLanguageVersion.of(20))
         vendor.set(JvmVendorSpec.ADOPTIUM)
     }
 
@@ -90,6 +90,10 @@ nexusPublishing {
 }
 
 tasks {
+    compileJava {
+        options.javaModuleVersion.set("${project.version}")
+    }
+
     jar {
         manifest {
             attributes(
@@ -103,3 +107,11 @@ tasks {
         options.memberLevel = JavadocMemberLevel.PACKAGE
     }
 }
+
+tasks.withType<JavaCompile> {
+    options.encoding = "UTF-8"
+}
+
+tasks.withType<Javadoc> {
+    options.encoding = "UTF-8"
+}

api/java-darts-api/gradle.properties

@@ -0,0 +1,3 @@
+org.gradle.caching=true
+org.gradle.parallel=true
+org.gradle.warning.mode=all

api/java-darts-api/gradle/libs.versions.toml

@@ -0,0 +1,13 @@
+## Generated by $ ./gradlew refreshVersionsCatalog
+
+[plugins]
+
+io-github-gradle-nexus-publish-plugin = { id = "io.github.gradle-nexus.publish-plugin", version = "1.3.0" }
+
+[versions]
+
+java-darts = "0.7.0"
+
+[libraries]
+
+lombok = "org.projectlombok:lombok:1.18.26"

api/java-darts-api/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-rc-2-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

api/java-darts-api/gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -143,12 +140,16 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,6 +194,10 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in

api/java-darts-api/gradlew.bat

@@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 

api/java-darts-api/settings.gradle.kts

@@ -5,6 +5,7 @@
 
 plugins {
     id("org.gradle.toolchains.foojay-resolver-convention") version "0.4.0"
+    id("de.fayard.refreshVersions") version "0.51.0"
 }
 
 rootProject.name = "java-darts-api"

cli/java-darts-cli/.gitignore

@@ -1,5 +1,5 @@
-# Created by https://gitignore.io/api/java,intellij,gradle
-# Edit at https://gitignore.io?templates=java,intellij,gradle
+# Created by https://gitignore.io/api/java,gradle,intellij
+# Edit at https://gitignore.io?templates=java,gradle,intellij
 
 ### Intellij ###
 # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
@@ -163,12 +163,15 @@ gradle-app.setting
 # JDT-specific (Eclipse Java Development Tools)
 .classpath
 
-# Distribution
-bin/
-lib/
-
 ### Gradle Patch ###
 # Java heap dump
 *.hprof
 
-# End of https://gitignore.io/api/java,intellij,gradle
+# End of https://gitignore.io/api/java,gradle,intellij
+
+### Gradle installDist ###
+bin/
+lib/
+
+### Gradle refreshVersions ###
+versions.properties