Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/beta.yml
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/pr.yml
Expand Up @@ -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:
Expand All @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/weekly.yaml
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion app/build.gradle.kts
Expand Up @@ -50,7 +50,7 @@ android {
}

kotlinOptions {
jvmTarget = "1.8"
jvmTarget = "11"
}

compileOptions {
Expand Down
2 changes: 1 addition & 1 deletion automotive/build.gradle.kts
Expand Up @@ -62,7 +62,7 @@ android {
}

kotlinOptions {
jvmTarget = "1.8"
jvmTarget = "11"
}

compileOptions {
Expand Down
2 changes: 1 addition & 1 deletion build.gradle.kts
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion common/build.gradle.kts
Expand Up @@ -36,7 +36,7 @@ android {
}

kotlinOptions {
jvmTarget = "1.8"
jvmTarget = "11"
}

compileOptions {
Expand Down
8 changes: 3 additions & 5 deletions gradle.properties
Expand Up @@ -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
2 changes: 1 addition & 1 deletion 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
10 changes: 5 additions & 5 deletions wear/build.gradle.kts
Expand Up @@ -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")
Expand All @@ -69,6 +64,11 @@ android {
jvmTarget = "11"
}

compileOptions {
sourceCompatibility(JavaVersion.VERSION_11)
targetCompatibility(JavaVersion.VERSION_11)
}

lint {
disable += "MissingTranslation"
}
Expand Down