From 62382dcca946c94b25d3d4d6cc30e2e0ca3c6947 Mon Sep 17 00:00:00 2001 From: Doug Hilpipre Date: Tue, 16 Sep 2025 14:52:47 -0500 Subject: [PATCH] fixed problems with verify --- Kotlin-Coroutines_1.4/build.gradle | 6 +++--- Kotlin-Coroutines_1.7/build.gradle | 4 ++-- .../CancellableContinuationImpl_Instrumentation.java | 9 --------- Kotlin-Coroutines_1.9/build.gradle | 6 +++--- 4 files changed, 8 insertions(+), 17 deletions(-) diff --git a/Kotlin-Coroutines_1.4/build.gradle b/Kotlin-Coroutines_1.4/build.gradle index ebcaf4c..23df169 100644 --- a/Kotlin-Coroutines_1.4/build.gradle +++ b/Kotlin-Coroutines_1.4/build.gradle @@ -20,14 +20,14 @@ jar { } verifyInstrumentation { - passes 'org.jetbrains.kotlinx:kotlinx-coroutines-core:[1.4.0,1.7.0)' - passes 'org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:[1.4.0,1.7.0)' + passesOnly 'org.jetbrains.kotlinx:kotlinx-coroutines-core:[1.4.0,1.7.0)' + passesOnly 'org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:[1.4.0,1.7.0)' excludeRegex '.*SNAPSHOT' excludeRegex '.*alpha' excludeRegex '.*-eap-.*' excludeRegex '.*-native-.*' excludeRegex '.*-M[0-9]' excludeRegex '.*-rc' - excludeRegex '.*-RC' + excludeRegex '.*-RC.*' excludeRegex '.*-Beta' } diff --git a/Kotlin-Coroutines_1.7/build.gradle b/Kotlin-Coroutines_1.7/build.gradle index c020436..d45f1ff 100644 --- a/Kotlin-Coroutines_1.7/build.gradle +++ b/Kotlin-Coroutines_1.7/build.gradle @@ -22,8 +22,8 @@ jar { } verifyInstrumentation { - passes 'org.jetbrains.kotlinx:kotlinx-coroutines-core:[1.7.0,1.9.0)]' - passes 'org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:[1.7.0,1.9.0)' + passesOnly 'org.jetbrains.kotlinx:kotlinx-coroutines-core:[1.7.0,1.9.0)' + passesOnly 'org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:[1.7.0,1.9.0)' excludeRegex '.*SNAPSHOT' excludeRegex '.*alpha' excludeRegex '.*-eap-.*' diff --git a/Kotlin-Coroutines_1.7/src/main/java/kotlinx/coroutines/CancellableContinuationImpl_Instrumentation.java b/Kotlin-Coroutines_1.7/src/main/java/kotlinx/coroutines/CancellableContinuationImpl_Instrumentation.java index 279800a..0476a71 100644 --- a/Kotlin-Coroutines_1.7/src/main/java/kotlinx/coroutines/CancellableContinuationImpl_Instrumentation.java +++ b/Kotlin-Coroutines_1.7/src/main/java/kotlinx/coroutines/CancellableContinuationImpl_Instrumentation.java @@ -28,11 +28,6 @@ public Object tryResume(T t, Object o) { return Weaver.callOriginal(); } - @Trace - public java.lang.Object tryResume(R r, Object obj, Function3 function3) { - return Weaver.callOriginal(); - } - @Trace public void completeResume(Object object) { Weaver.callOriginal(); @@ -58,8 +53,4 @@ public void resumeUndispatchedWithException(CoroutineDispatcher dispatcher, Thro Weaver.callOriginal(); } - @Trace - public void resume(R r, Function3 function3) { - Weaver.callOriginal(); - } } diff --git a/Kotlin-Coroutines_1.9/build.gradle b/Kotlin-Coroutines_1.9/build.gradle index 652b470..705da02 100644 --- a/Kotlin-Coroutines_1.9/build.gradle +++ b/Kotlin-Coroutines_1.9/build.gradle @@ -21,8 +21,8 @@ jar { } verifyInstrumentation { - passes 'org.jetbrains.kotlinx:kotlinx-coroutines-core:[1.9.0,)' - passes 'org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:[1.9.0,)' + passesOnly 'org.jetbrains.kotlinx:kotlinx-coroutines-core:[1.9.0,)' + passesOnly 'org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:[1.9.0,)' excludeRegex '.*SNAPSHOT' excludeRegex '.*alpha' excludeRegex '.*-eap-.*' @@ -30,6 +30,6 @@ verifyInstrumentation { excludeRegex '.*-M[0-9]' excludeRegex '.*-rc' excludeRegex '.*-RC' - excludeRegex '.*-RC[0-9]' + excludeRegex '.*-RC.[0-9]' excludeRegex '.*-Beta' }