Skip to content

Commit d3e0b1e

Browse files
Set up proper visibility (api/implementation) between dependencies of subprojects
1 parent 62ae54b commit d3e0b1e

File tree

5 files changed

+12
-11
lines changed

5 files changed

+12
-11
lines changed

build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,9 +135,9 @@ sourceSets {
135135
val atomicfuVersion: String by project
136136

137137
compileOnly(project(":bootstrap"))
138-
api(project(":jvm-agent"))
139-
api(project(":common"))
140-
api(project(":trace"))
138+
api(project(":common")) // TODO: contains some classes from public lincheck API, refactor so that it does not expose essentially internal classes
139+
implementation(project(":jvm-agent"))
140+
implementation(project(":trace"))
141141

142142
api("org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion")
143143
api("org.jetbrains.kotlin:kotlin-stdlib-common:$kotlinVersion")

jvm-agent/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ sourceSets {
2222
val byteBuddyVersion: String by project
2323

2424
compileOnly(project(":bootstrap"))
25-
api(project(":common"))
25+
implementation(project(":common"))
2626

2727
api("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}")
2828
api("org.jetbrains.kotlin:kotlin-stdlib-common:${kotlinVersion}")

src/jvm/test/org/jetbrains/kotlinx/lincheck_test/representation/InlineExtFuncRepresentationTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
package org.jetbrains.kotlinx.lincheck_test.representation
1212

13-
import org.jetbrains.kotlinx.lincheck.traceagent.isInTraceDebuggerMode
13+
import org.jetbrains.kotlinx.lincheck.util.isInTraceDebuggerMode
1414
import org.jetbrains.kotlinx.lincheck.util.isJdk8
1515
import org.junit.Assume.assumeFalse
1616
import org.junit.Before
@@ -24,7 +24,7 @@ class InlineExtFuncRepresentationTest: BaseTraceRepresentationTest("inline_ext_f
2424
// cannot run this test, as it has different output on JDK-8,
2525
// but due to https://github.com/JetBrains/lincheck/issues/500
2626
// we cannot set trace-debugger & JDK-8 specific expected output file
27-
assumeFalse(isInTraceDebuggerMode)
27+
assumeFalse(isInTraceDebuggerMode || isJdk8)
2828
}
2929

3030
@Suppress("NOTHING_TO_INLINE")

trace-debugger/build.gradle.kts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,9 @@ sourceSets {
2525
val byteBuddyVersion: String by project
2626

2727
compileOnly(project(":bootstrap"))
28-
api(project(":"))
29-
api(project(":jvm-agent"))
28+
implementation(project(":"))
29+
implementation(project(":common"))
30+
implementation(project(":jvm-agent"))
3031

3132
api("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}")
3233
api("org.jetbrains.kotlin:kotlin-stdlib-common:${kotlinVersion}")

trace-recorder/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ sourceSets {
2525
val byteBuddyVersion: String by project
2626

2727
compileOnly(project(":bootstrap"))
28-
api(project(":common"))
29-
api(project(":jvm-agent"))
30-
api(project(":trace"))
28+
implementation(project(":common"))
29+
implementation(project(":jvm-agent"))
30+
implementation(project(":trace"))
3131

3232
api("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}")
3333
api("org.jetbrains.kotlin:kotlin-stdlib-common:${kotlinVersion}")

0 commit comments

Comments
 (0)