Revert Downgrade to Gradle 8.8

bakdata · Jan 22, 2025 · 144bc0e · 144bc0e
1 parent a2f0dee
commit 144bc0e
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 19 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
     id("com.bakdata.release") version "1.6.0"
     id("com.bakdata.sonar") version "1.6.0"
     id("com.bakdata.sonatype") version "1.6.0"
-    id("org.gradle.kotlin.kotlin-dsl") version "5.1.2" apply false
+    id("org.gradle.kotlin.kotlin-dsl") version "4.3.1" apply false
     id("com.gradle.plugin-publish") version "1.3.0" apply false
 }
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/sonar/src/main/kotlin/com/bakdata/gradle/SonarPlugin.kt b/sonar/src/main/kotlin/com/bakdata/gradle/SonarPlugin.kt
@@ -29,7 +29,6 @@ import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.logging.Logging
 import org.gradle.api.plugins.JavaPlugin
-import org.gradle.api.tasks.SourceSetContainer
 import org.gradle.api.tasks.testing.Test
 import org.gradle.kotlin.dsl.*
 import org.gradle.testing.jacoco.plugins.JacocoPluginExtension
@@ -82,22 +81,6 @@ class SonarPlugin : Plugin<Project> {
             }
 
             if (subprojects.isNotEmpty()) {
-                tasks.register<JacocoReport>("jacocoRootReport") {
-                    subprojects {
-                        executionData(tasks.withType<JacocoReport>().map { it.executionData })
-
-                        components.matching { it.name == "java" }.configureEach {
-                            sourceDirectories.from(files(project.the<SourceSetContainer>()["main"].allSource.srcDirs))
-                            classDirectories.from(files(project.the<SourceSetContainer>()["main"].output))
-                        }
-                    }
-                    reports {
-                        html.required.set(true)
-                        xml.required.set(true)
-                        csv.required.set(false)
-                    }
-                }
-
                 // using a newer feature of sonarqube to use the xml reports which also makes it language-agnostic
                 configure<org.sonarqube.gradle.SonarExtension> {
                     properties {