fix(deps): update google.agp to v8.4.0 (#622)

* fix(deps): update google.agp to v8.4.0 * Address deprecations (develocity + build-gradle action) * Fix tests --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Mateusz Kwieciński <mateusz.kwiatek@gmail.com>
usefulness · Apr 30, 2024 · f94adc7 · f94adc7
1 parent 1942ccc
commit f94adc7
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 23 deletions.
diff --git 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/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
@@ -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

diff --git 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"

diff --git 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 }
     }
 }