From 4f6f0fae9ef2bfa466ea77ac480c17e177dd2c25 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 30 Apr 2024 19:23:05 +0000 Subject: [PATCH 1/3] fix(deps): update google.agp to v8.4.0 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5add48ad..b3769a5e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] java-compilation = "21" -google-agp = "8.3.2" +google-agp = "8.4.0" gradle-starter = "0.71.0" gradle-gradlepublish = "1.2.1" gradle-jacocotestkit = "1.0.12" From cc8012c40aafc293301950f786eeafc0a9fd25bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Kwiecin=CC=81ski?= Date: Tue, 30 Apr 2024 21:53:06 +0200 Subject: [PATCH 2/3] Address deprecations (develocity + build-gradle action) --- .github/workflows/default.yml | 12 ++++++++---- settings.gradle | 12 +++++++----- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml index 614a276b..748de397 100644 --- a/.github/workflows/default.yml +++ b/.github/workflows/default.yml @@ -94,9 +94,11 @@ jobs: - name: Run ${{ matrix.task }} uses: gradle/actions/setup-gradle@v3 with: - build-root-directory: sample/android gradle-version: ${{ matrix.gradle }} - arguments: ${{ matrix.task }} --stacktrace + + - name: Run build in a subdirectory + working-directory: sample/android + run: gradle ${{ matrix.task }} --stacktrace build-all-sample-kotlin-projects: runs-on: ubuntu-latest @@ -125,6 +127,8 @@ jobs: - name: Run ${{ matrix.task }} uses: gradle/actions/setup-gradle@v3 with: - build-root-directory: sample/kotlin gradle-version: ${{ matrix.gradle }} - arguments: ${{ matrix.task }} --stacktrace + + - name: Run build in a subdirectory + working-directory: sample/kotlin + run: gradle ${{ matrix.task }} --stacktrace diff --git a/settings.gradle b/settings.gradle index aa9e024e..a0ac0a28 100644 --- a/settings.gradle +++ b/settings.gradle @@ -8,14 +8,16 @@ pluginManagement { } plugins { - id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0" - id "com.gradle.enterprise" version "3.17.2" + id "com.gradle.develocity" version "3.17.2" } -gradleEnterprise { +develocity { buildScan { - termsOfServiceUrl = "https://gradle.com/terms-of-service" - termsOfServiceAgree = "yes" + termsOfUseUrl = "https://gradle.com/terms-of-service" + termsOfUseAgree = "yes" + + uploadInBackground = System.getenv("CI") == null + publishing.onlyIf { false } } } From 6f509c5930ca98890784f0ba30a7649ed17439f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Kwiecin=CC=81ski?= Date: Tue, 30 Apr 2024 21:58:35 +0200 Subject: [PATCH 3/3] Fix tests --- .../starter/quality/AndroidQualityPluginTest.kt | 11 ++++------- .../starter/plugins/CommonSettingsPluginTest.kt | 12 ++++++------ 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/android/src/test/kotlin/com/project/starter/quality/AndroidQualityPluginTest.kt b/android/src/test/kotlin/com/project/starter/quality/AndroidQualityPluginTest.kt index 9df5db1c..8dd6f327 100644 --- a/android/src/test/kotlin/com/project/starter/quality/AndroidQualityPluginTest.kt +++ b/android/src/test/kotlin/com/project/starter/quality/AndroidQualityPluginTest.kt @@ -20,7 +20,7 @@ internal class AndroidQualityPluginTest : WithGradleProjectTest() { // language=groovy """ plugins { - id("org.gradle.toolchains.foojay-resolver-convention") version "0.5.0" + id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0" } dependencyResolutionManagement { @@ -92,10 +92,10 @@ internal class AndroidQualityPluginTest : WithGradleProjectTest() { def targetJavaVersion = JavaVersion.VERSION_11 android { namespace "com.example.module2" - compileSdkVersion 33 + compileSdkVersion 34 defaultConfig { - minSdkVersion 23 + minSdkVersion 31 } compileOptions { sourceCompatibility = targetJavaVersion @@ -106,10 +106,7 @@ internal class AndroidQualityPluginTest : WithGradleProjectTest() { kotlin { jvmToolchain(21) } - - tasks.withType(JavaCompile).configureEach { - options.release.set(targetJavaVersion.majorVersion.toInteger()) - } + tasks.withType(KotlinCompile).configureEach { compilerOptions.jvmTarget = JvmTarget.@Companion.fromTarget(targetJavaVersion.toString()) } diff --git a/config/src/test/kotlin/com/project/starter/plugins/CommonSettingsPluginTest.kt b/config/src/test/kotlin/com/project/starter/plugins/CommonSettingsPluginTest.kt index 1de4d437..ed408f0e 100644 --- a/config/src/test/kotlin/com/project/starter/plugins/CommonSettingsPluginTest.kt +++ b/config/src/test/kotlin/com/project/starter/plugins/CommonSettingsPluginTest.kt @@ -50,9 +50,9 @@ internal class CommonSettingsPluginTest : WithGradleProjectTest() { javaVersion = JavaVersion.VERSION_11 javaFilesAllowed = false androidPlugin { - compileSdkVersion = 30 - minSdkVersion = 23 - targetSdkVersion = 30 + compileSdkVersion = 34 + minSdkVersion = 31 + targetSdkVersion = 34 } qualityPlugin { formatOnCompile = true @@ -79,9 +79,9 @@ internal class CommonSettingsPluginTest : WithGradleProjectTest() { javaVersion JavaVersion.VERSION_11 javaFilesAllowed false androidPlugin { - compileSdkVersion 30 - minSdkVersion 23 - targetSdkVersion 30 + compileSdkVersion 34 + minSdkVersion 31 + targetSdkVersion 34 } qualityPlugin { formatOnCompile true