From ffe51929869ad7138e50e2b25eba78135d91a200 Mon Sep 17 00:00:00 2001
From: Christoph Sturm <me@christophsturm.com>
Date: Wed, 30 Jun 2021 12:37:45 +0200
Subject: [PATCH 1/2] bump byte buddy and disable a test that fails on jdk 16

---
 .github/workflows/gradle.yml                              | 2 +-
 build.gradle                                              | 2 +-
 mockk/jvm/src/test/kotlin/io/mockk/jvm/HashMapMockTest.kt | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 59f7c4896..f53dfac1d 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -10,7 +10,7 @@ jobs:
   tests:
     strategy:
       matrix:
-        java-version: [1.8, 10, 11, 12, 13, 14, 15]
+        java-version: [1.8, 10, 11, 12, 13, 14, 15, 16]
         kotlin-version: [1.3.72, 1.4.30, 1.5.0]
         kotlin-ir-enabled: [true, false]
         exclude:
diff --git a/build.gradle b/build.gradle
index c7f1761c2..c0371e536 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 buildscript {
     ext.kotlin_gradle_version = findProperty('kotlin.version')?.toString() ?: '1.3.72'
     ext.android_gradle_version = '4.1.0'
-    ext.byte_buddy_version = '1.10.14'
+    ext.byte_buddy_version = '1.11.5'
     ext.coroutines_version = '1.3.3'
     ext.dexmaker_version = '2.28.1'
     ext.objenesis_version = '3.1'
diff --git a/mockk/jvm/src/test/kotlin/io/mockk/jvm/HashMapMockTest.kt b/mockk/jvm/src/test/kotlin/io/mockk/jvm/HashMapMockTest.kt
index 96b5ccede..bcbd69a6b 100644
--- a/mockk/jvm/src/test/kotlin/io/mockk/jvm/HashMapMockTest.kt
+++ b/mockk/jvm/src/test/kotlin/io/mockk/jvm/HashMapMockTest.kt
@@ -10,6 +10,7 @@ import org.junit.jupiter.api.Test
 
 class HashMapMockTest {
     @Test
+    @Disabled("fails on jdk 16")
     fun concurrentHashMap_shouldBeSpied_Successfully() {
         val map = spyk(ConcurrentHashMap<String, String>())
         assertDoesNotThrow { map.put("key", "value")  }
@@ -25,4 +26,4 @@ class HashMapMockTest {
 
         verify(exactly = 1) { map.get("key") }
     }
-}
\ No newline at end of file
+}

From 421a4206ad5f168f433d5a6b1763a83c141b0335 Mon Sep 17 00:00:00 2001
From: Christoph Sturm <me@christophsturm.com>
Date: Wed, 30 Jun 2021 13:42:02 +0200
Subject: [PATCH 2/2] don't run tests on jdk 16 for now because it fails

---
 .github/workflows/gradle.yml                              | 2 +-
 mockk/jvm/src/test/kotlin/io/mockk/jvm/HashMapMockTest.kt | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index f53dfac1d..59f7c4896 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -10,7 +10,7 @@ jobs:
   tests:
     strategy:
       matrix:
-        java-version: [1.8, 10, 11, 12, 13, 14, 15, 16]
+        java-version: [1.8, 10, 11, 12, 13, 14, 15]
         kotlin-version: [1.3.72, 1.4.30, 1.5.0]
         kotlin-ir-enabled: [true, false]
         exclude:
diff --git a/mockk/jvm/src/test/kotlin/io/mockk/jvm/HashMapMockTest.kt b/mockk/jvm/src/test/kotlin/io/mockk/jvm/HashMapMockTest.kt
index bcbd69a6b..9ff8c0444 100644
--- a/mockk/jvm/src/test/kotlin/io/mockk/jvm/HashMapMockTest.kt
+++ b/mockk/jvm/src/test/kotlin/io/mockk/jvm/HashMapMockTest.kt
@@ -10,7 +10,6 @@ import org.junit.jupiter.api.Test
 
 class HashMapMockTest {
     @Test
-    @Disabled("fails on jdk 16")
     fun concurrentHashMap_shouldBeSpied_Successfully() {
         val map = spyk(ConcurrentHashMap<String, String>())
         assertDoesNotThrow { map.put("key", "value")  }