Skip to content

Commit 8061055

Browse files
committed
Replace deprecated '*compile' configurations.
They were deprecated long time ago and were removed in Gradle 7.
1 parent a020a3e commit 8061055

File tree

6 files changed

+18
-18
lines changed

6 files changed

+18
-18
lines changed

build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -165,9 +165,9 @@ configure(subprojects.findAll { !sourceless.contains(it.name) && it.name != core
165165
apply plugin: "kotlin-${platform}-conventions"
166166
dependencies {
167167
// See comment below for rationale, it will be replaced with "project" dependency
168-
compile project(":$coreModule")
168+
api project(":$coreModule")
169169
// the only way IDEA can resolve test classes
170-
testCompile project(":$coreModule").kotlin.targets.jvm.compilations.test.output.allOutputs
170+
testImplementation project(":$coreModule").kotlin.targets.jvm.compilations.test.output.allOutputs
171171
}
172172
}
173173

buildSrc/src/main/kotlin/kotlin-jvm-conventions.gradle.kts

+5-5
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ if (rootProject.extra.get("jvm_ir_enabled") as Boolean) {
2222
}
2323

2424
dependencies {
25-
testCompile(kotlin("test"))
25+
testImplementation(kotlin("test"))
2626
// Workaround to make addSuppressed work in tests
27-
testCompile(kotlin("reflect"))
28-
testCompile(kotlin("stdlib-jdk7"))
29-
testCompile(kotlin("test-junit"))
30-
testCompile("junit:junit:${version("junit")}")
27+
testImplementation(kotlin("reflect"))
28+
testImplementation(kotlin("stdlib-jdk7"))
29+
testImplementation(kotlin("test-junit"))
30+
testImplementation("junit:junit:${version("junit")}")
3131
}
3232

3333
tasks.compileKotlin {

integration-testing/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,8 @@ task coreAgentTest(type: Test) {
9292
}
9393

9494
dependencies {
95-
testCompile "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
96-
testCompile 'junit:junit:4.12'
95+
testImplementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
96+
testImplementation 'junit:junit:4.12'
9797
npmTestCompile 'org.apache.commons:commons-compress:1.18'
9898
npmTestCompile 'com.google.code.gson:gson:2.8.5'
9999
debugAgentTestCompile project(':kotlinx-coroutines-core')

kotlinx-coroutines-debug/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ dependencies {
2323
shadowDeps "net.bytebuddy:byte-buddy:$byte_buddy_version"
2424
shadowDeps "net.bytebuddy:byte-buddy-agent:$byte_buddy_version"
2525
compileOnly "io.projectreactor.tools:blockhound:$blockhound_version"
26-
testCompile "io.projectreactor.tools:blockhound:$blockhound_version"
26+
testImplementation "io.projectreactor.tools:blockhound:$blockhound_version"
2727
api "net.java.dev.jna:jna:$jna_version"
2828
api "net.java.dev.jna:jna-platform:$jna_version"
2929
}

reactive/kotlinx-coroutines-rx2/build.gradle

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
*/
44

55
dependencies {
6-
compile project(':kotlinx-coroutines-reactive')
7-
testCompile project(':kotlinx-coroutines-reactive').sourceSets.test.output
8-
testCompile "org.reactivestreams:reactive-streams-tck:$reactive_streams_version"
9-
compile "io.reactivex.rxjava2:rxjava:$rxjava2_version"
6+
api project(':kotlinx-coroutines-reactive')
7+
testImplementation project(':kotlinx-coroutines-reactive').sourceSets.test.output
8+
testImplementation "org.reactivestreams:reactive-streams-tck:$reactive_streams_version"
9+
api "io.reactivex.rxjava2:rxjava:$rxjava2_version"
1010
}
1111

1212
tasks.withType(dokka.getClass()) {

reactive/kotlinx-coroutines-rx3/build.gradle

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
targetCompatibility = JavaVersion.VERSION_1_8
55

66
dependencies {
7-
compile project(':kotlinx-coroutines-reactive')
8-
testCompile project(':kotlinx-coroutines-reactive').sourceSets.test.output
9-
testCompile "org.reactivestreams:reactive-streams-tck:$reactive_streams_version"
10-
compile "io.reactivex.rxjava3:rxjava:$rxjava3_version"
7+
api project(':kotlinx-coroutines-reactive')
8+
testImplementation project(':kotlinx-coroutines-reactive').sourceSets.test.output
9+
testImplementation "org.reactivestreams:reactive-streams-tck:$reactive_streams_version"
10+
api "io.reactivex.rxjava3:rxjava:$rxjava3_version"
1111
}
1212

1313
compileTestKotlin {

0 commit comments

Comments
 (0)