diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 000000000..54eef25c9
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,10 @@
+version: 2
+updates:
+ - package-ecosystem: github-actions
+ directory: /
+ schedule:
+ interval: daily
+ - package-ecosystem: gradle
+ directory: /
+ schedule:
+ interval: daily
diff --git a/.github/workflows/Android-CI-Espresso.yml b/.github/workflows/Android-CI-Espresso.yml
deleted file mode 100644
index 64a7b8982..000000000
--- a/.github/workflows/Android-CI-Espresso.yml
+++ /dev/null
@@ -1,64 +0,0 @@
-name: CI
-
-on:
- push:
- branches:
- - master
- pull_request:
- branches:
- - master
-
-jobs:
- BuildAndTest:
- name: Build and Test on JDK ${{ matrix.java_version }}
- runs-on: ubuntu-latest
- strategy:
- matrix:
- java_version: [11]
- steps:
- - name: Checkout
- uses: actions/checkout@v2
- - name: Install JDK ${{ matrix.java_version }}
- uses: actions/setup-java@v1
- with:
- java-version: ${{ matrix.java_version }}
- - name: Install Android SDK
- uses: malinskiy/action-android/install-sdk@release/0.1.2
- env:
- ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true'
- - name: Build project
- run: ./gradlew build
- - name: Archive UnitTest report
- uses: actions/upload-artifact@v2
- if: ${{ always() }}
- with:
- name: UnitTest-report
- path: ${{ github.workspace }}/**/build/reports/tests/testDebugUnitTest
- Espresso:
- runs-on: macOS-latest
- continue-on-error: true
- steps:
- - uses: actions/checkout@v2
- with:
- submodules: true
- - name: set up JDK 11
- uses: actions/setup-java@v1
- with:
- java-version: 11
- - name: Install Android SDK
- uses: malinskiy/action-android/install-sdk@release/0.1.2
- env:
- ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true'
- - name: Run instrumentation tests
- uses: malinskiy/action-android/emulator-run-cmd@release/0.1.2
- with:
- cmd: ./gradlew clean build connectedCheck
- api: 28
- tag: default
- abi: x86
- - name: Archive Espresso results
- uses: actions/upload-artifact@v2
- if: ${{ always() }}
- with:
- name: Espresso-report
- path: ./**/build/reports/androidTests/connected
\ No newline at end of file
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
new file mode 100644
index 000000000..7cf9230bd
--- /dev/null
+++ b/.github/workflows/CI.yml
@@ -0,0 +1,23 @@
+name: CI
+
+on:
+ push:
+ branches:
+ - master
+ pull_request:
+ workflow_dispatch:
+
+jobs:
+ build:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v4
+ - uses: actions/setup-java@v4
+ with:
+ java-version: 17
+ distribution: temurin
+ cache: gradle
+ - uses: malinskiy/action-android/install-sdk@release/0.1.6
+ env:
+ ACTIONS_ALLOW_UNSECURE_COMMANDS: true
+ - run: ./gradlew build
diff --git a/.github/workflows/Espresso.yml b/.github/workflows/Espresso.yml
new file mode 100644
index 000000000..edfe1ed39
--- /dev/null
+++ b/.github/workflows/Espresso.yml
@@ -0,0 +1,29 @@
+name: Espresso
+
+on:
+ workflow_dispatch:
+
+jobs:
+ Espresso:
+ runs-on: ubuntu-latest
+ continue-on-error: true
+ steps:
+ - uses: actions/checkout@v4
+ - uses: actions/setup-java@v4
+ with:
+ java-version: 17
+ distribution: temurin
+ - uses: malinskiy/action-android/install-sdk@release/0.1.6
+ env:
+ ACTIONS_ALLOW_UNSECURE_COMMANDS: true
+ - uses: malinskiy/action-android/emulator-run-cmd@release/0.1.6
+ with:
+ cmd: ./gradlew clean build connectedCheck
+ api: 29
+ tag: default
+ abi: x86
+ - uses: actions/upload-artifact@v4
+ if: ${{ always() }}
+ with:
+ name: Espresso-report
+ path: ./**/build/reports/androidTests/connected
diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
deleted file mode 100644
index ea2f9707c..000000000
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-name: "Validate Gradle Wrapper"
-
-on:
- push:
- branches:
- - master
- pull_request:
- branches:
- - master
-
-jobs:
- validation:
- name: "Validation"
- runs-on: ubuntu-latest
- steps:
- - uses: actions/checkout@v2
- - uses: gradle/wrapper-validation-action@v1
\ No newline at end of file
diff --git a/.github/workflows/update-gradle-wrapper.yml b/.github/workflows/update-gradle-wrapper.yml
new file mode 100644
index 000000000..eb3c68353
--- /dev/null
+++ b/.github/workflows/update-gradle-wrapper.yml
@@ -0,0 +1,14 @@
+name: Update Gradle Wrapper
+
+on:
+ workflow_dispatch:
+
+jobs:
+ update-gradle-wrapper:
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout the code
+ uses: actions/checkout@v4
+
+ - name: Update Gradle Wrapper
+ uses: gradle-update/update-gradle-wrapper-action@main
diff --git a/OSMMapTilePackager/build.gradle b/OSMMapTilePackager/build.gradle
index 542bddec0..778ad70d8 100644
--- a/OSMMapTilePackager/build.gradle
+++ b/OSMMapTilePackager/build.gradle
@@ -27,12 +27,12 @@ tasks.withType(Javadoc) {
}
dependencies {
- implementation 'org.apache.httpcomponents:httpmime:4.5.13'
- implementation 'org.apache.james:apache-mime4j:0.8.7'
- implementation 'org.xerial:sqlite-jdbc:3.36.0.3'
+ implementation 'org.apache.httpcomponents:httpmime:4.5.14'
+ implementation 'org.apache.james:apache-mime4j:0.8.11'
+ implementation 'org.xerial:sqlite-jdbc:3.45.2.0'
- testImplementation "junit:junit:${project.property('junit.version')}"
+ testImplementation "org.junit.vintage:junit-vintage-engine:${project.property('junit.version')}"
}
//copy the instrumentation tests from the maven osmdroid-android-it src folder
@@ -115,4 +115,4 @@ afterEvaluate {
}
-}
\ No newline at end of file
+}
diff --git a/OpenStreetMapViewer/build.gradle b/OpenStreetMapViewer/build.gradle
index 5314bbc70..393ce0fbf 100644
--- a/OpenStreetMapViewer/build.gradle
+++ b/OpenStreetMapViewer/build.gradle
@@ -21,11 +21,11 @@ android {
multiDexEnabled = true
compileSdkVersion(project.hasProperty('android.compileSdkVersion')
- ? Integer.parseInt(project.property('android.compileSdkVersion')) : 23)
+ ? Integer.parseInt(project.property('android.compileSdkVersion')) : 34)
// default targetSdkVersion to API 23, if not provided
targetSdkVersion(project.hasProperty('android.targetSdkVersion')
- ? Integer.parseInt(project.property('android.targetSdkVersion')) : 23)
+ ? Integer.parseInt(project.property('android.targetSdkVersion')) : 30)
// default versionCode o 1 if not provided
versionCode(project.hasProperty('android.versionCode')
@@ -64,9 +64,9 @@ dependencies {
//are not longer resolved...
//osmdroid-mapsforge
- implementation 'org.mapsforge:mapsforge-map-android:0.20.0'
- implementation 'org.mapsforge:mapsforge-map:0.20.0'
- implementation 'org.mapsforge:mapsforge-themes:0.20.0'
+ implementation 'org.mapsforge:mapsforge-map-android:0.21.0'
+ implementation 'org.mapsforge:mapsforge-map:0.21.0'
+ implementation 'org.mapsforge:mapsforge-themes:0.21.0'
implementation "androidx.legacy:legacy-support-v4:1.0.0"
@@ -76,40 +76,40 @@ dependencies {
implementation project(':osmdroid-wms')
implementation project(':osmdroid-shape')
- implementation 'io.github.missioncommand:mil-sym-android-renderer:0.1.48'
+ implementation 'io.github.missioncommand:mil-sym-android-renderer:0.1.59'
//used for various demos for picking offline tile archives
implementation 'com.github.angads25:filepicker:1.1.1'
//used for bookmark demo
- implementation group: 'com.opencsv', name: 'opencsv', version: '4.4'
+ implementation group: 'com.opencsv', name: 'opencsv', version: '5.8'
//usual android stuff
- implementation "com.google.android.material:material:1.6.1" //needed for UI menuing
+ implementation "com.google.android.material:material:1.11.0" //needed for UI menuing
implementation "androidx.cardview:cardview:1.0.0"
- implementation "androidx.recyclerview:recyclerview:1.2.1"
+ implementation "androidx.recyclerview:recyclerview:1.3.2"
implementation 'androidx.multidex:multidex:2.0.1'
- implementation "androidx.appcompat:appcompat:1.4.2"
+ implementation "androidx.appcompat:appcompat:1.6.1"
//crash logging
implementation 'ch.acra:acra:4.7.0'
//memory leak testing
- implementation 'com.squareup.leakcanary:leakcanary-android:2.2'
+ implementation 'com.squareup.leakcanary:leakcanary-android:2.13'
//on device testing
- androidTestImplementation 'androidx.multidex:multidex:2.0.0'
+ androidTestImplementation 'androidx.multidex:multidex:2.0.1'
androidTestImplementation "androidx.annotation:annotation:1.3.0"
- androidTestImplementation "androidx.test:runner:1.4.0"
- androidTestImplementation "androidx.test:rules:1.4.0"
+ androidTestImplementation "androidx.test:runner:1.5.2"
+ androidTestImplementation "androidx.test:rules:1.5.0"
// Optional -- UI testing with Espresso
- androidTestImplementation "androidx.test.espresso:espresso-core:3.4.0"
+ androidTestImplementation "androidx.test.espresso:espresso-core:3.5.1"
// Optional -- UI testing with UI Automator
- androidTestImplementation "androidx.test.uiautomator:uiautomator:2.2.0"
+ androidTestImplementation "androidx.test.uiautomator:uiautomator:2.3.0"
// Optional -- UI testing with Compose
- androidTestImplementation "androidx.compose.ui:ui-test-junit4:1.1.0"
+ androidTestImplementation "androidx.compose.ui:ui-test-junit4:1.6.5"
}
diff --git a/build.gradle b/build.gradle
index afd55e791..0f06158e3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -18,7 +18,7 @@ buildscript {
// Set up the spotbugs plugin so we can apply it in a quality pass if needed
plugins {
- id 'com.github.spotbugs' version '5.0.6' apply false
+ id 'com.github.spotbugs' version '6.0.9' apply false
}
allprojects {
diff --git a/gradle.properties b/gradle.properties
index daeaa7071..717c98f12 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,7 +9,7 @@ org.gradle.configureondemand true
# "Specifies the jvmargs used for the daemon process. The setting is particularly useful for
# tweaking memory settings. At the moment, the default settings are pretty generous with regards
# to memory."
-org.gradle.jvmargs=-Xms256m -Xmx2048m -XX:MaxPermSize=256m
+org.gradle.jvmargs=-Xms8G -Xmx8G
# Dependency version configurations ----------------------------------------------------------------
@@ -37,14 +37,14 @@ org.gradle.jvmargs=-Xms256m -Xmx2048m -XX:MaxPermSize=256m
#
# --------------------------------------------------------------------------------------------------
-gradleFury.version=1.0.14
+gradleFury.version=1.1.3
-android-plugin.version=7.1.3
+android-plugin.version=7.2.2
# To be used for packages that depend on support lib (minSDK = 14 since 26.0.0)
android-minSdkForSupportLib.version=14
-junit.version=4.13.2
-robolectric.version=4.7.3
+junit.version=5.10.2
+robolectric.version=4.11.1
android.useAndroidX=true
android.enableJetifier=true
# Maven Repository (i.e. Sonatype Nexus Repository Manager) Configuration --------------------------
@@ -59,14 +59,14 @@ SNAPSHOT_REPOSITORY_URL=https://oss.sonatype.org/content/repositories/snapshots/
# Java Configuration -------------------------------------------------------------------------------
-compileJava.sourceCompatibility=1.7
-compileJava.targetCompatibility=1.7
+compileJava.sourceCompatibility=17
+compileJava.targetCompatibility=17
# Android Configuration (used by gradle/android-support.gradle) ------------------------------------
-android.buildToolsVersion=26.0.3
-android.compileSdkVersion=31
+android.buildToolsVersion=34.0.0
+android.compileSdkVersion=34
android.minSdkVersion=8
android.targetSdkVersion=30
@@ -147,4 +147,3 @@ pom.developers.developer.3.name=Matt Kergall
pom.developers.developer.3.role.0=developer
# TODO update with the rest of the crew
-
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 3baa851b2..d64cd4917 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 9b94b8378..b9fa41cb3 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Fri Mar 19 08:47:02 GMT 2021
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-bin.zip
diff --git a/gradlew b/gradlew
index 27309d923..1aa94a426 100755
--- a/gradlew
+++ b/gradlew
@@ -1,78 +1,127 @@
-#!/usr/bin/env bash
+#!/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.
+#
##############################################################################
-##
-## Gradle start up script for UN*X
-##
+#
+# 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/subprojects/plugins/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
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
- ls=`ls -ld "$PRG"`
- link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '/.*' > /dev/null; then
- PRG="$link"
- else
- PRG=`dirname "$PRG"`"/$link"
- fi
+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
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+# 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 "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
-warn ( ) {
+warn () {
echo "$*"
-}
+} >&2
-die ( ) {
+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
- ;;
- MINGW* )
- msys=true
- ;;
- NONSTOP* )
- nonstop=true
- ;;
+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"
+ JAVACMD=$JAVA_HOME/jre/sh/java
else
- JAVACMD="$JAVA_HOME/bin/java"
+ JAVACMD=$JAVA_HOME/bin/java
fi
if [ ! -x "$JAVACMD" ] ; then
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -81,84 +130,120 @@ Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
else
- JAVACMD="java"
- which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+ 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" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
- MAX_FD_LIMIT=`ulimit -H -n`
- if [ $? -eq 0 ] ; then
- if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
- MAX_FD="$MAX_FD_LIMIT"
- fi
- ulimit -n $MAX_FD
- if [ $? -ne 0 ] ; then
- warn "Could not set maximum file descriptor limit: $MAX_FD"
- fi
- else
- warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
- fi
+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
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
- GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-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" )
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
- APP_HOME=`cygpath --path --mixed "$APP_HOME"`
- CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
- JAVACMD=`cygpath --unix "$JAVACMD"`
-
- # We build the pattern for arguments to be converted via cygpath
- ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
- SEP=""
- for dir in $ROOTDIRSRAW ; do
- ROOTDIRS="$ROOTDIRS$SEP$dir"
- SEP="|"
- done
- OURCYGPATTERN="(^($ROOTDIRS))"
- # Add a user-defined pattern to the cygpath arguments
- if [ "$GRADLE_CYGPATTERN" != "" ] ; then
- OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
- fi
# Now convert the arguments - kludge to limit ourselves to /bin/sh
- i=0
- for arg in "$@" ; do
- CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
- CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
-
- if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
- eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
- else
- eval `echo args$i`="\"$arg\""
+ 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
- i=$((i+1))
+ # 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
- case $i in
- (0) set -- ;;
- (1) set -- "$args0" ;;
- (2) set -- "$args0" "$args1" ;;
- (3) set -- "$args0" "$args1" "$args2" ;;
- (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
- (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
- (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
- (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
- (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
- (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
- esac
fi
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
- JVM_OPTS=("$@")
-}
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+# 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
index 832fdb607..25da30dbd 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,4 +1,20 @@
-@if "%DEBUG%" == "" @echo off
+@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
+
+@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
@@ -9,25 +25,29 @@
if "%OS%"=="Windows_NT" setlocal
set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+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=
+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%" == "0" goto init
+if %ERRORLEVEL% equ 0 goto execute
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+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
@@ -35,54 +55,36 @@ goto fail
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+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
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
-
: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 %CMD_LINE_ARGS%
+"%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%"=="0" goto mainEnd
+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!
-if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+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
diff --git a/osmdroid-android/build.gradle b/osmdroid-android/build.gradle
index 4f2aabb07..b6555724e 100644
--- a/osmdroid-android/build.gradle
+++ b/osmdroid-android/build.gradle
@@ -37,7 +37,7 @@ android {
}
dependencies {
- testImplementation "junit:junit:${project.property('junit.version')}"
+ testImplementation "org.junit.vintage:junit-vintage-engine:${project.property('junit.version')}"
testImplementation "org.robolectric:robolectric:${project.property('robolectric.version')}"
}
diff --git a/osmdroid-geopackage/build.gradle b/osmdroid-geopackage/build.gradle
index 8aae1ca79..ef710026c 100644
--- a/osmdroid-geopackage/build.gradle
+++ b/osmdroid-geopackage/build.gradle
@@ -35,10 +35,10 @@ dependencies {
//crash logging
//implementation 'ch.acra:acra:4.7.0'
- testImplementation 'junit:junit:4.13.2'
+ testImplementation 'org.junit.vintage:junit-vintage-engine:5.10.2'
api project(':osmdroid-android')
- api ("mil.nga.geopackage:geopackage-android:6.6.0"){
+ api ("mil.nga.geopackage:geopackage-android:6.7.3"){
exclude group: 'com.google.android.gms', module:'play-services'
exclude group: 'com.google.maps.android', module:'android-maps-utils'
exclude group: 'com.android.support',module: 'support-v13'
@@ -47,7 +47,7 @@ dependencies {
exclude group: 'com.j256.ormlite'
}
- api 'mil.nga.geopackage:geopackage-core:6.5.0'
+ api 'mil.nga.geopackage:geopackage-core:6.6.5'
api 'ar.com.hjg:pngj:2.1.0'
api 'mil.nga:tiff:3.0.0'
@@ -96,4 +96,4 @@ afterEvaluate {
}
-//apply from: "$rootDir/gradle/javadoc-aar.gradle"
\ No newline at end of file
+//apply from: "$rootDir/gradle/javadoc-aar.gradle"
diff --git a/osmdroid-mapsforge/build.gradle b/osmdroid-mapsforge/build.gradle
index f5989db34..67ad2b9df 100644
--- a/osmdroid-mapsforge/build.gradle
+++ b/osmdroid-mapsforge/build.gradle
@@ -27,12 +27,12 @@ android {
}
dependencies {
- testImplementation "junit:junit:${project.property('junit.version')}"
+ testImplementation "org.junit.vintage:junit-vintage-engine:${project.property('junit.version')}"
//Mapsforge rendering and database support, which is LGPL
- api 'org.mapsforge:mapsforge-map-android:0.20.0'
- api 'org.mapsforge:mapsforge-map:0.20.0'
- api 'org.mapsforge:mapsforge-themes:0.20.0'
+ api 'org.mapsforge:mapsforge-map-android:0.21.0'
+ api 'org.mapsforge:mapsforge-map:0.21.0'
+ api 'org.mapsforge:mapsforge-themes:0.21.0'
//osmdroid which is ASF licensed
api project(':osmdroid-android' )
@@ -81,4 +81,4 @@ afterEvaluate {
}
-//apply from: "$rootDir/gradle/javadoc-aar.gradle"
\ No newline at end of file
+//apply from: "$rootDir/gradle/javadoc-aar.gradle"
diff --git a/osmdroid-server-jdk/build.gradle b/osmdroid-server-jdk/build.gradle
index 79bcacbaa..2f2802a94 100644
--- a/osmdroid-server-jdk/build.gradle
+++ b/osmdroid-server-jdk/build.gradle
@@ -47,44 +47,43 @@ distributions {
description = "OpenStreetMaps Tile Server (JRE)"
configurations.all {
resolutionStrategy{
- force 'javax.ws.rs:javax.ws.rs-api:2.0','javax.ws.rs:javax.ws.rs-api:2.0-m10'
- force 'javax.ws.rs:javax.ws.rs-api:2.0-m10','javax.ws.rs:javax.ws.rs-api:2.0-m10'
+ force 'jakarta.ws.rs:jakarta.ws.rs-api:3.1.0'
}
}
dependencies {
- implementation group: 'javax.servlet', name: 'servlet-api', version:'2.5'
- implementation group: 'commons-configuration', name: 'commons-configuration', version:'1.9'
- implementation group: 'org.apache.commons', name: 'commons-lang3', version:'3.8.1'
- implementation group: 'commons-collections', name: 'commons-collections', version:'3.2.2'
+ implementation group: 'jakarta.servlet', name: 'jakarta.servlet-api', version:'6.0.0'
+ implementation group: 'org.apache.commons', name: 'commons-configuration2', version:'2.10.1'
+ implementation group: 'org.apache.commons', name: 'commons-lang3', version:'3.14.0'
+ implementation group: 'org.apache.commons', name: 'commons-collections4', version:'4.4'
// https://mvnrepository.com/artifact/org.apache.cxf/cxf-rt-rs-client
- implementation group: 'org.apache.cxf', name: 'cxf-rt-rs-client', version: '3.5.2'
+ implementation group: 'org.apache.cxf', name: 'cxf-rt-rs-client', version: '4.0.4'
// https://mvnrepository.com/artifact/org.apache.cxf/cxf-rt-rs-service-description
- implementation group: 'org.apache.cxf', name: 'cxf-rt-rs-service-description', version: '3.5.2'
+ implementation group: 'org.apache.cxf', name: 'cxf-rt-rs-service-description', version: '4.0.4'
// https://mvnrepository.com/artifact/org.apache.cxf/cxf-rt-rs-extension-providers
- implementation group: 'org.apache.cxf', name: 'cxf-rt-rs-extension-providers', version: '3.5.2'
+ implementation group: 'org.apache.cxf', name: 'cxf-rt-rs-extension-providers', version: '4.0.4'
// https://mvnrepository.com/artifact/org.apache.cxf/cxf-rt-frontend-jaxws
- implementation group: 'org.apache.cxf', name: 'cxf-rt-frontend-jaxws', version: '3.5.2'
+ implementation group: 'org.apache.cxf', name: 'cxf-rt-frontend-jaxws', version: '4.0.4'
// https://mvnrepository.com/artifact/org.apache.cxf/cxf-rt-transports-http
- implementation group: 'org.apache.cxf', name: 'cxf-rt-transports-http', version: '3.5.2'
+ implementation group: 'org.apache.cxf', name: 'cxf-rt-transports-http', version: '4.0.4'
// https://mvnrepository.com/artifact/org.apache.cxf/cxf-rt-transports-http-jetty
- implementation group: 'org.apache.cxf', name: 'cxf-rt-transports-http-jetty', version: '3.5.2'
+ implementation group: 'org.apache.cxf', name: 'cxf-rt-transports-http-jetty', version: '4.0.4'
- implementation group: 'org.springframework', name: 'spring-test', version:'5.3.19'
- implementation group: 'org.springframework', name: 'spring-context', version:'5.3.19'
- implementation group: 'commons-codec', name: 'commons-codec', version:'1.15'
+ implementation group: 'org.springframework', name: 'spring-test', version:'6.1.5'
+ implementation group: 'org.springframework', name: 'spring-context', version:'6.1.5'
+ implementation group: 'commons-codec', name: 'commons-codec', version:'1.16.1'
- //implementation group: 'org.apache.cxf', name: 'cxf-rt-rs-extension-providers', version:'3.5.2'
- implementation group: 'org.xerial', name: 'sqlite-jdbc', version:'3.36.0.3'
- implementation group: 'javax.servlet.jsp', name: 'jsp-api', version:'2.1'
- implementation group: 'org.glassfish.jersey.containers', name: 'jersey-container-servlet', version:'3.0.4'
- implementation group: 'org.glassfish.jersey.core', name: 'jersey-client', version:'2.25.1'
- implementation group: 'org.glassfish.jersey.media', name: 'jersey-media-moxy', version:'2.35'
- implementation group: 'org.apache.cxf', name: 'cxf-rt-transports-http-jetty', version:'3.5.2'
- implementation group: 'org.slf4j', name: 'slf4j-jdk14', version:'1.7.10'
- implementation group: 'org.codehaus.jettison', name: 'jettison', version:'1.4.1'
- implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version:'2.13.2.2'
+ //implementation group: 'org.apache.cxf', name: 'cxf-rt-rs-extension-providers', version:'4.0.4'
+ implementation group: 'org.xerial', name: 'sqlite-jdbc', version:'3.45.2.0'
+ implementation group: 'jakarta.servlet.jsp', name: 'jakarta.servlet.jsp-api', version:'3.1.1'
+ implementation group: 'org.glassfish.jersey.containers', name: 'jersey-container-servlet', version:'3.1.5'
+ implementation group: 'org.glassfish.jersey.core', name: 'jersey-client', version:'3.1.5'
+ implementation group: 'org.glassfish.jersey.media', name: 'jersey-media-moxy', version:'3.1.5'
+ implementation group: 'org.apache.cxf', name: 'cxf-rt-transports-http-jetty', version:'4.0.4'
+ implementation group: 'org.slf4j', name: 'slf4j-jdk14', version:'2.0.12'
+ implementation group: 'org.codehaus.jettison', name: 'jettison', version:'1.5.4'
+ implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version:'2.17.0'
}
@@ -124,4 +123,4 @@ afterEvaluate {
}
-}
\ No newline at end of file
+}
diff --git a/osmdroid-shape/build.gradle b/osmdroid-shape/build.gradle
index eaa80eda5..0e626660b 100644
--- a/osmdroid-shape/build.gradle
+++ b/osmdroid-shape/build.gradle
@@ -31,9 +31,9 @@ android {
dependencies {
- testImplementation 'junit:junit:4.13'
+ testImplementation 'org.junit.vintage:junit-vintage-engine:5.10.2'
api project(':osmdroid-android')
- api 'com.github.spyhunter99:jdbf:2.2.0'
+ api 'com.github.spyhunter99:jdbf:2.2.4'
}
@@ -81,4 +81,3 @@ artifacts {
archives androidSourcesJar
}
-
diff --git a/osmdroid-simple-map/build.gradle b/osmdroid-simple-map/build.gradle
index 9a0ae65d7..bff239292 100644
--- a/osmdroid-simple-map/build.gradle
+++ b/osmdroid-simple-map/build.gradle
@@ -17,14 +17,14 @@ android {
minSdkVersion Integer.parseInt(project.property('android-minSdkForSupportLib.version'))
multiDexEnabled = true
compileSdkVersion(project.hasProperty('android.compileSdkVersion')
- ? Integer.parseInt(project.property('android.compileSdkVersion')) : 23)
+ ? Integer.parseInt(project.property('android.compileSdkVersion')) : 34)
minSdkVersion(14)
targetSdkVersion(project.hasProperty('android.targetSdkVersion')
- ? Integer.parseInt(project.property('android.targetSdkVersion')) : 23)
+ ? Integer.parseInt(project.property('android.targetSdkVersion')) : 30)
versionCode(project.hasProperty('android.versionCode')
@@ -41,7 +41,7 @@ android {
}
dependencies {
- implementation "androidx.appcompat:appcompat:1.4.1"
+ implementation "androidx.appcompat:appcompat:1.6.1"
implementation project(':osmdroid-android')
}
diff --git a/osmdroid-wms/build.gradle b/osmdroid-wms/build.gradle
index 3bcc9c0ff..f48fb1cb5 100644
--- a/osmdroid-wms/build.gradle
+++ b/osmdroid-wms/build.gradle
@@ -33,7 +33,7 @@ android {
dependencies {
//
api project(':osmdroid-android')
- testImplementation "junit:junit:${project.property('junit.version')}"
+ testImplementation "org.junit.vintage:junit-vintage-engine:${project.property('junit.version')}"
}
@@ -78,5 +78,3 @@ artifacts {
archives androidSourcesJar
}
-
-
diff --git a/releaseHelper/pom.xml b/releaseHelper/pom.xml
index d430b465c..232fd146c 100644
--- a/releaseHelper/pom.xml
+++ b/releaseHelper/pom.xml
@@ -15,33 +15,33 @@
org.apache.maven
maven-model
- 3.8.5
+ 3.9.6
commons-codec
commons-codec
- 1.15
+ 1.16.1
commons-io
commons-io
- 2.11.0
+ 2.16.0
org.apache.commons
commons-lang3
- 3.12.0
+ 3.14.0
org.apache.commons
commons-compress
- 1.21
+ 1.26.1
@@ -80,4 +80,4 @@
releaseHelper
-
\ No newline at end of file
+