diff --git a/.github/workflows/gradle_build.yml b/.github/workflows/gradle_build.yml index 1131ac9..da3610f 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 17 + - name: Set up JDK 11 uses: actions/setup-java@v3 with: distribution: 'zulu' - java-version: '17' + java-version: '11' - name: Add gradle.properties run: | @@ -33,8 +33,6 @@ jobs: cp gradle.properties.template gradle.properties echo "githubUser=${{ secrets.GH_READ_ACCOUNT }}" >> gradle.properties echo "githubToken=${{ secrets.GH_READ_TOKEN }}" >> gradle.properties - # Disable jdk version setting to as it's defined above - sed -i "s/org.gradle.java.home=/#org.gradle.java.home=/g" gradle.properties - name: Build with Gradle run: ./gradlew build diff --git a/.github/workflows/gradle_publish.yml b/.github/workflows/gradle_publish.yml index 2873b99..978eb71 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 17 + - name: Set up JDK 11 uses: actions/setup-java@v3 with: distribution: 'zulu' - java-version: '17' + java-version: '11' - name: Add gradle.properties run: | @@ -30,8 +30,6 @@ jobs: cp gradle.properties.template gradle.properties echo "githubUser=${{ github.actor }}" >> gradle.properties echo "githubToken=${{ secrets.GITHUB_TOKEN }}" >> gradle.properties - # Disable jdk version setting to as it's defined above - sed -i "s/org.gradle.java.home=/#org.gradle.java.home=/g" gradle.properties # versionName is required to publish artifacts to Github Registry - name: Set versionName diff --git a/build.gradle b/build.gradle index 845f59b..a7913a1 100644 --- a/build.gradle +++ b/build.gradle @@ -25,7 +25,7 @@ */ buildscript { - ext.gradle_version = "8.0.0" + ext.gradle_version = "7.4.2" ext.kotlin_version = "1.8.20" repositories { @@ -44,7 +44,7 @@ ext { cyfaceEnergySettingsVersion = "0.0.0" // Automatically overwritten by CI // Cyface dependencies - cyfaceUtilsVersion = "3.3.6" + cyfaceUtilsVersion = "3.3.7" // Android SDK versions minSdkVersion = 21 // device support @@ -70,9 +70,9 @@ ext { testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" // Java version - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 - kotlinTargetJavaVersion = "17" + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 + kotlinTargetJavaVersion = "11" } allprojects { diff --git a/gradle.properties.template b/gradle.properties.template index c4fb189..b087571 100644 --- a/gradle.properties.template +++ b/gradle.properties.template @@ -32,9 +32,6 @@ android.nonTransitiveRClass=true android.builder.sdkDownload=true android.enableJetifier=false -# Needs to point to JDK 17 (embedded in android-studio now) -org.gradle.java.home= - # Secrets githubUser= diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 249e583..c1962a7 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 fae0804..e8be595 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip +networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index a69d9cb..aeb74cb 100755 --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# 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/. @@ -80,13 +80,10 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${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='"-Xmx64m" "-Xms64m"' +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -143,12 +140,16 @@ 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=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=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -193,6 +194,10 @@ 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 diff --git a/gradlew.bat b/gradlew.bat index 53a6b23..6689b85 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -26,6 +26,7 @@ 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%