Merge pull request #44 from newrelic/fix_1.7_Cancellable

fixed problems with verify

Author: dhilpipre

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'
 }

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-.*'

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 <R extends T> java.lang.Object tryResume(R r, Object obj, Function3<? super Throwable, ? super R, ? super CoroutineContext, Unit> 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 <R extends T> void resume(R r, Function3<? super Throwable, ? super R, ? super CoroutineContext, Unit> function3) {
-        Weaver.callOriginal();
-    }
 }

Kotlin-Coroutines_1.9/build.gradle

@@ -21,15 +21,15 @@ 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-.*'
 	excludeRegex '.*-native-.*'
 	excludeRegex '.*-M[0-9]'
 	excludeRegex '.*-rc'
 	excludeRegex '.*-RC'
-	excludeRegex '.*-RC[0-9]'
+	excludeRegex '.*-RC.[0-9]'
 	excludeRegex '.*-Beta'
 }