Skip to content

Commit

Permalink
Revert changes to using Gradle Kotlin DSL
Browse files Browse the repository at this point in the history
  • Loading branch information
JLLeitschuh committed Aug 30, 2017
1 parent 7c9102c commit 43c956e
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 42 deletions.
32 changes: 32 additions & 0 deletions junit-jupiter-api/junit-jupiter-api.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
dependencies {
api("org.opentest4j:opentest4j:${ota4jVersion}")
api(project(":junit-platform-commons"))
compileOnly("org.jetbrains.kotlin:kotlin-stdlib")
}

jar {
manifest {
attributes(
'Automatic-Module-Name': 'org.junit.jupiter.api'
)
}
}

configurations {
apiElements {
/*
* Needed to configure kotlin to work correctly with the "java-library" plugin.
* See:
* https://docs.gradle.org/current/userguide/java_library_plugin.html#sec:java_library_known_issues
* https://youtrack.jetbrains.com/issue/KT-18497
*/
outgoing
.variants
.getByName("classes")
.artifact(
"file" : compileKotlin.destinationDir,
"type" : "java-classes-directory",
"builtBy" : compileKotlin
)
}
}
39 changes: 0 additions & 39 deletions junit-jupiter-api/junit-jupiter-api.gradle.kts

This file was deleted.

3 changes: 0 additions & 3 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,5 @@ include 'platform-tests'
// based on the project name
rootProject.children.each { project ->
project.buildFileName = "${project.name}.gradle"
if (!project.buildFile.isFile()) {
project.buildFileName = "${project.name}.gradle.kts"
}
assert project.buildFile.isFile()
}

0 comments on commit 43c956e

Please sign in to comment.