Bump com.android.tools.build:gradle from 7.4.2 to 8.0.0 (#3474)

* Bump com.android.tools.build:gradle from 7.4.2 to 8.0.0 Bumps com.android.tools.build:gradle from 7.4.2 to 8.0.0. --- updated-dependencies: - dependency-name: com.android.tools.build:gradle dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * Bump Gradle version * Build default values changes - Remove items that match new defaults - Add item to keep old default to allow for those changes to happen in another PR * Align target Kotlin version with target Java version * Use JDK 17 * Remove one more item that now matches default --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Joris Pelgröm <joris.pelgrom@gmail.com>
home-assistant · Apr 25, 2023 · 6b03613 · 6b03613
1 parent 32a7933
commit 6b03613
Show file tree

Hide file tree

Showing 11 changed files with 29 additions and 31 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -50,7 +50,7 @@ android {
     }
 
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "11"
     }
 
     compileOptions {

diff --git 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
@@ -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
@@ -36,7 +36,7 @@ android {
     }
 
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "11"
     }
 
     compileOptions {

diff --git 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
+android.defaults.buildfeatures.shaders=false
+android.defaults.buildfeatures.buildconfig=true
+android.nonFinalResIds=false
diff --git 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
@@ -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"
     }