diff --git a/.github/workflows/ant-release.yml b/.github/workflows/ant-release.yml deleted file mode 100644 index 598e754..0000000 --- a/.github/workflows/ant-release.yml +++ /dev/null @@ -1,19 +0,0 @@ -name: Release - -on: - release: - types: [created] - -permissions: - id-token: write - attestations: write - contents: write - packages: write - checks: write - -jobs: - call-workflow: - uses: JOSM/JOSMPluginAction/.github/workflows/ant.yml@v3 - with: - josm-revision: "r19044" - secrets: inherit diff --git a/.github/workflows/ant.yml b/.github/workflows/ant.yml index 586cf89..bd21355 100644 --- a/.github/workflows/ant.yml +++ b/.github/workflows/ant.yml @@ -52,4 +52,5 @@ jobs: with: josm-revision: ${{ matrix.josm-revision }} perform-revision-tagging: false + perform-revision-tagging: ${{ matrix.josm-revision == 'r19044' && needs.check-release-needed.outputs.release_needed == 'true' }} secrets: inherit diff --git a/build.gradle.kts b/build.gradle.kts deleted file mode 100644 index 14784f9..0000000 --- a/build.gradle.kts +++ /dev/null @@ -1,179 +0,0 @@ -import com.github.spotbugs.snom.Confidence -import com.github.spotbugs.snom.Effort -import com.github.spotbugs.snom.SpotBugsTask -import net.ltgt.gradle.errorprone.* -import org.openstreetmap.josm.gradle.plugin.task.MarkdownToHtml -import java.net.URL - -plugins { - id("com.github.ben-manes.versions") version "0.51.0" - id("org.openstreetmap.josm") version "0.8.2" - id("com.github.spotbugs") version "6.0.23" - id("net.ltgt.errorprone") version "4.0.1" - java - pmd - `maven-publish` -} - -java.sourceCompatibility = JavaVersion.VERSION_11 -base.archivesBaseName = "areaselector" - -val versions = mapOf( - "austriaaddresshelper" to "v0.8.2", - "boofcv" to "1.1.6", - "ddogleg" to "0.23.3", - "errorprone" to "2.33.0", - "junit" to "5.11.1", - "pmd" to "6.18.0", - "spotbugs" to "4.8.6", - "xmlpull" to "1.1.3.4a", - "xpp" to "1.1.6", - "xstream" to "1.4.20" -) - -repositories { - mavenCentral() - flatDir { - dirs("lib") - } -} - -sourceSets { - create("libs") { - java { - srcDir("src").include(listOf("boofcv/**", "org/marvinproject/**")) - } - } - main { - java { - srcDir("src").include(listOf("org/openstreetmap/**")) - compileClasspath += sourceSets["libs"].output - runtimeClasspath += sourceSets["libs"].output - } - resources { - srcDir(project.projectDir).exclude(listOf("resources/**", "src/**")).include(listOf("images/**", "data/*.lang")) - srcDir("resources") - } - } -} - -tasks.withType(Jar::class) { - from(sourceSets["main"].output, sourceSets["libs"].output) -} - -val libsImplementation by configurations.getting { - extendsFrom(configurations.implementation.get()) -} - -dependencies { - implementation("com.thoughtworks.xstream:xstream:${versions["xstream"]}") - implementation("org.ogce:xpp3:${versions["xpp"]}") - implementation("xmlpull:xmlpull:${versions["xmlpull"]}") - - implementation("org.boofcv:boofcv-core:${versions["boofcv"]}") - implementation("org.boofcv:boofcv-feature:${versions["boofcv"]}") - implementation("org.boofcv:boofcv-swing:${versions["boofcv"]}") - implementation("org.boofcv:boofcv-ip:${versions["boofcv"]}") - implementation("org.boofcv:boofcv-io:${versions["boofcv"]}") - implementation("org.ddogleg:ddogleg:${versions["ddogleg"]}") - implementation(files("lib/marvin-custom.jar")) - implementation(files("lib/marvinplugins-custom.jar")) - - libsImplementation("org.boofcv:boofcv-core:${versions["boofcv"]}") - libsImplementation("org.boofcv:boofcv-feature:${versions["boofcv"]}") - libsImplementation("org.boofcv:boofcv-swing:${versions["boofcv"]}") - libsImplementation("org.boofcv:boofcv-ip:${versions["boofcv"]}") - libsImplementation("org.boofcv:boofcv-io:${versions["boofcv"]}") - libsImplementation("org.ddogleg:ddogleg:${versions["ddogleg"]}") - - testImplementation("org.junit.jupiter:junit-jupiter-api:${versions["junit"]}") - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:${versions["junit"]}") - testImplementation("com.github.spotbugs:spotbugs-annotations:${versions["spotbugs"]}") -} - -// Set up ErrorProne -dependencies { - errorprone("com.google.errorprone:error_prone_core:${versions["errorprone"]}") - if (!JavaVersion.current().isJava9Compatible) { - errorproneJavac("com.google.errorprone:javac:9+181-r4173-1") - } -} -tasks.withType(JavaCompile::class).configureEach { - options.compilerArgs.addAll(listOf("-Xlint:all", "-Xlint:-serial")) - options.errorprone { - check("ClassCanBeStatic", CheckSeverity.ERROR) - check("ReferenceEquality", CheckSeverity.ERROR) - check("WildcardImport", CheckSeverity.ERROR) - check("MethodCanBeStatic", CheckSeverity.WARN) - check("RemoveUnusedImports", CheckSeverity.WARN) - check("PrivateConstructorForUtilityClass", CheckSeverity.WARN) - check("LambdaFunctionalInterface", CheckSeverity.WARN) - check("ConstantField", CheckSeverity.WARN) - } -} - -spotbugs { - toolVersion.set(versions["spotbugs"]) - ignoreFailures.set(true) - effort.set(Effort.MAX) - reportLevel.set(Confidence.LOW) -} -pmd { - toolVersion = versions["pmd"]!! - isIgnoreFailures = true - sourceSets = listOf(project.sourceSets["main"]) - ruleSets("category/java/bestpractices.xml", "category/java/codestyle.xml", "category/java/errorprone.xml") -} - -josm { - pluginName = "areaselector" - i18n { - pathTransformer = getPathTransformer(project.projectDir, "github.com/JOSM/areaselector/blob") - } - manifest { - oldVersionDownloadLink(18173, "v2.6.2", URL("https://github.com/JOSM/areaselector/releases/download/v2.6.2/areaselector.jar")) - oldVersionDownloadLink(16871, "v2.6.0-beta.1", URL("https://github.com/JOSM/areaselector/releases/download/v2.6.0-beta.1/areaselector.jar")) - oldVersionDownloadLink(15017, "v2.5.1", URL("https://github.com/JOSM/areaselector/releases/download/v2.5.1/areaselector.jar")) - oldVersionDownloadLink(12859, "v2.4.9", URL("https://github.com/JOSM/areaselector/releases/download/v2.4.9/areaselector.jar")) - oldVersionDownloadLink(11226, "v2.4.3", URL("https://github.com/JOSM/areaselector/releases/download/v2.4.3/areaselector.jar")) - } -} - -tasks.withType(JavaCompile::class) { - options.encoding = "UTF-8" -} -tasks.withType(Javadoc::class) { - isFailOnError = false -} -tasks.withType(SpotBugsTask::class) { - reports.create("html") - reports.create("xml") -} - -tasks.create("md2html", MarkdownToHtml::class) { - destDir = File(buildDir, "md2html") - source(projectDir) - include("README.md", "GPL-v3.0.md") - tasks.withType(ProcessResources::class)["processResources"].from(this) -} - -tasks.register("sourcesJar") { - archiveClassifier.set("sources") - from(sourceSets.main.get().allJava) -} - -tasks.register("javadocJar") { - archiveClassifier.set("javadoc") - from(tasks.javadoc.get().destinationDir) -} - -publishing { - publications { - create("mavenJava") { - from(components["java"]) - - artifact(tasks["sourcesJar"]) - artifact(tasks["javadocJar"]) - } - } -} diff --git a/build.xml b/build.xml index e5e75bf..05ef949 100644 --- a/build.xml +++ b/build.xml @@ -6,6 +6,14 @@ + + + + + + + + diff --git a/gradle.properties b/gradle.properties deleted file mode 100644 index 29210f9..0000000 --- a/gradle.properties +++ /dev/null @@ -1,14 +0,0 @@ -plugin.description=Allows selection of areas in an layer and automatic creation of a way as polygon. Built to ease mapping of building from background layers. Optimized for basemap.at. -plugin.author=Paul Woelfel, Thomas Konrad -plugin.class=org.openstreetmap.josm.plugins.areaselector.AreaSelectorPlugin -plugin.icon=images/mapmode/areaselector.png -plugin.link=https://github.com/JOSM/areaselector -plugin.requires=apache-commons;austriaaddresshelper;ejml;log4j -# 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=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=19067 -plugin.canloadatruntime=true diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index a4b76b9..0000000 Binary files a/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index fb602ee..0000000 --- a/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,8 +0,0 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionSha256Sum=31c55713e40233a8303827ceb42ca48a47267a0ad4bab9177123121e71524c26 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip -networkTimeout=10000 -validateDistributionUrl=true -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew deleted file mode 100755 index f5feea6..0000000 --- a/gradlew +++ /dev/null @@ -1,252 +0,0 @@ -#!/bin/sh - -# -# Copyright © 2015-2021 the original authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# SPDX-License-Identifier: Apache-2.0 -# - -############################################################################## -# -# Gradle start up script for POSIX generated by Gradle. -# -# Important for running: -# -# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is -# noncompliant, but you have some other compliant shell such as ksh or -# bash, then to run this script, type that shell name before the whole -# command line, like: -# -# ksh Gradle -# -# Busybox and similar reduced shells will NOT work, because this script -# requires all of these POSIX shell features: -# * functions; -# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», -# «${var#prefix}», «${var%suffix}», and «$( cmd )»; -# * compound commands having a testable exit status, especially «case»; -# * various built-in commands including «command», «set», and «ulimit». -# -# Important for patching: -# -# (2) This script targets any POSIX shell, so it avoids extensions provided -# by Bash, Ksh, etc; in particular arrays are avoided. -# -# The "traditional" practice of packing multiple parameters into a -# space-separated string is a well documented source of bugs and security -# problems, so this is (mostly) avoided, by progressively accumulating -# options in "$@", and eventually passing that to Java. -# -# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, -# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; -# see the in-line comments for details. -# -# There are tweaks for specific operating systems such as AIX, CygWin, -# Darwin, MinGW, and NonStop. -# -# (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt -# within the Gradle project. -# -# You can find Gradle at https://github.com/gradle/gradle/. -# -############################################################################## - -# Attempt to set APP_HOME - -# Resolve links: $0 may be a link -app_path=$0 - -# Need this for daisy-chained symlinks. -while - APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path - [ -h "$app_path" ] -do - ls=$( ls -ld "$app_path" ) - link=${ls#*' -> '} - case $link in #( - /*) app_path=$link ;; #( - *) app_path=$APP_HOME$link ;; - esac -done - -# This is normally unused -# shellcheck disable=SC2034 -APP_BASE_NAME=${0##*/} -# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s -' "$PWD" ) || exit - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD=maximum - -warn () { - echo "$*" -} >&2 - -die () { - echo - echo "$*" - echo - exit 1 -} >&2 - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "$( uname )" in #( - CYGWIN* ) cygwin=true ;; #( - Darwin* ) darwin=true ;; #( - MSYS* | MINGW* ) msys=true ;; #( - NONSTOP* ) nonstop=true ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD=$JAVA_HOME/jre/sh/java - else - JAVACMD=$JAVA_HOME/bin/java - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD=java - if ! command -v java >/dev/null 2>&1 - then - die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -fi - -# Increase the maximum file descriptors if we can. -if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then - case $MAX_FD in #( - max*) - # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC2039,SC3045 - MAX_FD=$( ulimit -H -n ) || - warn "Could not query maximum file descriptor limit" - esac - case $MAX_FD in #( - '' | soft) :;; #( - *) - # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC2039,SC3045 - ulimit -n "$MAX_FD" || - warn "Could not set maximum file descriptor limit to $MAX_FD" - esac -fi - -# Collect all arguments for the java command, stacking in reverse order: -# * args from the command line -# * the main class name -# * -classpath -# * -D...appname settings -# * --module-path (only if needed) -# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. - -# For Cygwin or MSYS, switch paths to Windows format before running java -if "$cygwin" || "$msys" ; then - APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) - - JAVACMD=$( cygpath --unix "$JAVACMD" ) - - # Now convert the arguments - kludge to limit ourselves to /bin/sh - for arg do - if - case $arg in #( - -*) false ;; # don't mess with options #( - /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath - [ -e "$t" ] ;; #( - *) false ;; - esac - then - arg=$( cygpath --path --ignore --mixed "$arg" ) - fi - # Roll the args list around exactly as many times as the number of - # args, so each arg winds up back in the position where it started, but - # possibly modified. - # - # NB: a `for` loop captures its iteration list before it begins, so - # changing the positional parameters here affects neither the number of - # iterations, nor the values presented in `arg`. - shift # remove old arg - set -- "$@" "$arg" # push replacement arg - done -fi - - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - -# Collect all arguments for the java command: -# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, -# and any embedded shellness will be escaped. -# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be -# treated as '${Hostname}' itself on the command line. - -set -- \ - "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ - "$@" - -# Stop when "xargs" is not available. -if ! command -v xargs >/dev/null 2>&1 -then - die "xargs is not available" -fi - -# Use "xargs" to parse quoted args. -# -# With -n1 it outputs one arg per line, with the quotes and backslashes removed. -# -# In Bash we could simply go: -# -# readarray ARGS < <( xargs -n1 <<<"$var" ) && -# set -- "${ARGS[@]}" "$@" -# -# but POSIX shell has neither arrays nor command substitution, so instead we -# post-process each arg (as a line of input to sed) to backslash-escape any -# character that might be a shell metacharacter, then use eval to reverse -# that process (while maintaining the separation between arguments), and wrap -# the whole thing up as a single "set" statement. -# -# This will of course break if any of these variables contains a newline or -# an unmatched quote. -# - -eval "set -- $( - printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | - xargs -n1 | - sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | - tr '\n' ' ' - )" '"$@"' - -exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat deleted file mode 100644 index 9b42019..0000000 --- a/gradlew.bat +++ /dev/null @@ -1,94 +0,0 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem -@rem SPDX-License-Identifier: Apache-2.0 -@rem - -@if "%DEBUG%"=="" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%"=="" set DIRNAME=. -@rem This is normally unused -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if %ERRORLEVEL% equ 0 goto execute - -echo. 1>&2 -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 -echo. 1>&2 -echo Please set the JAVA_HOME variable in your environment to match the 1>&2 -echo location of your Java installation. 1>&2 - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. 1>&2 -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 -echo. 1>&2 -echo Please set the JAVA_HOME variable in your environment to match the 1>&2 -echo location of your Java installation. 1>&2 - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if %ERRORLEVEL% equ 0 goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -set EXIT_CODE=%ERRORLEVEL% -if %EXIT_CODE% equ 0 set EXIT_CODE=1 -if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% -exit /b %EXIT_CODE% - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega