Skip to content
This repository has been archived by the owner on Oct 10, 2024. It is now read-only.

Upgrade Build Tooling #1478

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: set up JDK 11
uses: actions/setup-java@v3
- uses: actions/setup-java@v3
with:
java-version: "11"
java-version: "17"
distribution: "temurin"
cache: gradle
- name: Build with Gradle
Expand Down
1 change: 1 addition & 0 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ android {

buildFeatures {
compose = true
buildConfig = true
}

compileOptions {
Expand Down
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {
}

dependencies {
classpath("com.android.tools.build", "gradle", "7.3.0")
classpath("com.android.tools.build", "gradle", "8.2.2")
classpath(kotlin("gradle-plugin", libs.versions.kotlin.get()))
}
}
Expand Down
1 change: 1 addition & 0 deletions compose-persist/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ android {

buildFeatures {
compose = true
buildConfig = true
}

compileOptions {
Expand Down
1 change: 1 addition & 0 deletions compose-reordering/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ android {

buildFeatures {
compose = true
buildConfig = true
}

compileOptions {
Expand Down
1 change: 1 addition & 0 deletions compose-routing/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ android {

buildFeatures {
compose = true
buildConfig = true
}

compileOptions {
Expand Down
2 changes: 2 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@ android.useAndroidX=true
android.enableJetifier=false
kotlin.code.style=official
android.enableR8.fullMode=true
android.nonTransitiveRClass=true
android.nonFinalRClass=true
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 @@
#Wed Jul 06 23:33:16 CEST 2022
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME