Used later version of byte-buddy which supports java13

ostelco · Oct 12, 2019 · 0c51785 · 0c51785
1 parent e03bd38
commit 0c51785
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 2 deletions.
diff --git a/buildSrc/src/main/kotlin/org/ostelco/prime/gradle/Version.kt b/buildSrc/src/main/kotlin/org/ostelco/prime/gradle/Version.kt
@@ -7,6 +7,7 @@ object Version {
   const val arrowTypeClasses = "0.9.0"
 
   const val beam = "2.15.0"
+  const val byteBuddy = "1.10.1"
   const val csv = "1.7"
   const val cxf = "3.3.3"
   const val dockerComposeJunitRule = "1.3.0"

diff --git a/customer-endpoint/build.gradle.kts b/customer-endpoint/build.gradle.kts
@@ -17,6 +17,12 @@ dependencies {
   testRuntimeOnly("io.jsonwebtoken:jjwt-jackson:${Version.jjwt}")
 
   testImplementation("com.nhaarman.mockitokotlin2:mockito-kotlin:${Version.mockitoKotlin}")
+  testImplementation("net.bytebuddy:byte-buddy:${Version.byteBuddy}") {
+    because("mockito-kotlin:2.2.0 has byte-buddy:1.9.0 which does not work for java13")
+  }
+  testImplementation("net.bytebuddy:byte-buddy-agent:${Version.byteBuddy}") {
+    because("mockito-kotlin:2.2.0 has byte-buddy:1.9.0 which does not work for java13")
+  }
 }
 
 apply(from = "../gradle/jacoco.gradle")
diff --git a/graphql/build.gradle.kts b/graphql/build.gradle.kts
@@ -11,7 +11,14 @@ dependencies {
   implementation("com.graphql-java:graphql-java:13.0")
 
   testImplementation("io.dropwizard:dropwizard-testing:${Version.dropwizard}")
+
   testImplementation("org.mockito:mockito-core:${Version.mockito}")
+  testImplementation("net.bytebuddy:byte-buddy:${Version.byteBuddy}") {
+    because("mockito-kotlin:2.2.0 has byte-buddy:1.9.0 which does not work for java13")
+  }
+  testImplementation("net.bytebuddy:byte-buddy-agent:${Version.byteBuddy}") {
+    because("mockito-kotlin:2.2.0 has byte-buddy:1.9.0 which does not work for java13")
+  }
   testImplementation("io.jsonwebtoken:jjwt-api:${Version.jjwt}")
   testRuntimeOnly("io.jsonwebtoken:jjwt-impl:${Version.jjwt}")
   testRuntimeOnly("io.jsonwebtoken:jjwt-jackson:${Version.jjwt}")

diff --git a/sim-administration/simmanager/build.gradle.kts b/sim-administration/simmanager/build.gradle.kts
@@ -72,6 +72,12 @@ dependencies {
 
   testImplementation("io.dropwizard:dropwizard-testing:${Version.dropwizard}")
   testImplementation("com.nhaarman.mockitokotlin2:mockito-kotlin:${Version.mockitoKotlin}")
+  testImplementation("net.bytebuddy:byte-buddy:${Version.byteBuddy}") {
+      because("mockito-kotlin:2.2.0 has byte-buddy:1.9.0 which does not work for java13")
+  }
+  testImplementation("net.bytebuddy:byte-buddy-agent:${Version.byteBuddy}") {
+      because("mockito-kotlin:2.2.0 has byte-buddy:1.9.0 which does not work for java13")
+  }
   testImplementation("org.testcontainers:postgresql:${Version.testcontainers}")
 
   testImplementation(project(":sim-administration:sm-dp-plus-emulator"))

diff --git a/...ration/simmanager/src/test/kotlin/org/ostelco/simcards/inventory/SimInventoryUnitTests.kt b/...ration/simmanager/src/test/kotlin/org/ostelco/simcards/inventory/SimInventoryUnitTests.kt
@@ -10,7 +10,6 @@ import org.apache.http.impl.client.CloseableHttpClient
 import org.junit.AfterClass
 import org.junit.Before
 import org.junit.ClassRule
-import org.junit.Ignore
 import org.junit.Test
 import org.mockito.Mockito
 import org.mockito.Mockito.mock
@@ -27,7 +26,6 @@ import java.util.*
 import javax.ws.rs.client.Entity
 import javax.ws.rs.core.MediaType
 
-@Ignore("Fails to Mock config classes which are Kotlin Data classes")
 class SimInventoryUnitTests {
 
     companion object {