From e0bc6dafa078628c98854e8e1be904f3546b9838 Mon Sep 17 00:00:00 2001 From: darken Date: Tue, 16 May 2023 07:46:13 +0200 Subject: [PATCH] Bump gradle --- .github/workflows/code-checks.yml | 8 ++++---- .github/workflows/release-tag.yml | 4 ++-- app-common/build.gradle.kts | 7 ++++--- app-wear/build.gradle.kts | 7 ++++--- app/build.gradle.kts | 8 ++++---- build.gradle.kts | 2 +- buildSrc/build.gradle.kts | 2 +- gradle.properties | 8 ++++++-- gradle/wrapper/gradle-wrapper.properties | 6 +++--- 9 files changed, 29 insertions(+), 23 deletions(-) diff --git a/.github/workflows/code-checks.yml b/.github/workflows/code-checks.yml index c5030ca6..ccfb7d27 100644 --- a/.github/workflows/code-checks.yml +++ b/.github/workflows/code-checks.yml @@ -18,10 +18,10 @@ 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 with: - java-version: '11' + java-version: '17' distribution: 'adopt' cache: gradle - name: Grant execute permission for gradlew @@ -40,10 +40,10 @@ 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 with: - java-version: '11' + java-version: '17' distribution: 'adopt' cache: gradle - name: Grant execute permission for gradlew diff --git a/.github/workflows/release-tag.yml b/.github/workflows/release-tag.yml index caf796ec..b34f5e69 100644 --- a/.github/workflows/release-tag.yml +++ b/.github/workflows/release-tag.yml @@ -38,7 +38,7 @@ jobs: uses: actions/setup-java@v3 with: distribution: 'adopt' - java-version: 11 + java-version: 17 - name: Assemble beta APK if: contains(steps.tagger.outputs.tag, '-beta') @@ -130,7 +130,7 @@ jobs: uses: actions/setup-java@v3 with: distribution: 'adopt' - java-version: 11 + java-version: 17 - name: Set up ruby env uses: ruby/setup-ruby@v1 diff --git a/app-common/build.gradle.kts b/app-common/build.gradle.kts index 6a901b09..add0b9c8 100644 --- a/app-common/build.gradle.kts +++ b/app-common/build.gradle.kts @@ -8,6 +8,7 @@ apply(plugin = "dagger.hilt.android.plugin") android { compileSdk = ProjectConfig.compileSdk + namespace = "${ProjectConfig.packageName}.common" defaultConfig { minSdk = ProjectConfig.minSdk @@ -33,12 +34,12 @@ android { compileOptions { isCoreLibraryDesugaringEnabled = true - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlinOptions { - jvmTarget = "1.8" + jvmTarget = "17" freeCompilerArgs = freeCompilerArgs + listOf( "-opt-in=kotlin.ExperimentalStdlibApi", "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi", diff --git a/app-wear/build.gradle.kts b/app-wear/build.gradle.kts index 40996fe4..aca46035 100644 --- a/app-wear/build.gradle.kts +++ b/app-wear/build.gradle.kts @@ -9,6 +9,7 @@ apply(plugin = "androidx.navigation.safeargs.kotlin") android { compileSdk = ProjectConfig.compileSdk + namespace = "${ProjectConfig.packageName}.wear" defaultConfig { applicationId = ProjectConfig.packageName @@ -102,12 +103,12 @@ android { compileOptions { isCoreLibraryDesugaringEnabled = true - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlinOptions { - jvmTarget = "1.8" + jvmTarget = "17" freeCompilerArgs = freeCompilerArgs + listOf( "-opt-in=kotlin.ExperimentalStdlibApi", "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi", diff --git a/app/build.gradle.kts b/app/build.gradle.kts index f03686cf..5d3271f0 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -8,8 +8,8 @@ apply(plugin = "dagger.hilt.android.plugin") apply(plugin = "androidx.navigation.safeargs.kotlin") android { - compileSdk = ProjectConfig.compileSdk + namespace = "${ProjectConfig.packageName}" defaultConfig { applicationId = ProjectConfig.packageName @@ -100,12 +100,12 @@ android { compileOptions { isCoreLibraryDesugaringEnabled = true - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlinOptions { - jvmTarget = "1.8" + jvmTarget = "17" freeCompilerArgs = freeCompilerArgs + listOf( "-opt-in=kotlin.ExperimentalStdlibApi", "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi", diff --git a/build.gradle.kts b/build.gradle.kts index c8d6716e..f3ebdb25 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,7 +4,7 @@ buildscript { mavenCentral() } dependencies { - classpath("com.android.tools.build:gradle:7.3.1") + classpath("com.android.tools.build:gradle:8.0.1") classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.Kotlin.core}") classpath("com.google.dagger:hilt-android-gradle-plugin:${Versions.Dagger.core}") classpath("androidx.navigation:navigation-safe-args-gradle-plugin:${Versions.AndroidX.Navigation.core}") diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 94ca4cb3..c5fe09dd 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -8,7 +8,7 @@ repositories { mavenCentral() } dependencies { - implementation("com.android.tools.build:gradle:7.3.1") + implementation("com.android.tools.build:gradle:8.0.1") implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0") implementation("com.squareup:javapoet:1.13.0") } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 25217527..b301f0d2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ # http://www.gradle.org/docs/current/userguide/build_environment.html # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. -org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 +org.gradle.jvmargs=-Xmx4g -Dfile.encoding=UTF-8 # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects @@ -16,4 +16,8 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 # https://developer.android.com/topic/libraries/support-library/androidx-rn android.useAndroidX=true # Kotlin code style for this project: "official" or "obsolete": -kotlin.code.style=official \ No newline at end of file +kotlin.code.style=official +android.defaults.buildfeatures.buildconfig=true +android.nonTransitiveRClass=false +android.nonFinalResIds=false +org.gradle.unsafe.configuration-cache=false \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 514340ee..3be66318 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sun Aug 28 21:26:18 CEST 2022 +#Tue May 16 07:17:06 CEST 2023 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip distributionPath=wrapper/dists -zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists