Skip to content
This repository was archived by the owner on Nov 11, 2021. It is now read-only.

Commit d8ddcc0

Browse files
committed
Disable atomicfu JVM bytecode transformation
1 parent 99b78e4 commit d8ddcc0

File tree

15 files changed

+43
-1
lines changed

15 files changed

+43
-1
lines changed

build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
*/
44
import org.jetbrains.kotlin.konan.target.HostManager
55

6+
apply from: rootProject.file("gradle/atomicfu.gradle")
67
apply from: rootProject.file("gradle/experimental.gradle")
78

89
def rootModule = "kotlinx.coroutines"
@@ -114,7 +115,6 @@ allprojects {
114115
}
115116

116117
allprojects {
117-
apply plugin: 'kotlinx-atomicfu' // it also adds all the necessary dependencies
118118
def projectName = it.name
119119
repositories {
120120
/*

gradle/atomicfu.gradle

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
apply plugin: 'kotlinx-atomicfu' // it also adds all the necessary dependencies
2+
3+
atomicfu {
4+
dependenciesVersion = '0.14.1' // set to null to turn-off auto dependencies
5+
transformJvm = false // set to false to turn off JVM transformation
6+
transformJs = true // set to false to turn off JS transformation
7+
variant = "FU" // JVM transformation variant: FU,VH, or BOTH
8+
verbose = true // set to true to be more verbose
9+
}

gradle/publish-bintray.gradle

+12
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,18 @@ publishing {
4747
password = project.hasProperty('bintrayApiKey') ? project.property('bintrayApiKey') : System.getenv('BINTRAY_API_KEY')
4848
}
4949
}
50+
51+
if (project.hasProperty('mavenUrl')) {
52+
maven {
53+
name = 'Joom'
54+
url = project.property('mavenUrl')
55+
56+
credentials {
57+
username = project.property('mavenUser')
58+
password = project.property('mavenPassword')
59+
}
60+
}
61+
}
5062
}
5163

5264
if (!isMultiplatform && !isBom) {

integration/kotlinx-coroutines-jdk8/build.gradle

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

5+
apply from: rootProject.file("gradle/atomicfu.gradle")

integration/kotlinx-coroutines-play-services/build.gradle

+2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ import java.util.zip.ZipFile
77
* Copyright 2016-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
88
*/
99

10+
apply from: rootProject.file("gradle/atomicfu.gradle")
11+
1012
ext.tasks_version = '16.0.1'
1113

1214
def attr = Attribute.of("artifactType", String.class)

integration/kotlinx-coroutines-slf4j/build.gradle

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
apply from: rootProject.file("gradle/atomicfu.gradle")
2+
13
dependencies {
24
compile 'org.slf4j:slf4j-api:1.7.25'
35
testCompile 'io.github.microutils:kotlin-logging:1.5.4'

kotlinx-coroutines-core/build.gradle

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
* Copyright 2016-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
33
*/
44

5+
apply from: rootProject.file("gradle/atomicfu.gradle")
6+
57
apply plugin: 'kotlin-multiplatform'
68
apply from: rootProject.file("gradle/targets.gradle")
79
apply from: rootProject.file("gradle/compile-jvm-multiplatform.gradle")

kotlinx-coroutines-debug/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
* Copyright 2016-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
33
*/
44

5+
apply from: rootProject.file("gradle/atomicfu.gradle")
56
apply plugin: "com.github.johnrengelman.shadow"
67

78
configurations {

kotlinx-coroutines-test/build.gradle

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
apply from: rootProject.file("gradle/atomicfu.gradle")
2+
13
dependencies {
24
implementation project(":kotlinx-coroutines-debug")
35
}

reactive/kotlinx-coroutines-reactive/build.gradle

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
* Copyright 2016-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
33
*/
44

5+
apply from: rootProject.file("gradle/atomicfu.gradle")
6+
57
dependencies {
68
compile "org.reactivestreams:reactive-streams:$reactive_streams_version"
79
testCompile "org.reactivestreams:reactive-streams-tck:$reactive_streams_version"

reactive/kotlinx-coroutines-reactor/build.gradle

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
* Copyright 2016-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
33
*/
44

5+
apply from: rootProject.file("gradle/atomicfu.gradle")
6+
57
dependencies {
68
compile "io.projectreactor:reactor-core:$reactor_vesion"
79
compile project(':kotlinx-coroutines-reactive')

reactive/kotlinx-coroutines-rx2/build.gradle

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
* Copyright 2016-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
33
*/
44

5+
apply from: rootProject.file("gradle/atomicfu.gradle")
6+
57
dependencies {
68
compile project(':kotlinx-coroutines-reactive')
79
testCompile project(':kotlinx-coroutines-reactive').sourceSets.test.output

ui/kotlinx-coroutines-android/build.gradle

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
* Copyright 2016-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
33
*/
44

5+
apply from: rootProject.file("gradle/atomicfu.gradle")
6+
57
repositories {
68
google()
79
// TODO Remove once R8 is updated to a 1.6.x version.

ui/kotlinx-coroutines-javafx/build.gradle

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

5+
apply from: rootProject.file("gradle/atomicfu.gradle")

ui/kotlinx-coroutines-swing/build.gradle

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
* Copyright 2016-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
33
*/
44

5+
apply from: rootProject.file("gradle/atomicfu.gradle")
6+
57
dependencies {
68
testCompile project(':kotlinx-coroutines-jdk8')
79
}

0 commit comments

Comments
 (0)