Skip to content

Fix build script compilation issues #2574

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 9, 2021
Merged

Fix build script compilation issues #2574

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,9 +163,9 @@ configure(subprojects.findAll { !sourceless.contains(it.name) && it.name != core
apply plugin: "kotlin-${platform}-conventions"
dependencies {
// See comment below for rationale, it will be replaced with "project" dependency
compile project(":$coreModule")
api project(":$coreModule")
// the only way IDEA can resolve test classes
testCompile project(":$coreModule").kotlin.targets.jvm.compilations.test.output.allOutputs
testImplementation project(":$coreModule").kotlin.targets.jvm.compilations.test.output.allOutputs
}
}

Expand Down
10 changes: 5 additions & 5 deletions buildSrc/src/main/kotlin/kotlin-jvm-conventions.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ if (rootProject.extra.get("jvm_ir_enabled") as Boolean) {
}

dependencies {
testCompile(kotlin("test"))
testImplementation(kotlin("test"))
// Workaround to make addSuppressed work in tests
testCompile(kotlin("reflect"))
testCompile(kotlin("stdlib-jdk7"))
testCompile(kotlin("test-junit"))
testCompile("junit:junit:${version("junit")}")
testImplementation(kotlin("reflect"))
testImplementation(kotlin("stdlib-jdk7"))
testImplementation(kotlin("test-junit"))
testImplementation("junit:junit:${version("junit")}")
}

tasks.compileKotlin {
Expand Down
8 changes: 4 additions & 4 deletions integration-testing/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,10 @@ task coreAgentTest(type: Test) {
}

dependencies {
testCompile "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
testCompile 'junit:junit:4.12'
npmTestCompile 'org.apache.commons:commons-compress:1.18'
npmTestCompile 'com.google.code.gson:gson:2.8.5'
testImplementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
testImplementation 'junit:junit:4.12'
npmTestImplementation 'org.apache.commons:commons-compress:1.18'
npmTestImplementation 'com.google.code.gson:gson:2.8.5'
debugAgentTestCompile project(':kotlinx-coroutines-core')
debugAgentTestCompile project(':kotlinx-coroutines-debug')
coreAgentTestCompile project(':kotlinx-coroutines-core')
Expand Down
2 changes: 1 addition & 1 deletion kotlinx-coroutines-debug/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ dependencies {
shadowDeps "net.bytebuddy:byte-buddy:$byte_buddy_version"
shadowDeps "net.bytebuddy:byte-buddy-agent:$byte_buddy_version"
compileOnly "io.projectreactor.tools:blockhound:$blockhound_version"
testCompile "io.projectreactor.tools:blockhound:$blockhound_version"
testImplementation "io.projectreactor.tools:blockhound:$blockhound_version"
api "net.java.dev.jna:jna:$jna_version"
api "net.java.dev.jna:jna-platform:$jna_version"
}
Expand Down
8 changes: 4 additions & 4 deletions reactive/kotlinx-coroutines-rx2/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
*/

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

tasks.withType(dokka.getClass()) {
Expand Down
8 changes: 4 additions & 4 deletions reactive/kotlinx-coroutines-rx3/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
targetCompatibility = JavaVersion.VERSION_1_8

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

compileTestKotlin {
Expand Down