Java 11 JvmAutoHinter fix and gradle 4.7

mockk · Sep 27, 2018 · faf600a · faf600a
1 parent e00c045
commit faf600a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
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-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-all.zip
diff --git a/mockk/src/main/kotlin/io/mockk/impl/recording/JvmAutoHinter.kt b/mockk/src/main/kotlin/io/mockk/impl/recording/JvmAutoHinter.kt
@@ -44,11 +44,15 @@ class JvmAutoHinter : AutoHinter() {
     }
 
     private fun extractClassName(ex: ClassCastException): String? {
-        return exceptionMessage.find(ex.message!!)?.groups?.get(2)?.value
+        return exceptionMessage.find(ex.message!!)?.groups?.get(3)?.value
     }
 
     companion object {
-        val exceptionMessage = Regex("cannot be cast to (.+/)?(.+)$")
+        // JDK 8: net.bytebuddy.renamed.java.lang.Object$ByteBuddy$As29nsJf$ByteBuddy$877l7O7D cannot be cast to io.mockk.impl.recording.states.CallRecordingState
+        // JDK 9:
+        // JDK 10:
+        // JDK 11: class net.bytebuddy.renamed.java.lang.Object$ByteBuddy$rpycQEYo$ByteBuddy$bHEk1ADY cannot be cast to class java.lang.String (net.bytebuddy.renamed.java.lang.Object$ByteBuddy$rpycQEYo$ByteBuddy$bHEk1ADY is in unnamed module of loader net.bytebuddy.dynamic.loading.ByteArrayClassLoader @19569ebd; java.lang.String is in module java.base of loader 'bootstrap')
+        val exceptionMessage = Regex("cannot be cast to (class )?(.+/)?(.+)( \\((.+)\\))?$")
 
         val log = Logger<JvmAutoHinter>()
     }