diff --git a/.github/workflows/beta.yml b/.github/workflows/beta.yml index 6ccced48e..912b15b3b 100644 --- a/.github/workflows/beta.yml +++ b/.github/workflows/beta.yml @@ -13,11 +13,11 @@ jobs: with: fetch-depth: 0 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v3.11.0 with: distribution: 'temurin' - java-version: '11' + java-version: '17' - uses: actions/cache@v3 with: @@ -102,11 +102,11 @@ jobs: with: fetch-depth: 0 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v3.11.0 with: distribution: 'temurin' - java-version: '11' + java-version: '17' - uses: actions/cache@v3 with: diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 9e425d2ee..22c42e48b 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -9,11 +9,11 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v3.11.0 with: distribution: 'temurin' - java-version: '11' + java-version: '17' - uses: actions/cache@v3 with: @@ -37,11 +37,11 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v3.11.0 with: distribution: 'adopt' - java-version: '11' + java-version: '17' - uses: actions/cache@v3 with: @@ -77,11 +77,11 @@ jobs: echo -e "\n✔️ No changed database schemas on branch" fi - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v3.11.0 with: distribution: 'adopt' - java-version: '11' + java-version: '17' - uses: actions/cache@v3 with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7840544c7..f37f29899 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,11 +13,11 @@ jobs: with: fetch-depth: 0 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v3.11.0 with: distribution: 'temurin' - java-version: '11' + java-version: '17' - uses: actions/cache@v3 with: @@ -117,11 +117,11 @@ jobs: with: fetch-depth: 0 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v3.11.0 with: distribution: 'adopt' - java-version: '11' + java-version: '17' - uses: actions/cache@v3 with: diff --git a/.github/workflows/weekly.yaml b/.github/workflows/weekly.yaml index 82f511a03..ad426f39a 100644 --- a/.github/workflows/weekly.yaml +++ b/.github/workflows/weekly.yaml @@ -13,11 +13,11 @@ jobs: with: fetch-depth: 0 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v3.11.0 with: distribution: 'temurin' - java-version: '11' + java-version: '17' - uses: actions/cache@v3 with: diff --git a/app/build.gradle.kts b/app/build.gradle.kts index c2925c61c..3c12c4290 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -50,7 +50,7 @@ android { } kotlinOptions { - jvmTarget = "1.8" + jvmTarget = "11" } compileOptions { diff --git a/automotive/build.gradle.kts b/automotive/build.gradle.kts index 82612312b..0862547c9 100644 --- a/automotive/build.gradle.kts +++ b/automotive/build.gradle.kts @@ -62,7 +62,7 @@ android { } kotlinOptions { - jvmTarget = "1.8" + jvmTarget = "11" } compileOptions { diff --git a/build.gradle.kts b/build.gradle.kts index eedb21c79..815371caf 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -11,7 +11,7 @@ buildscript { gradlePluginPortal() } dependencies { - classpath("com.android.tools.build:gradle:7.4.2") + classpath("com.android.tools.build:gradle:8.0.0") classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.10") classpath("com.google.gms:google-services:4.3.15") classpath("com.google.firebase:firebase-appdistribution-gradle:4.0.0") diff --git a/common/build.gradle.kts b/common/build.gradle.kts index 1504640b0..03a000c94 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -36,7 +36,7 @@ android { } kotlinOptions { - jvmTarget = "1.8" + jvmTarget = "11" } compileOptions { diff --git a/gradle.properties b/gradle.properties index 7904ab939..7fbe28c82 100644 --- a/gradle.properties +++ b/gradle.properties @@ -25,9 +25,7 @@ org.gradle.caching=true org.gradle.parallel=true org.gradle.vfs.watch=true -android.nonTransitiveRClass=true - -android.defaults.buildfeatures.aidl=false -android.defaults.buildfeatures.renderscript=false android.defaults.buildfeatures.resvalues=false -android.defaults.buildfeatures.shaders=false \ No newline at end of file +android.defaults.buildfeatures.shaders=false +android.defaults.buildfeatures.buildconfig=true +android.nonFinalResIds=false \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ae04661ee..da1db5f04 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/wear/build.gradle.kts b/wear/build.gradle.kts index 38f4c8524..8c39efc2b 100644 --- a/wear/build.gradle.kts +++ b/wear/build.gradle.kts @@ -38,11 +38,6 @@ android { kotlinCompilerExtensionVersion = "1.4.3" } - compileOptions { - sourceCompatibility(JavaVersion.VERSION_11) - targetCompatibility(JavaVersion.VERSION_11) - } - signingConfigs { create("release") { storeFile = file(System.getenv("KEYSTORE_PATH") ?: "release_keystore.keystore") @@ -69,6 +64,11 @@ android { jvmTarget = "11" } + compileOptions { + sourceCompatibility(JavaVersion.VERSION_11) + targetCompatibility(JavaVersion.VERSION_11) + } + lint { disable += "MissingTranslation" }