Upgrade build to Gradle 8.3 (#251)

* Upgrade build to Gradle 8.3 * Code review fixes --------- Co-authored-by: André Gasser <andre.gasser2@swisscom.com>
andregasser · Aug 18, 2023 · 6fad033 · 6fad033
1 parent 249b5c8
commit 6fad033
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 12 deletions.
diff --git a/bigbone-rx/build.gradle b/bigbone-rx/build.gradle
@@ -6,10 +6,9 @@ dependencies {
     api project(':bigbone')
     api libs.rxjava
     api libs.okhttp
-
     implementation libs.kotlin.jdk8
-
-    testImplementation libs.junit.jupiter.api
+    testImplementation libs.junit.jupiter
+    testRuntimeOnly libs.junit.platform.launcher
     testImplementation libs.mockk
     testImplementation libs.mockk.dsl
     testImplementation libs.gson

diff --git a/bigbone/build.gradle b/bigbone/build.gradle
@@ -18,12 +18,13 @@ dependencies {
     api libs.okhttp
     api libs.gson
     implementation libs.kotlin.jdk8
-    testImplementation libs.junit.jupiter.api
+    testImplementation libs.junit.jupiter
+    testRuntimeOnly libs.junit.platform.launcher
     testImplementation libs.kluent
     testImplementation libs.mockk
     testImplementation libs.mockk.dsl
-    integrationTestImplementation libs.junit.jupiter.api
-    integrationTestImplementation libs.junit.jupiter.engine
+    integrationTestImplementation libs.junit.jupiter
+    integrationTestRuntimeOnly libs.junit.platform.launcher
     integrationTestImplementation libs.junit.platform.suite.engine
 }
 

diff --git a/buildSrc/src/main/groovy/social.bigbone.bigbone-library.gradle b/buildSrc/src/main/groovy/social.bigbone.bigbone-library.gradle
@@ -68,7 +68,7 @@ jacocoTestReport {
     reports {
         xml.required.set(true)
         csv.required.set(false)
-        html.outputLocation.set(file("${buildDir}/reports/jacoco"))
+        html.outputLocation.set(file("${layout.buildDirectory}/reports/jacoco"))
     }
 }
 

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -5,6 +5,7 @@ bigbone = "2.0.0-SNAPSHOT"
 # 3rd party dependencies
 gson = "2.10.1"
 junit-jupiter = "5.10.0"
+junit-platform-launcher = "1.10.0"
 junit-platform-suite-engine = "1.10.0"
 kluent = "1.73"
 kotlin = "1.9.0"
@@ -15,13 +16,13 @@ rxjava = "3.1.6"
 
 # Gradle plugins
 jacoco = "0.8.9"
-dependency-analysis = "1.20.0"
+dependency-analysis = "1.21.0"
 detekt = "1.23.1"
 versions = "0.47.0"
 
 [libraries]
-junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit-jupiter" }
-junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit-jupiter" }
+junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit-jupiter" }
+junit-platform-launcher = { module = "org.junit.platform:junit-platform-launcher", version.ref = "junit-platform-launcher" }
 junit-platform-suite-engine = { module = "org.junit.platform:junit-platform-suite-engine", version.ref = "junit-platform-suite-engine" }
 gson = { module = "com.google.code.gson:gson", version.ref = "gson" }
 kluent = { module = "org.amshove.kluent:kluent", version.ref = "kluent" }

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
diff --git a/settings.gradle b/settings.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id("com.gradle.enterprise") version("3.9")
+    id("com.gradle.enterprise") version("3.14.1")
 }
 
 rootProject.name = "bigbone-parent"