File tree Expand file tree Collapse file tree 11 files changed +23
-15
lines changed Expand file tree Collapse file tree 11 files changed +23
-15
lines changed Original file line number Diff line number Diff line change @@ -22,7 +22,7 @@ dependencies {
22
22
compileOnly(project(" :compiler:cli-common" ))
23
23
24
24
// This dependency is necessary to keep the right dependency record inside of POM file:
25
- mavenCompileScope(projectRuntimeJar (" :kotlin-compiler" ))
25
+ mavenCompileScope(project (" :kotlin-compiler" ))
26
26
27
27
compile(project(" :kotlin-native:kotlin-native-utils" ))
28
28
Original file line number Diff line number Diff line change @@ -9,9 +9,11 @@ dependencies {
9
9
compile(kotlinStdlib())
10
10
compileOnly(project(" :kotlin-reflect-api" ))
11
11
compileOnly(project(" :compiler:util" ))
12
- runtime(project(" :kotlin-reflect" ))
13
12
14
- testRuntimeOnly(projectRuntimeJar(" :kotlin-compiler" ))
13
+ testRuntimeOnly(project(" :kotlin-compiler" ))
14
+ testRuntimeOnly(project(" :kotlin-reflect" ))
15
+ testRuntimeOnly(project(" :kotlin-scripting-compiler" ))
16
+
15
17
testCompile(commonDep(" junit" ))
16
18
}
17
19
Original file line number Diff line number Diff line change @@ -7,7 +7,8 @@ dependencies {
7
7
compile(project(" :examples:scripting-jvm-simple-script" ))
8
8
compile(project(" :kotlin-scripting-jvm-host" ))
9
9
compile(project(" :kotlin-script-util" ))
10
- testRuntimeOnly(projectRuntimeJar(" :kotlin-compiler" ))
10
+ testRuntimeOnly(project(" :kotlin-compiler" ))
11
+ testRuntimeOnly(project(" :kotlin-scripting-compiler" ))
11
12
testRuntimeOnly(project(" :kotlin-reflect" ))
12
13
testCompile(commonDep(" junit" ))
13
14
}
Original file line number Diff line number Diff line change @@ -12,7 +12,11 @@ dependencies {
12
12
testCompileOnly(project(" :kotlin-scripting-jvm-host" ))
13
13
testCompileOnly(project(" :compiler:cli" ))
14
14
testCompileOnly(project(" :core:util.runtime" ))
15
- testRuntime(project(" :kotlin-scripting-jsr223" ))
15
+
16
+ testRuntimeOnly(project(" :kotlin-scripting-jsr223" ))
17
+ testRuntimeOnly(project(" :kotlin-compiler" ))
18
+ testRuntimeOnly(project(" :kotlin-reflect" ))
19
+
16
20
embeddableTestRuntime(commonDep(" junit" ))
17
21
embeddableTestRuntime(project(" :kotlin-scripting-jsr223-embeddable" ))
18
22
embeddableTestRuntime(testSourceSet.output)
Original file line number Diff line number Diff line change @@ -15,8 +15,6 @@ dependencies {
15
15
compileOnly(project(" :compiler:cli-common" ))
16
16
compileOnly(project(" :kotlin-reflect-api" ))
17
17
compileOnly(intellijCoreDep())
18
- runtime(project(" :kotlin-compiler" ))
19
- runtime(project(" :kotlin-reflect" ))
20
18
}
21
19
22
20
sourceSets {
Original file line number Diff line number Diff line change @@ -19,6 +19,12 @@ dependencies {
19
19
testCompile(project(" :kotlin-scripting-jvm-host" ))
20
20
testCompile(projectTests(" :compiler:tests-common" ))
21
21
testCompile(project(" :daemon-common" )) // TODO: fix import (workaround for jps build)
22
+
23
+ testRuntimeOnly(project(" :kotlin-compiler" ))
24
+ testRuntimeOnly(project(" :kotlin-scripting-compiler" ))
25
+ testRuntimeOnly(project(" :kotlin-reflect" ))
26
+ testRuntimeOnly(commonDep(" org.jetbrains.intellij.deps" , " trove4j" ))
27
+
22
28
embeddableTestRuntime(project(" :kotlin-scripting-jvm-host-embeddable" ))
23
29
embeddableTestRuntime(project(" :kotlin-test:kotlin-test-jvm" ))
24
30
embeddableTestRuntime(project(" :kotlin-test:kotlin-test-junit" ))
Original file line number Diff line number Diff line change @@ -14,10 +14,6 @@ dependencies {
14
14
compileOnly(project(" :compiler:cli" ))
15
15
compileOnly(project(" :kotlin-reflect-api" ))
16
16
compileOnly(intellijCoreDep())
17
- runtime(project(" :kotlin-compiler" ))
18
- runtime(project(" :kotlin-scripting-compiler" ))
19
- runtime(project(" :kotlin-reflect" ))
20
- runtime(commonDep(" org.jetbrains.intellij.deps" , " trove4j" ))
21
17
}
22
18
23
19
sourceSets {
Original file line number Diff line number Diff line change @@ -23,7 +23,7 @@ dependencies {
23
23
testRuntime(project(" :kotlin-reflect" ))
24
24
testCompile(commonDep(" junit:junit" ))
25
25
testCompile(project(" :kotlin-scripting-compiler" ))
26
- testRuntimeOnly(projectRuntimeJar (" :kotlin-compiler" ))
26
+ testRuntimeOnly(project (" :kotlin-compiler" ))
27
27
testRuntime(" org.jetbrains.kotlin:jcabi-aether:1.0-dev-3" )
28
28
testRuntime(" org.sonatype.aether:aether-api:1.13.1" )
29
29
testRuntime(" org.apache.maven:maven-core:3.0.3" )
Original file line number Diff line number Diff line change @@ -16,7 +16,8 @@ dependencies {
16
16
testRuntimeOnly(intellijDep()) {
17
17
includeJars(" guava" , rootProject = rootProject)
18
18
}
19
- testRuntimeOnly(projectRuntimeJar(" :kotlin-compiler" ))
19
+
20
+ testRuntimeOnly(project(" :kotlin-compiler" ))
20
21
21
22
testCompile(project(" :compiler:backend" ))
22
23
testCompile(project(" :compiler:cli" ))
Original file line number Diff line number Diff line change @@ -18,7 +18,7 @@ dependencies {
18
18
testRuntimeOnly(intellijDep()) {
19
19
includeJars(" guava" , rootProject = rootProject)
20
20
}
21
- testRuntimeOnly(projectRuntimeJar (" :kotlin-compiler" ))
21
+ testRuntimeOnly(project (" :kotlin-compiler" ))
22
22
testCompile(project(" :compiler:backend" ))
23
23
testCompile(project(" :compiler:cli" ))
24
24
testCompile(projectTests(" :compiler:tests-common" ))
Original file line number Diff line number Diff line change @@ -80,7 +80,7 @@ dependencies {
80
80
81
81
testRuntime(project(" :kotlin-reflect" ))
82
82
testRuntime(project(" :kotlin-script-runtime" ))
83
- testRuntimeOnly(projectRuntimeJar (" :kotlin-compiler" ))
83
+ testRuntimeOnly(project (" :kotlin-compiler" ))
84
84
testRuntime(project(" :plugins:android-extensions-ide" )) { isTransitive = false }
85
85
testRuntime(project(" :plugins:android-extensions-compiler" )) { isTransitive = false }
86
86
testRuntime(project(" :plugins:annotation-based-compiler-plugins-ide-support" )) { isTransitive = false }
You can’t perform that action at this time.
0 commit comments