Skip to content

Commit 2176e72

Browse files
committed
Update BlockHound version to be compatible with JDK 17
* Also, exclude integration from docs, it shouldn't be there Fixes #3701
1 parent 5db3dab commit 2176e72

File tree

4 files changed

+13
-6
lines changed

4 files changed

+13
-6
lines changed

gradle.properties

+1-4
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ javafx_version=17.0.2
2424
javafx_plugin_version=0.0.8
2525
binary_compatibility_validator_version=0.12.0
2626
kover_version=0.7.0-Beta
27-
blockhound_version=1.0.2.RELEASE
27+
blockhound_version=1.0.8.RELEASE
2828
jna_version=5.9.0
2929

3030
# Android versions
@@ -49,9 +49,6 @@ jsdom_global_version=3.0.2
4949
kotlin.incremental.multiplatform=true
5050
kotlin.native.ignoreDisabledTargets=true
5151

52-
# Site generation
53-
jekyll_version=4.0
54-
5552
# JS IR backend sometimes crashes with out-of-memory
5653
# TODO: Remove once KT-37187 is fixed
5754
org.gradle.jvmargs=-Xmx3g

kotlinx-coroutines-debug/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ of coroutines hierarchy referenced by a [Job] or [CoroutineScope] instances usin
1616
This module also provides an automatic [BlockHound](https://github.com/reactor/BlockHound) integration
1717
that detects when a blocking operation was called in a coroutine context that prohibits it. In order to use it,
1818
please follow the BlockHound [quick start guide](
19-
https://github.com/reactor/BlockHound/blob/1.0.2.RELEASE/docs/quick_start.md).
19+
https://github.com/reactor/BlockHound/blob/1.0.8.RELEASE/docs/quick_start.md).
2020

2121
### Using in your project
2222

kotlinx-coroutines-debug/build.gradle

+7
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,13 @@ java {
3333
disableAutoTargetJvm()
3434
}
3535

36+
// This is required for BlockHound tests to work, see https://github.com/Kotlin/kotlinx.coroutines/issues/3701
37+
tasks.withType(Test).configureEach {
38+
if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_13)) {
39+
jvmArgs += ["-XX:+AllowRedefinitionToAddDeleteMethods"]
40+
}
41+
}
42+
3643
jar {
3744
setEnabled(false)
3845
}

kotlinx-coroutines-debug/src/CoroutinesBlockHoundIntegration.kt

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2016-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
2+
* Copyright 2016-2023 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
33
*/
44

55
@file:Suppress("INVISIBLE_REFERENCE", "INVISIBLE_MEMBER")
@@ -10,6 +10,9 @@ import kotlinx.coroutines.scheduling.*
1010
import reactor.blockhound.*
1111
import reactor.blockhound.integration.*
1212

13+
/**
14+
* @suppress
15+
*/
1316
public class CoroutinesBlockHoundIntegration : BlockHoundIntegration {
1417

1518
override fun applyTo(builder: BlockHound.Builder): Unit = with(builder) {

0 commit comments

Comments
 (0)