Matrix successfully completed for JDK11 (not able to run it for AIT) #…

…150
mockk · Sep 27, 2018 · 2ad77fe · 2ad77fe
1 parent faf600a
commit 2ad77fe
Show file tree

Hide file tree

Showing 8 changed files with 170 additions and 169 deletions.
diff --git a/MATRIX.md b/MATRIX.md
diff --git a/matrix/android-ait-before-p.gradle b/matrix/android-ait-before-p.gradle
@@ -5,7 +5,7 @@ buildscript {
     ext.coroutines_version = '0.22'
     ext.junit_jupiter_version = '5.0.3'
     ext.junit_vintage_version = '4.12.0'
-    ext.mockk_version = '1.8.1-SNAPSHOT'
+    ext.mockk_version = '1.8.8-SNAPSHOT'
 
     repositories {
         mavenCentral()

diff --git a/matrix/android-ait.gradle b/matrix/android-ait.gradle
@@ -5,7 +5,7 @@ buildscript {
     ext.coroutines_version = '0.22'
     ext.junit_jupiter_version = '5.0.3'
     ext.junit_vintage_version = '4.12.0'
-    ext.mockk_version = '1.8.1-SNAPSHOT'
+    ext.mockk_version = '1.8.8-SNAPSHOT'
 
     repositories {
         mavenCentral()

diff --git a/matrix/android.gradle b/matrix/android.gradle
@@ -5,7 +5,7 @@ buildscript {
     ext.coroutines_version = '0.22'
     ext.junit_jupiter_version = '5.0.3'
     ext.junit_vintage_version = '4.12.0'
-    ext.mockk_version = '1.8.1-SNAPSHOT'
+    ext.mockk_version = '1.8.8-SNAPSHOT'
 
     repositories {
         mavenCentral()

diff --git a/matrix/jvm.gradle b/matrix/jvm.gradle
@@ -5,7 +5,7 @@ buildscript {
     ext.coroutines_version = '0.22'
     ext.junit_jupiter_version = '5.0.3'
     ext.junit_vintage_version = '4.12.0'
-    ext.mockk_version = '1.8.1-SNAPSHOT'
+    ext.mockk_version = '1.8.8-SNAPSHOT'
 
     repositories {
         mavenCentral()

diff --git a/matrix/matrix-results.gradle b/matrix/matrix-results.gradle
@@ -1,7 +1,7 @@
 
 
 task('summarize') {
-    def envs = ['jdk6', 'jdk8', 'jdk9', 'jdk10', 'android', 'android-ait']
+    def envs = ['jdk6', 'jdk8', 'jdk9', 'jdk10', 'jdk11', 'android']
 
     def resultsPath = file("results")
 
@@ -35,7 +35,7 @@ task('summarize') {
     <thead>
     <tr>
         <th>Feature</th>
-        <th colspan="4">JDK</th>
+        <th colspan="5">JDK</th>
         <th colspan="2">Android</th>
     </tr>
     <tr>
@@ -44,6 +44,7 @@ task('summarize') {
         <td>8</td>
         <td>9</td>
         <td>10</td>
+        <td>11</td>
         <td>Unit</td>
         <td>AIT ≥P</td>
     </tr>

diff --git a/matrix/matrix.sh b/matrix/matrix.sh
@@ -36,6 +36,7 @@ jvm_test jdk7 /usr/java/jdk1.7.0_80
 jvm_test jdk8 /usr/java/jdk1.8.0_161
 jvm_test jdk9 /usr/java/jdk-9.0.1
 jvm_test jdk10 /usr/java/jdk-10.0.1
+jvm_test jdk11 /usr/java/jdk-11
 android_unit
 # done manually
 #android_ait $HOME/Android/Sdk Nexus_S_API_P

diff --git a/mockk/src/main/kotlin/io/mockk/impl/recording/JvmAutoHinter.kt b/mockk/src/main/kotlin/io/mockk/impl/recording/JvmAutoHinter.kt
@@ -52,7 +52,7 @@ class JvmAutoHinter : AutoHinter() {
         // 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 exceptionMessage = Regex("cannot be cast to (class )?(.+/)?(.+?)( \\((.+)\\))?$")
 
         val log = Logger<JvmAutoHinter>()
     }