Skip to content

Commit e6357d2

Browse files
authored
Merge pull request #171 from jenetics/releases/r3.1.0
v3.1.0.
2 parents afff91f + 2885601 commit e6357d2

File tree

14 files changed

+150
-42
lines changed

14 files changed

+150
-42
lines changed

.github/workflows/gradle.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
strategy:
1818
matrix:
1919
os: [ ubuntu-latest, macos-latest ]
20-
java-version: [ 17, 18 ]
20+
java-version: [ 17, 21 ]
2121
steps:
2222
- uses: actions/checkout@v2
2323

README.md

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@
66

77
**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.
88

9-
Beside the basic functionality of reading and writing GPX files, the library also allows to manipulate the read GPX object in a functional way.
9+
Besides the basic functionality of reading and writing GPX files, the library also allows manipulating the read GPX object in a functional way.
1010

1111

1212
## Dependencies
1313

14-
No external dependencies are needed by the _JPX_ library. It only needs **Java 17** to compile and run.
14+
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**.
1515

1616

1717
## Building JPX
1818

19-
For building the JPX library you have to check out the master branch from Github.
19+
For building the JPX library you have to check out the `master` branch from GitHub.
2020

2121
$ git clone https://github.com/jenetics/jpx.git
2222

@@ -314,7 +314,7 @@ org.acme.NonValidatingDocumentBuilder
314314

315315
The library is licensed under the [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.html).
316316

317-
Copyright 2016-2022 Franz Wilhelmstötter
317+
Copyright 2016-2023 Franz Wilhelmstötter
318318

319319
Licensed under the Apache License, Version 2.0 (the "License");
320320
you may not use this file except in compliance with the License.
@@ -330,6 +330,22 @@ The library is licensed under the [Apache License, Version 2.0](http://www.apach
330330

331331
## Release notes
332332

333+
### [3.1.0](https://github.com/jenetics/jpx/releases/tag/v3.1.0)
334+
335+
#### Improvements
336+
337+
* [#170](https://github.com/jenetics/jpx/issues/170): GPX files with invalid version number are now readable in _LENIENT_ mode.
338+
```java
339+
final GPX gpx;
340+
try (InputStream in = new FileInputStream(resource)) {
341+
gpx = GPX.Reader.of(Mode.LENIENT).read(in);
342+
}
343+
```
344+
345+
#### Bugs
346+
347+
* [#167](https://github.com/jenetics/jpx/issues/167): Fixing a test case for Windows.
348+
333349
### [3.0.1](https://github.com/jenetics/jpx/releases/tag/v3.0.1)
334350

335351
#### Bugs

build.gradle.kts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525
*/
2626
plugins {
2727
base
28-
id("me.champeau.jmh") version "0.6.6" apply false
28+
id("me.champeau.jmh") version "0.7.2" apply false
2929
}
3030

3131
rootProject.version = JPX.VERSION
3232

3333
tasks.named<Wrapper>("wrapper") {
34-
version = "7.4"
34+
version = "8.4"
3535
distributionType = Wrapper.DistributionType.ALL
3636
}
3737

@@ -51,7 +51,7 @@ allprojects {
5151
}
5252

5353
configurations.all {
54-
resolutionStrategy.failOnVersionConflict()
54+
resolutionStrategy.preferProjectModules()
5555
}
5656
}
5757

@@ -129,7 +129,7 @@ fun setupTestReporting(project: Project) {
129129
project.apply(plugin = "jacoco")
130130

131131
project.configure<JacocoPluginExtension> {
132-
toolVersion = "0.8.7"
132+
toolVersion = "0.8.9"
133133
}
134134

135135
project.tasks {

buildSrc/build.gradle.kts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
2+
13
/*
24
* Java GPX Library (@__identifier__@).
35
* Copyright (c) @__year__@ Franz Wilhelmstötter
@@ -33,6 +35,10 @@ repositories {
3335
gradlePluginPortal()
3436
}
3537

38+
tasks.withType<KotlinCompile>().configureEach {
39+
kotlinOptions.jvmTarget = "17"
40+
}
41+
3642
configure<JavaPluginExtension> {
3743
sourceCompatibility = JavaVersion.VERSION_17
3844
targetCompatibility = JavaVersion.VERSION_17

buildSrc/src/main/kotlin/Env.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ object Env {
5252
* Information about the library and author.
5353
*/
5454
object JPX {
55-
const val VERSION = "3.0.1"
55+
const val VERSION = "3.1.0"
5656
const val ID = "jpx"
5757
const val NAME = "jpx"
5858
const val GROUP = "io.jenetics"

gradle/wrapper/gradle-wrapper.jar

3.81 KB
Binary file not shown.
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
46
zipStoreBase=GRADLE_USER_HOME
57
zipStorePath=wrapper/dists

gradlew

Lines changed: 28 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 9 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

jpx/src/main/java/io/jenetics/jpx/GPX.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1966,7 +1966,7 @@ private static String keywords(final GPX gpx) {
19661966
private static XMLReaders
19671967
readers(final Function<? super String, Length> lengthParser) {
19681968
return new XMLReaders()
1969-
.v00(XMLReader.attr("version").map(Version::of))
1969+
.v00(XMLReader.attr("version").map(Version::of, Version.V11))
19701970
.v00(XMLReader.attr("creator"))
19711971
.v11(Metadata.READER)
19721972
.v10(XMLReader.elem("name"))

0 commit comments

Comments
 (0)