Skip to content

Commit 4187897

Browse files
authored
Merge pull request #18 from tsmock/fixup-19297
Fix JOSM #19297 and GH #17
2 parents a5483b2 + e30af6d commit 4187897

File tree

5 files changed

+13
-11
lines changed

5 files changed

+13
-11
lines changed

build.gradle

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ plugins {
33
id "org.openstreetmap.josm" version "0.8.2"
44
}
55

6-
sourceCompatibility = '1.8'
6+
sourceCompatibility = '11'
77

88
sourceSets {
99
main {
@@ -23,10 +23,11 @@ archivesBaseName = 'fieldpapers'
2323
josm {
2424
version = '0.5.0'
2525
i18n {
26-
pathTransformer = getPathTransformer("github.com/fieldpapers/josm-fieldpapers/blob")
26+
pathTransformer = getPathTransformer(project.projectDir, "github.com/fieldpapers/josm-fieldpapers/blob")
2727
}
2828
manifest {
2929
oldVersionDownloadLink 10273, 'v0.4.2', new URL('https://github.com/floscher/josm-fieldpapers/releases/download/v0.4.2/fieldpapers.jar')
30+
oldVersionDownloadLink 14140, 'v0.5.0', new URL('https://github.com/fieldpapers/josm-fieldpapers/releases/download/v0.5.0/fieldpapers.jar')
3031
}
3132
}
3233

@@ -39,4 +40,4 @@ tasks.withType(JavaCompile) {
3940
"-Xlint:all",
4041
"-Xlint:-serial",
4142
]
42-
}
43+
}

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ plugin.icon=images/preferences/fieldpapers.png
55
plugin.link=http://wiki.openstreetmap.org/index.php/JOSM/Plugins/FieldPapers
66
# Minimum required JOSM version to run this plugin, choose the lowest version possible that is compatible.
77
# You can check if the plugin compiles against this version by executing `./gradlew minJosmVersionClasses`.
8-
plugin.main.version=14140
8+
plugin.main.version=19044
99
# Version of JOSM against which the plugin is compiled
1010
# Please check, if the specified version is available for download from https://josm.openstreetmap.de/download/ .
1111
# If not, choose the next higher number that is available, or the gradle build will break.
12-
plugin.compile.version=14178
12+
plugin.compile.version=19048

gradle/wrapper/gradle-wrapper.jar

1.43 KB
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3+
distributionSha256Sum=5b9c5eb3f9fc2c94abaea57d90bd78747ca117ddbbf96c859d3741181a12bf2a
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
35
zipStoreBase=GRADLE_USER_HOME
46
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip

src/org/openstreetmap/josm/plugins/fieldpapers/FieldPapersAddLayerAction.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@
88
import java.io.InputStream;
99
import java.net.URL;
1010

11-
import javax.json.Json;
12-
import javax.json.JsonArray;
13-
import javax.json.JsonObject;
14-
import javax.json.JsonReader;
15-
import javax.json.stream.JsonParsingException;
1611
import javax.swing.JLabel;
1712
import javax.swing.JOptionPane;
1813
import javax.swing.JPanel;
1914

15+
import jakarta.json.Json;
16+
import jakarta.json.JsonArray;
17+
import jakarta.json.JsonObject;
18+
import jakarta.json.JsonReader;
19+
import jakarta.json.stream.JsonParsingException;
2020
import org.openstreetmap.josm.actions.JosmAction;
2121
import org.openstreetmap.josm.data.Bounds;
2222
import org.openstreetmap.josm.data.coor.LatLon;

0 commit comments

Comments
 (0)