File tree 3 files changed +10
-4
lines changed
3 files changed +10
-4
lines changed Original file line number Diff line number Diff line change @@ -9,7 +9,7 @@ kotlin_version=1.3.71
9
9
10
10
# Dependencies
11
11
junit_version =4.12
12
- atomicfu_version =0.14.2
12
+ atomicfu_version =0.14.3
13
13
knit_version =0.1.3
14
14
html_version =0.6.8
15
15
lincheck_version =2.5.3
@@ -53,4 +53,5 @@ jekyll_version=4.0
53
53
# TODO: Remove once KT-37187 is fixed
54
54
org.gradle.jvmargs =-Xmx2g
55
55
56
- kotlin.mpp.enableGranularSourceSetsMetadata =true
56
+ kotlin.mpp.enableGranularSourceSetsMetadata =true
57
+ kotlin.mpp.enableCompatibilityMetadataVariant =true
Original file line number Diff line number Diff line change 2
2
* Copyright 2016-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license.
3
3
*/
4
4
5
+ import org.gradle.api.attributes.Usage
6
+
5
7
apply from : rootProject. file(" gradle/compile-jvm.gradle" )
6
8
7
9
repositories {
@@ -49,9 +51,12 @@ task mavenTest(type: Test) {
49
51
classpath = sourceSet. runtimeClasspath
50
52
// we can't depend on the subprojects because we need to test the classfiles that are published in the end.
51
53
// also, we can't put this in the `dependencies` block because the resolution would happen before publication.
52
- classpath + = project. configurations. detachedConfiguration(
54
+ def configuration = project. configurations. detachedConfiguration(
53
55
project. dependencies. create(" org.jetbrains.kotlinx:kotlinx-coroutines-core:$version " ),
54
56
project. dependencies. create(" org.jetbrains.kotlinx:kotlinx-coroutines-android:$version " ))
57
+ // We need to specify an appropriate attribute for this configuration so that metadata resolves properly
58
+ configuration. attributes. attribute(Usage . USAGE_ATTRIBUTE , objects. named(Usage . class, Usage . JAVA_RUNTIME ))
59
+ classpath + = configuration
55
60
}
56
61
57
62
task debugAgentTest (type : Test ) {
Original file line number Diff line number Diff line change @@ -60,7 +60,7 @@ kotlin {
60
60
dependencies {
61
61
// todo: we should not need it
62
62
// todo: it must be compileOnly or JVM is spoiled !!!
63
- implementation " org.jetbrains.kotlinx:atomicfu-common :$atomicfu_version "
63
+ implementation " org.jetbrains.kotlinx:atomicfu-native :$atomicfu_version "
64
64
}
65
65
}
66
66
}
You can’t perform that action at this time.
0 commit comments