diff --git a/.github/workflows/gradle_build.yml b/.github/workflows/gradle_build.yml index da3610f..6fb95b8 100644 --- a/.github/workflows/gradle_build.yml +++ b/.github/workflows/gradle_build.yml @@ -21,11 +21,11 @@ jobs: - name: Checkout commit uses: actions/checkout@v3 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v3 with: - distribution: 'zulu' - java-version: '11' + distribution: 'temurin' + java-version: '17' - name: Add gradle.properties run: | diff --git a/.github/workflows/gradle_publish.yml b/.github/workflows/gradle_publish.yml index 978eb71..acc001a 100644 --- a/.github/workflows/gradle_publish.yml +++ b/.github/workflows/gradle_publish.yml @@ -18,11 +18,11 @@ jobs: - name: Checkout commit uses: actions/checkout@v3 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v3 with: - distribution: 'zulu' - java-version: '11' + distribution: 'temurin' + java-version: '17' - name: Add gradle.properties run: | diff --git a/build.gradle b/build.gradle index 5f7208d..b1688e1 100644 --- a/build.gradle +++ b/build.gradle @@ -25,8 +25,8 @@ */ buildscript { - ext.gradle_version = "7.4.2" - ext.kotlin_version = "1.9.0" + ext.gradle_version = "8.2.2" + ext.kotlin_version = "1.9.22" repositories { google() @@ -41,7 +41,7 @@ buildscript { plugins { // To generate Proto DataStore - id 'com.google.protobuf' version '0.8.19' apply false // Maybe keep in sync with other usages + id 'com.google.protobuf' version '0.9.4' apply false // Maybe keep in sync with other usages } ext { @@ -49,13 +49,12 @@ ext { cyfaceEnergySettingsVersion = "0.0.0" // Automatically overwritten by CI // Cyface dependencies - cyfaceUtilsVersion = "4.0.6" + cyfaceUtilsVersion = "4.0.7" // Android SDK versions minSdkVersion = 21 // device support targetSdkVersion = 34 // behavioral changes, follow migration guide & test the app against this compileSdkVersion = 34 // allows newest APIs to be used and to see deprecations, use latest - buildToolsVersion = '34.0.0' // optional, if defined, use latest (SDK Manager > SDK Tools) // Android dependencies androidxAnnotationVersion = "1.6.0" @@ -78,9 +77,9 @@ ext { testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" // Java version - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 - kotlinTargetJavaVersion = "11" + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + kotlinTargetJavaVersion = "17" } allprojects { diff --git a/energy_settings/build.gradle b/energy_settings/build.gradle index 43e0b2a..4ad50b4 100644 --- a/energy_settings/build.gradle +++ b/energy_settings/build.gradle @@ -31,7 +31,6 @@ apply plugin: 'com.google.protobuf' // For Proto DataStore android { namespace "de.cyface.energy_settings" compileSdkVersion rootProject.ext.compileSdkVersion - buildToolsVersion rootProject.ext.buildToolsVersion defaultConfig { minSdkVersion rootProject.ext.minSdkVersion diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index c1962a7..943f0cb 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 e8be595..7fc84be 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index aeb74cb..65dcd68 100755 --- a/gradlew +++ b/gradlew @@ -85,6 +85,9 @@ done APP_BASE_NAME=${0##*/} APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit +# 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"' + # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -141,7 +144,7 @@ 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=SC3045 + # shellcheck disable=SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac @@ -149,7 +152,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then '' | soft) :;; #( *) # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -194,10 +197,6 @@ if "$cygwin" || "$msys" ; then 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, and $GRADLE_OPTS can contain fragments of # shell script including quotes and variable substitutions, so put them in