Merge pull request #20 from wiremock/wiremock-4

upgrade dependencies and add build health plugin.

Author: RafeArnold

.github/workflows/gradle.yml

@@ -15,7 +15,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        jdk: [11, 17]
+        jdk: [17]
     runs-on: ${{ matrix.os }}
     env:
       JDK_VERSION:  ${{ matrix.jdk }}

.github/workflows/release.yml

@@ -15,7 +15,7 @@ jobs:
       - name: Set up Java
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'adopt'
       - name: Validate Gradle wrapper
         uses: gradle/wrapper-validation-action@v1

build.gradle

@@ -12,20 +12,18 @@ plugins {
   id 'eclipse'
   id 'project-report'
   id 'com.diffplug.spotless' version '6.25.0'
-  id 'org.wiremock.tools.gradle.wiremock-extension-convention' version '0.2.0'
+  id 'org.wiremock.tools.gradle.java' version '0.6.0-beta.3'
+  id 'org.wiremock.tools.gradle.publishing' version '0.6.0-beta.3'
 }
 
 repositories {
   mavenLocal()
   mavenCentral()
 }
 
-projects {
-  ext {
-    versions = [
-      wiremock: "3.5.2"
-    ]
-  }
+java {
+  sourceCompatibility = 17
+  targetCompatibility = 17
 }
 
 allprojects {
@@ -55,20 +53,31 @@ allprojects {
 }
 
 dependencies {
-  api "org.wiremock:wiremock:$versions.wiremock"
-  //  1.x is not maintained but we need to use to support Java 11. It is in a better state than java-faker, which is also not maintained. Bump to 2.x once we deprecate support for Java 11.
-  implementation 'net.datafaker:datafaker:1.9.0'
+  api "org.wiremock:wiremock-core:$versions.wiremock"
+  api 'com.github.jknack:handlebars:4.5.0'
+  implementation 'net.datafaker:datafaker:2.5.3'
 
+  testImplementation platform('org.junit:junit-bom:5.14.1')
+  testImplementation 'org.junit.jupiter:junit-jupiter-api'
+  testImplementation 'org.junit.jupiter:junit-jupiter-params'
+  testRuntimeOnly 'org.junit.jupiter:junit-jupiter'
+  testRuntimeOnly 'org.junit.platform:junit-platform-engine:1.14.1'
+  testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.14.1'
   testImplementation("org.wiremock:wiremock:$versions.wiremock") {
     artifact {
       classifier = 'tests'
     }
   }
+  testImplementation(testFixtures("org.wiremock:wiremock:$versions.wiremock"))
+  testImplementation("org.wiremock:wiremock-junit5:$versions.wiremock")
+  testImplementation('org.hamcrest:hamcrest:3.0')
 }
 
 shadowJar {
   relocate "com.github.jknack", 'wiremock.com.github.jknack'
   relocate "net.datafaker", 'wiremock.net.datafaker'
+
+  exclude("META-INF/versions/21/**")
 }
 
 test {
@@ -78,3 +87,22 @@ test {
     exceptionFormat "full"
   }
 }
+
+tasks.check {
+  dependsOn(buildHealth)
+}
+
+dependencyAnalysis {
+  issues {
+    all {
+      onAny {
+        severity("fail")
+      }
+    }
+  }
+  usage {
+    analysis {
+      checkSuperClasses(true)
+    }
+  }
+}

gradle.properties

@@ -5,3 +5,4 @@ githubRepo = wiremock-faker-extension
 developer.id=Shreya-7
 developer.name=Shreya Agarwal
 developer.email=a.shreya202@gmail.com
+wiremockVersion=4.0.0-beta.20

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Sat Oct 14 16:21:37 IST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

settings.gradle

@@ -1 +1,5 @@
+plugins {
+  id 'com.autonomousapps.build-health' version '3.5.0'
+}
+
 rootProject.name = 'wiremock-faker-extension'