Repackage byte-buddy along with debug agent (so it shouldn't be a dependency of target process), use shadow plugin for that to avoid clashes with other byte-buddy versions and publish shadow jar instead of regular one for debug module

Author: qwwdfsad

build.gradle

@@ -40,7 +40,7 @@ buildscript {
         classpath "com.moowork.gradle:gradle-node-plugin:$gradle_node_version"
 
         // JMH plugins
-        classpath "com.github.jengelman.gradle.plugins:shadow:2.0.2"
+        classpath "com.github.jengelman.gradle.plugins:shadow:4.0.2"
         classpath "me.champeau.gradle:jmh-gradle-plugin:0.4.7"
         classpath "net.ltgt.gradle:gradle-apt-plugin:0.10"
     }

core/kotlinx-coroutines-debug/build.gradle

@@ -2,6 +2,8 @@
  * Copyright 2016-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
  */
 
+apply plugin: "com.github.johnrengelman.shadow"
+
 dependencies {
     compile "net.bytebuddy:byte-buddy:$byte_buddy_version"
     compile "net.bytebuddy:byte-buddy-agent:$byte_buddy_version"
@@ -13,3 +15,13 @@ jar {
         attributes "Can-Redefine-Classes": "true"
     }
 }
+
+shadowJar {
+    classifier null
+    // Shadow only byte buddy, do not package kotlin stdlib
+    dependencies {
+        include(dependency("net.bytebuddy:byte-buddy:$byte_buddy_version"))
+        include(dependency("net.bytebuddy:byte-buddy-agent:$byte_buddy_version"))
+    }
+    relocate 'net.bytebuddy', 'kotlinx.coroutines.repackaged.net.bytebuddy'
+}

core/kotlinx-coroutines-debug/src/CoroutineState.kt

@@ -97,7 +97,16 @@ public data class CoroutineState internal constructor(
  * Current state of the coroutine.
  */
 public enum class State {
-    CREATED, // Not yet started
+    /**
+     * Created, but not yet started
+     */
+    CREATED,
+    /**
+     * Started and running
+     */
     RUNNING,
+    /**
+     * Suspended
+     */
     SUSPENDED
 }

gradle/publish-bintray.gradle

@@ -8,6 +8,7 @@ apply plugin: 'maven'
 apply plugin: 'maven-publish'
 apply plugin: 'com.jfrog.bintray'
 apply plugin: 'com.jfrog.artifactory'
+apply plugin: "com.github.johnrengelman.shadow"
 
 apply from: project.rootProject.file('gradle/maven-central.gradle')
 
@@ -16,13 +17,13 @@ def coroutines_core = platformLib("kotlinx-coroutines-core", platform)
 
 // ------------- tasks
 
-def isNative = project.name.endsWith("native")
+def isNative() { return project.name.endsWith("native") }
 def bUser = project.hasProperty('bintrayUser') ? project.property('bintrayUser') : System.getenv('BINTRAY_USER')
 def bKey = project.hasProperty('bintrayApiKey') ? project.property('bintrayApiKey') : System.getenv('BINTRAY_API_KEY')
 
 task sourcesJar(type: Jar) {
     classifier = 'sources'
-    if (!isNative) {
+    if (!isNative()) {
         from sourceSets.main.allSource
     }
 
@@ -32,19 +33,15 @@ task sourcesJar(type: Jar) {
     }
 }
 
+
 publishing {
     repositories {
         maven { url = 'https://kotlin.bintray.com/kotlinx' }
     }
 
     publications {
-        maven(MavenPublication) {
-            if (!isNative) {
-                from components.java
-                artifact javadocJar
-                artifact sourcesJar
-            }
-            pom.withXml(configureMavenCentralMetadata)
+        maven(MavenPublication) { publication ->
+            preparePublication(publication)
         }
     }
 }
@@ -58,15 +55,8 @@ artifactory {
             password = bKey
         }
 
-        publications {
-            maven(MavenPublication) {
-                if (!isNative) {
-                    from components.java
-                    artifact javadocJar
-                    artifact sourcesJar
-                }
-                pom.withXml(configureMavenCentralMetadata)
-            }
+        maven(MavenPublication) { publication ->
+            preparePublication(publication)
         }
 
         defaults {
@@ -75,9 +65,21 @@ artifactory {
     }
 }
 
+def preparePublication(MavenPublication publication) {
+    if (!isNative()) {
+        if (project.name == "kotlinx-coroutines-debug") {
+            project.shadow.component(publication)
+        } else {
+            publication.from components.java
+        }
+        publication.artifact javadocJar
+        publication.artifact sourcesJar
+    }
+    publication.pom.withXml(configureMavenCentralMetadata)
+}
+
 task publishDevelopSnapshot() {
     def branch = System.getenv('currentBranch')
-    println "Current branch: $branch"
     if (branch == "develop") {
         dependsOn(":artifactoryPublish")
     }
@@ -112,7 +114,7 @@ bintrayUpload.doFirst {
 }
 
 // TODO :kludge this is required to disable publish of metadata for all but native
-if (!isNative) {
+if (!isNative()) {
     afterEvaluate {
         publishing.publications.each { pub ->
             pub.gradleModuleMetadataFile = null