From c5f88cc28f9d27f867247a713605368c558795a0 Mon Sep 17 00:00:00 2001
From: Fabian Mastenbroek <mail.fabianm@gmail.com>
Date: Wed, 11 Jul 2018 16:42:26 +0200
Subject: 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.
---
 opendc-model-odc/setup/build.gradle | 53 ++++---------------------------------
 1 file changed, 5 insertions(+), 48 deletions(-)

(limited to 'opendc-model-odc/setup/build.gradle')

diff --git a/opendc-model-odc/setup/build.gradle b/opendc-model-odc/setup/build.gradle
index 1cca2a6e..c3976986 100644
--- a/opendc-model-odc/setup/build.gradle
+++ b/opendc-model-odc/setup/build.gradle
@@ -23,56 +23,12 @@
  */
 
 /* 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.kotlin:kotlin-noarg:$kotlin_version"
-        classpath "org.jetbrains.dokka:dokka-gradle-plugin:$dokka_version"
-    }
-}
-
-apply plugin: 'java'
+apply from: '../../gradle/kotlin.gradle'
 apply plugin: 'application'
-apply plugin: 'kotlin'
-apply plugin: 'org.jetbrains.dokka'
 
 mainClassName = "com.atlarge.opendc.model.odc.platform.JpaPlatformRunnerKt"
 
-compileKotlin {
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-}
-
-compileTestKotlin {
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-}
-
-kotlin {
-    experimental {
-        coroutines 'enable'
-    }
-}
-
-dokka {
-    outputFormat = 'html'
-    outputDirectory = "$buildDir/javadoc"
-}
-
 /* Project configuration */
-group 'com.atlarge.opendc'
-version '1.1'
-
 repositories {
     jcenter()
 }
@@ -80,8 +36,9 @@ repositories {
 dependencies {
     compile project(':opendc-model-odc:jpa')
     compile project(':opendc-kernel-omega')
+    compile "io.github.microutils:kotlin-logging:1.4.6"
 
-    runtime 'org.slf4j:slf4j-simple:1.7.25'
-    runtime 'org.hibernate:hibernate-core:5.2.5.Final'
-    runtime 'mysql:mysql-connector-java:5.1.13'
+    runtimeOnly "org.slf4j:slf4j-simple:1.7.25"
+    runtimeOnly "org.hibernate:hibernate-core:5.2.5.Final"
+    runtimeOnly "mysql:mysql-connector-java:5.1.13"
 }
-- 
cgit v1.2.3