Update Gradle and plugin versions

jjohannes · Nov 21, 2024 · d160ef8 · d160ef8
1 parent 547554e
commit d160ef8
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 15 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -12,9 +12,9 @@ jobs:
           distribution: temurin
           java-version: 17
       - name: Set up Gradle
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@v4
         with:
-          gradle-version: 8.9-rc-1
+          gradle-version: 8.11.1
           build-scan-publish: true
           build-scan-terms-of-use-url: "https://gradle.com/terms-of-service"
           build-scan-terms-of-use-agree: "yes"

diff --git a/03_Plugins/my-build-logic/java-plugins/build.gradle.kts b/03_Plugins/my-build-logic/java-plugins/build.gradle.kts
@@ -3,5 +3,5 @@ plugins {
 }
 
 dependencies {
-    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23")
+    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21")
 }
diff --git a/16_Source_Sets/my-build-logic/android-plugins/build.gradle.kts b/16_Source_Sets/my-build-logic/android-plugins/build.gradle.kts
@@ -3,5 +3,5 @@ plugins {
 }
 
 dependencies {
-    implementation("com.android.tools.build:gradle:8.2.0-beta06")
+    implementation("com.android.tools.build:gradle:8.7.2")
 }
diff --git a/16_Source_Sets/my-build-logic/kotlin-plugins/build.gradle.kts b/16_Source_Sets/my-build-logic/kotlin-plugins/build.gradle.kts
@@ -3,5 +3,5 @@ plugins {
 }
 
 dependencies {
-    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20-Beta2")
+    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21")
 }
diff --git a/28_Dependency_Analysis_Plugin/my-build-logic/java-plugins/build.gradle.kts b/28_Dependency_Analysis_Plugin/my-build-logic/java-plugins/build.gradle.kts
@@ -3,5 +3,5 @@ plugins {
 }
 
 dependencies {
-    implementation("com.autonomousapps:dependency-analysis-gradle-plugin:1.25.0")
+    implementation("com.autonomousapps:dependency-analysis-gradle-plugin:2.5.0")
 }
diff --git a/29_Classpath_Collisions/my-build-logic/java-plugins/build.gradle.kts b/29_Classpath_Collisions/my-build-logic/java-plugins/build.gradle.kts
@@ -3,6 +3,6 @@ plugins {
 }
 
 dependencies {
-    implementation("io.fuchs.gradle.classpath-collision-detector:classpath-collision-detector:0.3")
-    implementation("org.gradlex:java-ecosystem-capabilities:1.0")
+    implementation("io.fuchs.gradle.classpath-collision-detector:classpath-collision-detector:1.0.0")
+    implementation("org.gradlex:jvm-dependency-conflict-resolution:2.1.2")
 }
diff --git a/29_Classpath_Collisions/my-build-logic/java-plugins/src/main/kotlin/my-java-base.gradle.kts b/29_Classpath_Collisions/my-build-logic/java-plugins/src/main/kotlin/my-java-base.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     id("java")
-    id("org.gradlex.java-ecosystem-capabilities")
+    id("org.gradlex.jvm-dependency-conflict-resolution")
 }
 
 group = "org.example.my-app"

diff --git a/30_Security_Vulnerabilities/my-build-logic/java-plugins/build.gradle.kts b/30_Security_Vulnerabilities/my-build-logic/java-plugins/build.gradle.kts
@@ -3,5 +3,5 @@ plugins {
 }
 
 dependencies {
-    implementation("org.owasp:dependency-check-gradle:7.4.4")
+    implementation("org.owasp:dependency-check-gradle:11.1.0")
 }
diff --git a/31_The_Module_Path/my-build-logic/java-plugins/build.gradle.kts b/31_The_Module_Path/my-build-logic/java-plugins/build.gradle.kts
@@ -3,5 +3,5 @@ plugins {
 }
 
 dependencies {
-    implementation("org.gradlex:java-module-dependencies:1.4.2")
+    implementation("org.gradlex:java-module-dependencies:1.8")
 }
diff --git a/32_Artifact_Transforms/my-build-logic/java-plugins/build.gradle.kts b/32_Artifact_Transforms/my-build-logic/java-plugins/build.gradle.kts
@@ -3,5 +3,5 @@ plugins {
 }
 
 dependencies {
-    implementation("org.gradlex:extra-java-module-info:1.3")
+    implementation("org.gradlex:extra-java-module-info:1.9")
 }
diff --git a/33_Classpath_and_Module_Path_in_Testing/my-build-logic/java-plugins/build.gradle.kts b/33_Classpath_and_Module_Path_in_Testing/my-build-logic/java-plugins/build.gradle.kts
@@ -3,7 +3,5 @@ plugins {
 }
 
 dependencies {
-    implementation("io.fuchs.gradle.classpath-collision-detector:classpath-collision-detector:0.3")
-    implementation("org.gradlex:java-ecosystem-capabilities:1.3.1")
-    implementation("org.gradlex:java-module-testing:1.2.2")
+    implementation("org.gradlex:java-module-testing:1.5")
 }