Merge pull request #185 from jenetics/issues/GPX-183-gradle_update

#183: Gradle update

.github/workflows/gradle.yml

@@ -17,7 +17,7 @@ jobs:
         strategy:
             matrix:
                 os: [ ubuntu-latest, macos-latest ]
-                java-version: [ 17, 21  ]
+                java-version: [ 17, 21, 23  ]
         steps:
             - uses: actions/checkout@v2
 

README.md

@@ -4,19 +4,19 @@
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.jenetics/jpx/badge.svg)](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22jpx%22)
 [![Javadoc](https://www.javadoc.io/badge/io.jenetics/jpx.svg)](http://www.javadoc.io/doc/io.jenetics/jpx)
 
-**JPX** is a Java library for creating, reading and writing [GPS](https://en.wikipedia.org/wiki/Global_Positioning_System) data in [GPX](https://en.wikipedia.org/wiki/GPS_Exchange_Format) format. It is a *full* implementation of version [1.1](http://www.topografix.com/GPX/1/1/) and version [1.0](http://www.topografix.com/gpx_manual.asp) of the GPX format. The data classes are completely immutable and allows a functional programming style. They  are working also nicely with the Java [Stream](https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/stream/Stream.html) API. It is also possible to convert the location information into strings which are compatible to the [ISO 6709](http://en.wikipedia.org/wiki/ISO_6709) standard.
+**JPX** is a Java library for creating, reading and writing [GPS](https://en.wikipedia.org/wiki/Global_Positioning_System) data in [GPX](https://en.wikipedia.org/wiki/GPS_Exchange_Format) format. It is a *full* implementation of version [1.1](http://www.topografix.com/GPX/1/1/) and version [1.0](http://www.topografix.com/gpx_manual.asp) of the GPX format. The data classes are completely immutable and allows a functional programming style. They are working also nicely with the Java [Stream](https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/stream/Stream.html) API. It is also possible to convert the location information into strings which are compatible to the [ISO 6709](http://en.wikipedia.org/wiki/ISO_6709) standard.
 
 Besides the basic functionality of reading and writing GPX files, the library also allows manipulating the read GPX object in a functional way.
 
 
 ## Dependencies
 
-No external dependencies are needed by the _JPX_ library. It only needs **Java 17** to compile and run. It also runs and compiles with **Java 21**.
+The _JPX_ library needs no external dependencies. It only needs **Java 17** to compile and run. It also runs and compiles with **Java 21** and **Java 23**.
 
 
 ## Building JPX
 
-For building the JPX library you have to check out the `master` branch from GitHub.
+For building the JPX library, you have to check out the `master` branch from GitHub.
 
     $ git clone https://github.com/jenetics/jpx.git
 
@@ -32,7 +32,7 @@ For building the JPX library you have to check out the `master` branch from GitH
 
 ## Examples
 
-### Creating new GPX object with 3 track-points
+### Creating a new GPX object with 3 track-points
 
 ```java
 final GPX gpx = GPX.builder()
@@ -283,7 +283,7 @@ final GPX gpx1 = gpx.toBuilder()
 
 ### XML configuration
 
-The _JPX_ library uses the XML classes available in the Java [`java.xml`](https://docs.oracle.com/en/java/javase/11/docs/api/java.xml/module-summary.html) module. This API is highly configurable and it is possible to replace the underlying implementation. Especially for Android, using different XML implementation is a necessity. _JPX_ uses three _factory_ classes for reading/writing GPX files:
+The _JPX_ library uses the XML classes available in the Java [`java.xml`](https://docs.oracle.com/en/java/javase/11/docs/api/java.xml/module-summary.html) module. This API is highly configurable, and it is possible to replace the underlying implementation. Especially for Android, using different XML implementation is a necessity. _JPX_ uses three _factory_ classes for reading/writing GPX files:
 
 1. [`XMLInputFactory`](https://docs.oracle.com/en/java/javase/11/docs/api/java.xml/javax/xml/stream/XMLInputFactory.html): This class is needed for reading GPX files.
 1. [`XMLOutputFactory`](https://docs.oracle.com/en/java/javase/11/docs/api/java.xml/javax/xml/stream/XMLOutputFactory.html): This class is needed for writing GPX files.
@@ -304,7 +304,7 @@ final class ValidatingDocumentBuilder extends XMLProvider {
     }
 }
 ```
-And don't forget to create a `META-INF/services/io.jenetics.jpx.XMLProvider` file with the following content:
+And remember to create a `META-INF/services/io.jenetics.jpx.XMLProvider` file with the following content:
 
 ```
 org.acme.NonValidatingDocumentBuilder
@@ -314,7 +314,7 @@ org.acme.NonValidatingDocumentBuilder
 
 The library is licensed under the [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.html).
 
-    Copyright 2016-2023 Franz Wilhelmstötter
+    Copyright 2016-2024 Franz Wilhelmstötter
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

build.gradle.kts

@@ -1,3 +1,6 @@
+import io.jenetics.gradle.dsl.isModule
+import io.jenetics.gradle.dsl.moduleName
+
 /*
  * Java GPX Library (@__identifier__@).
  * Copyright (c) @__year__@ Franz Wilhelmstötter
@@ -31,7 +34,7 @@ plugins {
 rootProject.version = JPX.VERSION
 
 tasks.named<Wrapper>("wrapper") {
-	version = "8.4"
+	version = "8.10.2"
 	distributionType = Wrapper.DistributionType.ALL
 }
 
@@ -111,8 +114,8 @@ fun setupJava(project: Project) {
 		"Build-OS-Arch" to Env.BUILD_OS_ARCH,
 		"Build-OS-Version" to Env.BUILD_OS_VERSION
 	)
-	if (project.extra.has("moduleName")) {
-		attr["Automatic-Module-Name"] = project.extra["moduleName"].toString()
+	if (project.isModule) {
+		attr["Automatic-Module-Name"] = project.moduleName
 	}
 
 	project.tasks.withType<Jar> {
@@ -129,7 +132,7 @@ fun setupTestReporting(project: Project) {
 	project.apply(plugin = "jacoco")
 
 	project.configure<JacocoPluginExtension> {
-		toolVersion = "0.8.9"
+		toolVersion = "0.8.12"
 	}
 
 	project.tasks {

buildSrc/src/main/kotlin/Env.kt

@@ -26,25 +26,25 @@ import java.time.format.DateTimeFormatter
  * Common environment values.
  */
 object Env {
-	val NOW = ZonedDateTime.now()
+	private val NOW: ZonedDateTime = ZonedDateTime.now()
 
-	val YEAR = Year.now();
+	private val YEAR: Year = Year.now();
 
 	val COPYRIGHT_YEAR = "2016-${YEAR}"
 
-	val DATE_FORMAT = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm")
+	private val DATE_FORMAT: DateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm")
 
-	val BUILD_DATE = DATE_FORMAT.format(NOW)
+	val BUILD_DATE: String = DATE_FORMAT.format(NOW)
 
-	val BUILD_JDK = System.getProperty("java.version")
+	val BUILD_JDK: String = System.getProperty("java.version")
 
-	val BUILD_OS_NAME = System.getProperty("os.name")
+	val BUILD_OS_NAME: String = System.getProperty("os.name")
 
-	val BUILD_OS_ARCH = System.getProperty("os.arch")
+	val BUILD_OS_ARCH: String = System.getProperty("os.arch")
 
-	val BUILD_OS_VERSION = System.getProperty("os.version")
+	val BUILD_OS_VERSION: String = System.getProperty("os.version")
 
-	val BUILD_BY = System.getProperty("user.name")
+	val BUILD_BY: String = System.getProperty("user.name")
 
 }
 

buildSrc/src/main/kotlin/io/jenetics/gradle/dsl/Extensions.kt

@@ -0,0 +1,43 @@
+/*
+ * Java GPX Library (@__identifier__@).
+ * Copyright (c) @__year__@ Franz Wilhelmstötter
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Author:
+ *    Franz Wilhelmstötter ([email protected])
+ */
+
+/**
+ * @author <a href="mailto:[email protected]">Franz Wilhelmstötter</a>
+ * @since !__version__!
+ * @version !__version__!
+ */
+package io.jenetics.gradle.dsl
+
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.extra
+
+/**
+ * Gets the module name of the project, as configured in the build file.
+ */
+var Project.moduleName: String
+	get() = if (this.isModule) this.extra.get("moduleName").toString()
+			else this.name
+	set(value) = this.extra.set("moduleName", value)
+
+/**
+ * Checks if the project is configured as a module.
+ */
+val Project.isModule: Boolean
+	get() = this.extra.has("moduleName")

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

jpx/build.gradle.kts

@@ -1,3 +1,5 @@
+import io.jenetics.gradle.dsl.moduleName
+
 /*
  * Java GPX Library (@__identifier__@).
  * Copyright (c) @__year__@ Franz Wilhelmstötter
@@ -31,7 +33,7 @@ plugins {
 
 description = "JPX - Java GPX (GPS) Library"
 
-extra["moduleName"] = "io.jenetics.jpx"
+moduleName = "io.jenetics.jpx"
 
 dependencies {
 	testImplementation(libs.assertj)

jpx/src/main/java/module-info.java

@@ -21,7 +21,7 @@
  * format. It is a <em>full</em> implementation of version
  * <a href="http://www.topografix.com/GPX/1/1/">1.1</a> and version
  * <a href="http://www.topografix.com/gpx_manual.as">1.0</a> of the GPX format.
- * The data classes are completely immutable and allows a functional programming
+ * The data classes are completely immutable and allow a functional programming
  * style. It is also possible to convert the location information into strings
  * which are compatible to the <a href="http://en.wikipedia.org/wiki/ISO_6709">
  * ISO 6709</a> standard.
@@ -75,7 +75,7 @@
  * final GPX gpx = GPX.Reader.of(GPX.Reader.Mode.LENIENT).read("track.xml");
  * }</pre>
  *
- * This allows to read otherwise invalid GPX files, like
+ * This allows reading otherwise invalid GPX files, like
  * <pre>{@code
  * <?xml version="1.0" encoding="UTF-8"?>
  * <gpx version="1.1" creator="GPSBabel - http://www.gpsbabel.org" xmlns="http://www.topografix.com/GPX/1/1">

settings.gradle.kts

@@ -33,13 +33,13 @@ pluginManagement {
 dependencyResolutionManagement {
 	versionCatalogs {
 		create("libs") {
-			library("assertj", "org.assertj:assertj-core:3.24.2")
+			library("assertj", "org.assertj:assertj-core:3.26.3")
 			library("commons-math", "org.apache.commons:commons-math3:3.6.1")
-			library("equalsverifier", "nl.jqno.equalsverifier:equalsverifier:3.15.3")
-			library("guava", "com.google.guava:guava:32.1.3-jre")
+			library("equalsverifier", "nl.jqno.equalsverifier:equalsverifier:3.17.1")
+			library("guava", "com.google.guava:guava:33.3.1-jre")
 			library("prngine", "io.jenetics:prngine:2.0.0")
 			library("rxjava", "io.reactivex.rxjava2:rxjava:2.2.21")
-			library("testng", "org.testng:testng:7.8.0")
+			library("testng", "org.testng:testng:7.10.2")
 		}
 	}
 }