chore: Upgrade Clojure to latest versions

pact-foundation · Nov 22, 2024 · 603024c · 603024c
1 parent b11433e
commit 603024c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 13 deletions.
diff --git a/consumer/junit/build.gradle b/consumer/junit/build.gradle
@@ -12,7 +12,7 @@ buildscript {
 plugins {
   id 'au.com.dius.pact.kotlin-library-conventions'
 
-  id "com.netflix.nebula.clojure" version "13.0.1"
+  id "com.netflix.nebula.clojure" version "14.2.1"
 }
 
 description = 'Pact-JVM - Provides a DSL and a base test class for use with Junit to build consumer tests'
@@ -47,7 +47,7 @@ dependencies {
   testRuntimeOnly 'net.bytebuddy:byte-buddy'
   testRuntimeOnly 'org.objenesis:objenesis:3.1'
 
-  testImplementation 'org.clojure:clojure:1.10.1', 'http-kit:http-kit:2.3.0'
+  testImplementation 'org.clojure:clojurescript:1.11.132', 'http-kit:http-kit:2.3.0'
   testImplementation 'javax.xml.bind:jaxb-api:2.3.1'
   testImplementation 'javax.activation:activation:1.1'
   testImplementation 'org.glassfish.jaxb:jaxb-runtime:2.3.0'
@@ -58,6 +58,3 @@ clojureTest {
   junitOutputDir = file("$buildDir/test-results/clojure/" + org.apache.commons.lang3.RandomStringUtils.randomAlphanumeric(6))
   clojureTest.dependsOn 'testClasses'
 }
-
-clojure.aotCompile = true
-//clojureRepl.port = '7888'
diff --git a/provider/lein/build.gradle b/provider/lein/build.gradle
@@ -12,7 +12,7 @@ buildscript {
 
 plugins {
   id 'au.com.dius.pact.kotlin-library-conventions'
-  id "com.netflix.nebula.clojure" version "13.0.1"
+  id "com.netflix.nebula.clojure" version "14.2.1"
 }
 
 description = 'Pact-JVM - Leiningen Provider test support library'
@@ -22,9 +22,9 @@ import org.apache.commons.lang3.RandomStringUtils
 
 dependencies {
   api project(":provider")
-  implementation 'org.clojure:clojure:1.10.1'
-  implementation 'org.clojure:core.match:1.0.0'
-  implementation 'org.clojure:core.rrb-vector:0.1.1'
+  implementation 'org.clojure:clojurescript:1.11.132'
+  implementation 'org.clojure:core.match:1.1.0'
+  implementation 'org.clojure:core.rrb-vector:0.2.0'
   implementation 'leiningen-core:leiningen-core:2.9.10'
   implementation 'org.apache.maven:maven-aether-provider:3.0.5'
   implementation 'org.sonatype.aether:aether-connector-file:1.13.1'
@@ -38,17 +38,16 @@ dependencies {
 }
 
 clojure.aotCompile = true
-clojureTest.junit = true
-clojureRepl.port = '7888'
 
 compileClojure {
   dependsOn compileGroovy
-  classpath = classpath.plus(files(compileGroovy.destinationDir))
+  classpath.from(files(compileGroovy.destinationDirectory))
   destinationDir = file("${project.buildDir}/classes/java/main")
 }
 
 clojureTest {
-  classpath = classpath.plus(files(compileGroovy.destinationDir))
+  junit = true
+  classpath.from(files(compileGroovy.destinationDirectory))
   junitOutputDir = file("$buildDir/test-results/clojure/" + RandomStringUtils.randomAlphanumeric(6))
 }