Refactor gradle (#15)

.github/dependabot.yml

@@ -1,9 +1,23 @@
 version: 2
 updates:
   - package-ecosystem: gradle
-    directory: "/"
+    directory: "/sample-api-client"
     schedule:
       interval: "weekly"
+    groups:
+      dependencies:
+        applies-to: version-updates
+        patterns:
+          - "*"
+  - package-ecosystem: gradle
+    directory: "/sample-api-server"
+    schedule:
+      interval: "weekly"
+    groups:
+      dependencies:
+        applies-to: version-updates
+        patterns:
+          - "*"
   - package-ecosystem: github-actions
     directory: /
     schedule:

README.md

@@ -1,8 +1,8 @@
 [![CI](https://github.com/rogervinas/contract-testing-with-pact/actions/workflows/ci.yml/badge.svg)](https://github.com/rogervinas/contract-testing-with-pact/actions/workflows/ci.yml)
 ![Java](https://img.shields.io/badge/Java-21-blue?labelColor=black)
-![Kotlin](https://img.shields.io/badge/Kotlin-1.9.20-blue?labelColor=black)
+![Kotlin](https://img.shields.io/badge/Kotlin-2.0.0-blue?labelColor=black)
 ![SpringBoot](https://img.shields.io/badge/SpringBoot-3.1.5-blue?labelColor=black)
-![Pact](https://img.shields.io/badge/Pact-4.6.3-blue?labelColor=black)
+![Pact](https://img.shields.io/badge/Pact-4.6.10-blue?labelColor=black)
 
 # Contract Testing with Pact
 

sample-api-client/.editorconfig

@@ -5,6 +5,3 @@ charset=utf-8
 insert_final_newline=true
 trim_trailing_whitespace=true
 max_line_length=120
-
-[*.{kt,kts}]
-disabled_rules=import-ordering

sample-api-client/build.gradle.kts

@@ -4,8 +4,9 @@ import org.gradle.api.tasks.testing.logging.TestLogEvent.PASSED
 import org.gradle.api.tasks.testing.logging.TestLogEvent.SKIPPED
 
 plugins {
-  id("org.jetbrains.kotlin.jvm") version "1.9.20"
-  id("au.com.dius.pact") version "4.6.3"
+  id("org.jetbrains.kotlin.jvm") version "2.0.0"
+  id("au.com.dius.pact") version "4.6.10"
+  id("org.jlleitschuh.gradle.ktlint") version "12.1.1"
   application
 }
 
@@ -35,9 +36,15 @@ dependencies {
   testImplementation("au.com.dius.pact.consumer:junit5:4.6.3")
 }
 
+java {
+  toolchain {
+    languageVersion = JavaLanguageVersion.of(21)
+  }
+}
+
 kotlin {
-  jvmToolchain {
-    languageVersion.set(JavaLanguageVersion.of(21))
+  compilerOptions {
+    freeCompilerArgs.addAll("-Xjsr305=strict")
   }
 }
 

sample-api-client/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

sample-api-client/gradlew

@@ -83,7 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -144,15 +145,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -201,11 +202,11 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

sample-api-client/src/main/kotlin/com/rogervinas/sample/api/client/SampleApiClient.kt

@@ -6,14 +6,15 @@ import java.time.LocalDate
 data class SampleThing(
   val name: String,
   val value: Double,
-  @JsonFormat(pattern = "yyyy-MM-dd") val date: LocalDate
+  @JsonFormat(pattern = "yyyy-MM-dd") val date: LocalDate,
 )
 
 data class SampleThingId(
-  val id: Int
+  val id: Int,
 )
 
 interface SampleApiClient {
   suspend fun create(thing: SampleThing): SampleThingId?
+
   suspend fun get(thingId: SampleThingId): SampleThing?
 }

sample-api-client/src/main/kotlin/com/rogervinas/sample/api/client/SampleApiKtorClient.kt

@@ -14,20 +14,21 @@ import io.ktor.http.contentType
 import io.ktor.serialization.jackson.jackson
 
 class SampleApiKtorClient(private val serverUrl: String) : SampleApiClient {
-
-  private val client = HttpClient(CIO) {
-    install(ContentNegotiation) {
-      jackson {
-        registerModule(JavaTimeModule())
+  private val client =
+    HttpClient(CIO) {
+      install(ContentNegotiation) {
+        jackson {
+          registerModule(JavaTimeModule())
+        }
       }
     }
-  }
 
   override suspend fun create(thing: SampleThing): SampleThingId? {
-    val response = client.post("$serverUrl/thing") {
-      contentType(ContentType.Application.Json)
-      setBody(thing)
-    }
+    val response =
+      client.post("$serverUrl/thing") {
+        contentType(ContentType.Application.Json)
+        setBody(thing)
+      }
     return when (response.status) {
       HttpStatusCode.Created -> response.body<SampleThingId>()
       else -> null

sample-api-client/src/test/kotlin/com/rogervinas/sample/api/client/SampleApiClientContractTest.kt

@@ -18,21 +18,21 @@ import org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS
 import org.junit.jupiter.api.extension.ExtendWith
 import java.time.LocalDate
 
-
 @ExtendWith(PactConsumerTestExt::class)
 @TestInstance(PER_CLASS)
 class SampleApiClientContractTest {
-
   companion object {
     private val THING123 = SampleThing("Foo", 123.45, LocalDate.of(2022, 10, 13))
-    private val THING123_JSON_PACT = PactDslJsonBody()
-      .stringMatcher("name", "\\w+", "Foo")
-      .decimalType("value", 123.45)
-      .localDate("date", "yyyy-MM-dd", LocalDate.of(2022, 10, 13))
+    private val THING123_JSON_PACT =
+      PactDslJsonBody()
+        .stringMatcher("name", "\\w+", "Foo")
+        .decimalType("value", 123.45)
+        .localDate("date", "yyyy-MM-dd", LocalDate.of(2022, 10, 13))
 
     private val THING123_ID = SampleThingId(123)
-    private val THING123_ID_JSON_PACT = PactDslJsonBody()
-      .integerType("id", 123L)
+    private val THING123_ID_JSON_PACT =
+      PactDslJsonBody()
+        .integerType("id", 123L)
   }
 
   @Pact(provider = "Sample API Server", consumer = "Sample API Client")
@@ -55,9 +55,10 @@ class SampleApiClientContractTest {
   @PactTestFor(providerName = "Sample API Server", pactMethod = "create", providerType = SYNCH)
   fun `should create thing`(mockServer: MockServer) {
     val client = SampleApiKtorClient(mockServer.getUrl())
-    val thingId = runBlocking {
-      client.create(THING123)
-    }
+    val thingId =
+      runBlocking {
+        client.create(THING123)
+      }
     assertThat(thingId)
       .isEqualTo(THING123_ID)
   }
@@ -80,9 +81,10 @@ class SampleApiClientContractTest {
   @PactTestFor(providerName = "Sample API Server", pactMethod = "getExistingThing", providerType = SYNCH)
   fun `should get thing 123 when it exists`(mockServer: MockServer) {
     val client = SampleApiKtorClient(mockServer.getUrl())
-    val thing = runBlocking {
-      client.get(THING123_ID)
-    }
+    val thing =
+      runBlocking {
+        client.get(THING123_ID)
+      }
     assertThat(thing)
       .isEqualTo(THING123)
   }
@@ -103,9 +105,10 @@ class SampleApiClientContractTest {
   @PactTestFor(providerName = "Sample API Server", pactMethod = "getNonExistingThing", providerType = SYNCH)
   fun `should not get thing 123 when it does not exist`(mockServer: MockServer) {
     val client = SampleApiKtorClient(mockServer.getUrl())
-    val thing = runBlocking {
-      client.get(THING123_ID)
-    }
+    val thing =
+      runBlocking {
+        client.get(THING123_ID)
+      }
     assertThat(thing).isNull()
   }
 }

sample-api-server/.editorconfig

@@ -5,6 +5,3 @@ charset=utf-8
 insert_final_newline=true
 trim_trailing_whitespace=true
 max_line_length=120
-
-[*.{kt,kts}]
-disabled_rules=import-ordering

sample-api-server/build.gradle.kts

@@ -4,11 +4,12 @@ import org.gradle.api.tasks.testing.logging.TestLogEvent.PASSED
 import org.gradle.api.tasks.testing.logging.TestLogEvent.SKIPPED
 
 plugins {
-    id("org.springframework.boot") version "3.1.5"
-    id("io.spring.dependency-management") version "1.1.3"
-    kotlin("jvm") version "1.9.20"
-    kotlin("plugin.spring") version "1.9.20"
-    id("au.com.dius.pact") version "4.6.3"
+  id("org.springframework.boot") version "3.1.5"
+  id("io.spring.dependency-management") version "1.1.3"
+  kotlin("jvm") version "2.0.0"
+  kotlin("plugin.spring") version "2.0.0"
+  id("au.com.dius.pact") version "4.6.10"
+  id("org.jlleitschuh.gradle.ktlint") version "12.1.1"
 }
 
 version = "1.0"
@@ -18,48 +19,54 @@ project.extra["pacticipant"] = "Sample API Server"
 project.extra["pacticipantVersion"] = version
 
 repositories {
-    mavenCentral()
+  mavenCentral()
 }
 
-dependencies {
-    implementation("org.springframework.boot:spring-boot-starter-webflux")
-    implementation("com.fasterxml.jackson.module:jackson-module-kotlin")
-    implementation("io.projectreactor.kotlin:reactor-kotlin-extensions")
-    implementation("org.jetbrains.kotlin:kotlin-reflect")
-    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-reactor")
+java {
+  toolchain {
+    languageVersion = JavaLanguageVersion.of(21)
+  }
+}
+
+kotlin {
+  compilerOptions {
+    freeCompilerArgs.addAll("-Xjsr305=strict")
+  }
+}
 
-    testImplementation("org.springframework.boot:spring-boot-starter-test")
-    testImplementation("io.projectreactor:reactor-test")
+dependencies {
+  implementation("org.springframework.boot:spring-boot-starter-webflux")
+  implementation("com.fasterxml.jackson.module:jackson-module-kotlin")
+  implementation("io.projectreactor.kotlin:reactor-kotlin-extensions")
+  implementation("org.jetbrains.kotlin:kotlin-reflect")
+  implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
+  implementation("org.jetbrains.kotlinx:kotlinx-coroutines-reactor")
 
-    testImplementation("au.com.dius.pact.provider:spring6:4.6.3")
+  testImplementation("org.springframework.boot:spring-boot-starter-test")
+  testImplementation("io.projectreactor:reactor-test")
 
-    testImplementation("com.ninja-squad:springmockk:4.0.2")
-}
+  testImplementation("au.com.dius.pact.provider:spring6:4.6.3")
 
-kotlin {
-    jvmToolchain {
-        languageVersion.set(JavaLanguageVersion.of(21))
-    }
+  testImplementation("com.ninja-squad:springmockk:4.0.2")
 }
 
 tasks.withType<Test>().configureEach {
-    useJUnitPlatform()
-    testLogging {
-        events(PASSED, SKIPPED, FAILED)
-        exceptionFormat = FULL
-        showExceptions = true
-        showCauses = true
-        showStackTraces = true
-    }
+  useJUnitPlatform()
+  testLogging {
+    events(PASSED, SKIPPED, FAILED)
+    exceptionFormat = FULL
+    showExceptions = true
+    showCauses = true
+    showStackTraces = true
+  }
 
-    systemProperties["pactbroker.url"] = "${project.extra["pactbroker.url"]}"
-    systemProperties["pact.provider.version"] = version
-    systemProperties["pact.verifier.publishResults"] = "true"
+  systemProperties["pactbroker.url"] = "${project.extra["pactbroker.url"]}"
+  systemProperties["pact.provider.version"] = version
+  systemProperties["pact.verifier.publishResults"] = "true"
 }
 
 pact {
-    broker {
-        pactBrokerUrl = "${project.extra["pactbroker.url"]}"
-    }
+  broker {
+    pactBrokerUrl = "${project.extra["pactbroker.url"]}"
+  }
 }

sample-api-server/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME