Skip to content

Commit

Permalink
Merge pull request #18 from tsmock/fixup-19297
Browse files Browse the repository at this point in the history
Fix JOSM #19297 and GH #17
  • Loading branch information
iandees authored Sep 9, 2024
2 parents a5483b2 + e30af6d commit 4187897
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 11 deletions.
7 changes: 4 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ plugins {
id "org.openstreetmap.josm" version "0.8.2"
}

sourceCompatibility = '1.8'
sourceCompatibility = '11'

sourceSets {
main {
Expand All @@ -23,10 +23,11 @@ archivesBaseName = 'fieldpapers'
josm {
version = '0.5.0'
i18n {
pathTransformer = getPathTransformer("github.com/fieldpapers/josm-fieldpapers/blob")
pathTransformer = getPathTransformer(project.projectDir, "github.com/fieldpapers/josm-fieldpapers/blob")
}
manifest {
oldVersionDownloadLink 10273, 'v0.4.2', new URL('https://github.com/floscher/josm-fieldpapers/releases/download/v0.4.2/fieldpapers.jar')
oldVersionDownloadLink 14140, 'v0.5.0', new URL('https://github.com/fieldpapers/josm-fieldpapers/releases/download/v0.5.0/fieldpapers.jar')
}
}

Expand All @@ -39,4 +40,4 @@ tasks.withType(JavaCompile) {
"-Xlint:all",
"-Xlint:-serial",
]
}
}
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ plugin.icon=images/preferences/fieldpapers.png
plugin.link=http://wiki.openstreetmap.org/index.php/JOSM/Plugins/FieldPapers
# Minimum required JOSM version to run this plugin, choose the lowest version possible that is compatible.
# You can check if the plugin compiles against this version by executing `./gradlew minJosmVersionClasses`.
plugin.main.version=14140
plugin.main.version=19044
# Version of JOSM against which the plugin is compiled
# Please check, if the specified version is available for download from https://josm.openstreetmap.de/download/ .
# If not, choose the next higher number that is available, or the gradle build will break.
plugin.compile.version=14178
plugin.compile.version=19048
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=5b9c5eb3f9fc2c94abaea57d90bd78747ca117ddbbf96c859d3741181a12bf2a
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@
import java.io.InputStream;
import java.net.URL;

import javax.json.Json;
import javax.json.JsonArray;
import javax.json.JsonObject;
import javax.json.JsonReader;
import javax.json.stream.JsonParsingException;
import javax.swing.JLabel;
import javax.swing.JOptionPane;
import javax.swing.JPanel;

import jakarta.json.Json;
import jakarta.json.JsonArray;
import jakarta.json.JsonObject;
import jakarta.json.JsonReader;
import jakarta.json.stream.JsonParsingException;
import org.openstreetmap.josm.actions.JosmAction;
import org.openstreetmap.josm.data.Bounds;
import org.openstreetmap.josm.data.coor.LatLon;
Expand Down

0 comments on commit 4187897

Please sign in to comment.