diff --git a/build.gradle b/build.gradle index c11a5cd..dac2cab 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ plugins { id "org.openstreetmap.josm" version "0.8.2" } -sourceCompatibility = '1.8' +sourceCompatibility = '11' sourceSets { main { @@ -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') } } @@ -39,4 +40,4 @@ tasks.withType(JavaCompile) { "-Xlint:all", "-Xlint:-serial", ] -} \ No newline at end of file +} diff --git a/gradle.properties b/gradle.properties index c149782..b2cfa32 100644 --- a/gradle.properties +++ b/gradle.properties @@ -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 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7a3265e..1353677 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b10568f..df5ca3a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/src/org/openstreetmap/josm/plugins/fieldpapers/FieldPapersAddLayerAction.java b/src/org/openstreetmap/josm/plugins/fieldpapers/FieldPapersAddLayerAction.java index 2f11f7d..499d935 100644 --- a/src/org/openstreetmap/josm/plugins/fieldpapers/FieldPapersAddLayerAction.java +++ b/src/org/openstreetmap/josm/plugins/fieldpapers/FieldPapersAddLayerAction.java @@ -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;