diff options
| author | Fabian Mastenbroek <mail.fabianm@gmail.com> | 2018-07-11 16:42:26 +0200 |
|---|---|---|
| committer | Fabian Mastenbroek <mail.fabianm@gmail.com> | 2018-07-11 17:07:05 +0200 |
| commit | c5f88cc28f9d27f867247a713605368c558795a0 (patch) | |
| tree | fa374ca7fb87dfc8b1b82bbcd2d493f0abfe1958 /opendc-core | |
| parent | f682ea3c1a4791f8515f4924acbc1213d17dce29 (diff) | |
chore: Update Gradle build configuration
This change updates the Gradle build configuration in order to make use
of the native JUnit 5 integration and the newest Kotlin and Dokka
plugins.
Diffstat (limited to 'opendc-core')
| -rw-r--r-- | opendc-core/build.gradle | 58 |
1 files changed, 7 insertions, 51 deletions
diff --git a/opendc-core/build.gradle b/opendc-core/build.gradle index 210b8820..e6c7076b 100644 --- a/opendc-core/build.gradle +++ b/opendc-core/build.gradle @@ -23,63 +23,19 @@ */ /* Build configuration */ -buildscript { - ext.kotlin_version = '1.2.21' - ext.dokka_version = '0.9.15' - - repositories { - mavenCentral() - jcenter() - } - - dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath "org.jetbrains.dokka:dokka-gradle-plugin:$dokka_version" - classpath 'org.junit.platform:junit-platform-gradle-plugin:1.0.3' - } -} - -apply plugin: 'java' -apply plugin: 'kotlin' -apply plugin: 'org.jetbrains.dokka' -apply plugin: 'org.junit.platform.gradle.plugin' - -compileKotlin { - kotlinOptions { - jvmTarget = "1.8" - } -} - -compileTestKotlin { - kotlinOptions { - jvmTarget = "1.8" - } -} - -kotlin { - experimental { - coroutines 'enable' - } -} - -dokka { - outputFormat = 'html' - outputDirectory = "$buildDir/javadoc" -} +apply from: '../gradle/kotlin.gradle' +apply plugin: 'java-library' /* Project configuration */ -group 'com.atlarge.opendc' -version '1.1' - repositories { jcenter() } dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - compile "org.jetbrains.kotlinx:kotlinx-coroutines-core:0.22.2" + implementation "org.jetbrains.kotlin:kotlin-stdlib" + api "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinx_coroutines_version" - testCompile "org.junit.jupiter:junit-jupiter-api:5.0.0-RC3" - testRuntime "org.junit.jupiter:junit-jupiter-engine:5.0.0-RC3" - testCompile "org.junit.platform:junit-platform-launcher:1.0.0-RC3" + testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_jupiter_version" + testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junit_jupiter_version" + testImplementation "org.junit.platform:junit-platform-launcher:$junit_platform_version" } |
