summaryrefslogtreecommitdiff
path: root/opendc-stdlib
diff options
context:
space:
mode:
authorFabian Mastenbroek <mail.fabianm@gmail.com>2018-07-11 16:42:26 +0200
committerFabian Mastenbroek <mail.fabianm@gmail.com>2018-07-11 17:07:05 +0200
commitc5f88cc28f9d27f867247a713605368c558795a0 (patch)
treefa374ca7fb87dfc8b1b82bbcd2d493f0abfe1958 /opendc-stdlib
parentf682ea3c1a4791f8515f4924acbc1213d17dce29 (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-stdlib')
-rw-r--r--opendc-stdlib/build.gradle65
1 files changed, 10 insertions, 55 deletions
diff --git a/opendc-stdlib/build.gradle b/opendc-stdlib/build.gradle
index e02da931..e1ed74ec 100644
--- a/opendc-stdlib/build.gradle
+++ b/opendc-stdlib/build.gradle
@@ -23,66 +23,21 @@
*/
/* 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 plugin: 'java-library'
+apply from: '../gradle/kotlin.gradle'
/* 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"
- compile project(':opendc-core')
- compile "io.github.microutils:kotlin-logging:1.4.6"
-
- 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"
- testCompile "org.slf4j:slf4j-simple:1.7.25"
+ implementation "org.jetbrains.kotlin:kotlin-stdlib"
+ api project(':opendc-core')
+ implementation "io.github.microutils:kotlin-logging:1.4.6"
+
+ 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"
+ testRuntimeOnly "org.slf4j:slf4j-simple:1.7.25"
}