Skip to content

Commit

Permalink
Update dependencies, use newer version of JOSM with javax and jakarta…
Browse files Browse the repository at this point in the history
… json

Signed-off-by: Taylor Smock <[email protected]>
  • Loading branch information
tsmock committed Sep 9, 2024
1 parent ff79792 commit 2fe79b5
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 6 deletions.
7 changes: 4 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id "java"
id "org.openstreetmap.josm" version "0.5.0"
id "org.openstreetmap.josm" version "0.8.2"
}

sourceCompatibility = '1.8'
Expand All @@ -22,10 +22,11 @@ sourceSets {
archivesBaseName = 'fieldpapers'
josm {
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 @@ -38,4 +39,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

0 comments on commit 2fe79b5

Please sign in to comment.