Skip to content

Commit

Permalink
[RFR-412] Downgrade to Gradle 7
Browse files Browse the repository at this point in the history
  • Loading branch information
hb0 committed Apr 27, 2023
1 parent d072055 commit 6864a26
Show file tree
Hide file tree
Showing 8 changed files with 24 additions and 24 deletions.
6 changes: 2 additions & 4 deletions .github/workflows/gradle_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,20 +21,18 @@ 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: |
# Use a personal read token to install the Cyface Utils package
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
6 changes: 2 additions & 4 deletions .github/workflows/gradle_publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,18 @@ 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: |
# Use the repository's automatically set up token to publish to the registry
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
Expand Down
10 changes: 5 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
*/

buildscript {
ext.gradle_version = "8.0.0"
ext.gradle_version = "7.4.2"
ext.kotlin_version = "1.8.20"

repositories {
Expand All @@ -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
Expand All @@ -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 {
Expand Down
3 changes: 0 additions & 3 deletions gradle.properties.template
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
19 changes: 12 additions & 7 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -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/.
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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%

Expand Down

0 comments on commit 6864a26

Please sign in to comment.