Skip to content

Commit

Permalink
[STAD-576] Upgrade dependencies (Gradle 8, AGP 8, JDK 17, etc)
Browse files Browse the repository at this point in the history
  • Loading branch information
hb0 committed Feb 27, 2024
1 parent 20bc95b commit 423145e
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 22 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/gradle_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/gradle_publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
15 changes: 7 additions & 8 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -41,21 +41,20 @@ 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 {
// This libraries version
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"
Expand All @@ -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 {
Expand Down
1 change: 0 additions & 1 deletion energy_settings/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
11 changes: 5 additions & 6 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -141,15 +144,15 @@ 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
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
# shellcheck disable=SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 423145e

Please sign in to comment.