Skip to content

Commit 83c5bf6

Browse files
committed
Bump kotlin version to 1.1.3-2
1 parent 7c9102c commit 83c5bf6

File tree

3 files changed

+32
-42
lines changed

3 files changed

+32
-42
lines changed
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
dependencies {
2+
api("org.opentest4j:opentest4j:${ota4jVersion}")
3+
api(project(":junit-platform-commons"))
4+
compileOnly("org.jetbrains.kotlin:kotlin-stdlib")
5+
}
6+
7+
jar {
8+
manifest {
9+
attributes(
10+
'Automatic-Module-Name': 'org.junit.jupiter.api'
11+
)
12+
}
13+
}
14+
15+
configurations {
16+
apiElements {
17+
/*
18+
* Needed to configure kotlin to work correctly with the "java-library" plugin.
19+
* See:
20+
* https://docs.gradle.org/current/userguide/java_library_plugin.html#sec:java_library_known_issues
21+
* https://youtrack.jetbrains.com/issue/KT-18497
22+
*/
23+
outgoing
24+
.variants
25+
.getByName("classes")
26+
.artifact(
27+
"file" : compileKotlin.destinationDir,
28+
"type" : "java-classes-directory",
29+
"builtBy" : compileKotlin
30+
)
31+
}
32+
}

junit-jupiter-api/junit-jupiter-api.gradle.kts

Lines changed: 0 additions & 39 deletions
This file was deleted.

settings.gradle

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,5 @@ include 'platform-tests'
2121
// based on the project name
2222
rootProject.children.each { project ->
2323
project.buildFileName = "${project.name}.gradle"
24-
if (!project.buildFile.isFile()) {
25-
project.buildFileName = "${project.name}.gradle.kts"
26-
}
2724
assert project.buildFile.isFile()
2825
}

0 commit comments

Comments
 (0)