Gradle 7.6 update

allegro · Sep 3, 2024 · 9ef9fc7 · 9ef9fc7
1 parent ec7fe55
commit 9ef9fc7
Show file tree

Hide file tree

Showing 15 changed files with 231 additions and 419 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,12 +1,15 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
 plugins {
     `kotlin-dsl`
     groovy
     `maven-publish`
     signing
     jacoco
+    idea
     id("pl.allegro.tech.build.axion-release") version "1.18.5"
     id("com.github.kt3k.coveralls") version "2.12.2"
-    id("com.gradle.plugin-publish") version "1.2.1"
+    id("com.gradle.plugin-publish") version "1.2.2"
     id("io.github.gradle-nexus.publish-plugin") version "2.0.0"
     id("com.coditory.integration-test") version "1.4.5"
     id("com.adarshr.test-logger") version "3.0.0"
@@ -42,9 +45,7 @@ repositories {
 sourceSets {
     main {
         java { setSrcDirs(emptyList<String>()) }
-        withConvention(GroovySourceSet::class) {
-            groovy.setSrcDirs(listOf("src/main/java", "src/main/groovy"))
-        }
+        groovy.setSrcDirs(listOf("src/main/java", "src/main/groovy"))
     }
 }
 
@@ -60,7 +61,7 @@ dependencies {
     runtimeOnly("org.eclipse.jgit:org.eclipse.jgit.gpg.bc:$jgitVersion")
 
     implementation("org.eclipse.jgit:org.eclipse.jgit:$jgitVersion")
-    implementation("org.eclipse.jgit:org.eclipse.jgit.ssh.jsch:$jgitVersion")  {
+    implementation("org.eclipse.jgit:org.eclipse.jgit.ssh.jsch:$jgitVersion") {
         exclude("com.jcraft", "jsch")
     }
     implementation("com.github.mwiede:jsch:$jschVersion")
@@ -97,28 +98,28 @@ tasks {
     /**
      * set kotlin to depend on groovy
      */
-    named<AbstractCompile>("compileKotlin") {
-        classpath += files(sourceSets.main.get().withConvention(GroovySourceSet::class) { groovy }.classesDirectory)
+    named<KotlinCompile>("compileKotlin") {
+        libraries.from(files(sourceSets.main.get().groovy.classesDirectory))
     }
 
     /**
      * set groovy to not depend on Kotlin
      */
-    named<AbstractCompile>("compileGroovy") {
+    named<GroovyCompile>("compileGroovy") {
         classpath = sourceSets.main.get().compileClasspath
     }
 
     jacocoTestReport {
         reports {
             xml.required.set(true)
         }
+        executionData(
+            file("${layout.buildDirectory.asFile.get()}/jacoco/test.exec"),
+            file("${layout.buildDirectory.asFile.get()}/jacoco/integrationTest.exec"),
+        )
     }
 }
 
-jacoco {
-    toolVersion = "0.8.2"
-}
-
 gradlePlugin {
     testSourceSets(sourceSets.integration.get())
     plugins {
@@ -193,3 +194,10 @@ signing {
     )
     sign(publishing.publications)
 }
+
+idea {
+    module {
+        testSources.from(testSources.from + sourceSets.integration.get().allSource.srcDirs)
+        testResources.from(testResources.from + sourceSets.integration.get().resources.srcDirs)
+    }
+}
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists