diff --git a/libpretixsync/gradle/wrapper/gradle-wrapper.jar b/libpretixsync/gradle/wrapper/gradle-wrapper.jar index d64cd491..1b33c55b 100644 Binary files a/libpretixsync/gradle/wrapper/gradle-wrapper.jar and b/libpretixsync/gradle/wrapper/gradle-wrapper.jar differ diff --git a/libpretixsync/gradle/wrapper/gradle-wrapper.properties b/libpretixsync/gradle/wrapper/gradle-wrapper.properties index a80b22ce..d4081da4 100644 --- a/libpretixsync/gradle/wrapper/gradle-wrapper.properties +++ b/libpretixsync/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/libpretixsync/gradlew b/libpretixsync/gradlew index 1aa94a42..23d15a93 100755 --- a/libpretixsync/gradlew +++ b/libpretixsync/gradlew @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -55,7 +57,7 @@ # 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 +# 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/. @@ -84,7 +86,7 @@ done # 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 +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -112,7 +114,7 @@ case "$( uname )" in #( NONSTOP* ) nonstop=true ;; esac -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar +CLASSPATH="\\\"\\\"" # Determine the Java command to use to start the JVM. @@ -203,7 +205,7 @@ fi 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, +# * DEFAULT_JVM_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. @@ -211,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ "$@" # Stop when "xargs" is not available. diff --git a/libpretixsync/gradlew.bat b/libpretixsync/gradlew.bat index 7101f8e4..5eed7ee8 100644 --- a/libpretixsync/gradlew.bat +++ b/libpretixsync/gradlew.bat @@ -13,6 +13,8 @@ @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 ########################################################################## @@ -68,11 +70,11 @@ goto fail :execute @rem Setup the command line -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar +set CLASSPATH= @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* :end @rem End local scope for the variables with windows NT shell diff --git a/libpretixsync/settings.gradle b/libpretixsync/settings.gradle index 88ce3ff4..347b5a6e 100644 --- a/libpretixsync/settings.gradle +++ b/libpretixsync/settings.gradle @@ -11,8 +11,8 @@ pluginManagement { // workaround: plugin definition with version here, so a standalone build is possible // but building it inside the multi module project doesn't exit with "unknown version already on classpath" error plugins { - id "org.jetbrains.kotlin.jvm" version "1.9.23" apply false - id "com.google.protobuf" version "0.9.4" apply false + id "org.jetbrains.kotlin.jvm" version "2.2.21" apply false + id "com.google.protobuf" version "0.9.5" apply false id "app.cash.sqldelight" version "2.1.0" apply false } diff --git a/libpretixsync/versions.gradle b/libpretixsync/versions.gradle index c5957209..25b149cd 100644 --- a/libpretixsync/versions.gradle +++ b/libpretixsync/versions.gradle @@ -1,4 +1,4 @@ -ext.kotlin_version = '1.9.23' +ext.kotlin_version = '2.2.21' ext.okhttp_version = '4.9.3' ext.joda_version = '2.10.10' // Use older org.json version to have an environment equivalent to the android platform