diff options
| author | Fabian Mastenbroek <fabianishere@outlook.com> | 2018-07-11 23:38:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-11 23:38:40 +0200 |
| commit | 5fb2d1cb376d94540b6dff9ff769bbd56bcab153 (patch) | |
| tree | a16c87718b83c3ba12e46496a266878848f29bb8 /opendc-model-odc/setup/build.gradle | |
| parent | bc814ab5b5a4becf3dbc5f796a165955c0305d70 (diff) | |
| parent | 8c7e208233c86614ac29157efba24e3a57d7f21c (diff) | |
chore: Update build toolchain (#23)
This pull requests updates the project as follows:
1. **Update Gradle version to 4.8**
This allows us to make use of new features such as native JUnit 5 integration and the build cache.
2. **Update Gradle build configuration according to new changes**
This change allows us to share configuration across modules and easily change the versions for shared dependencies. In addition, we now make use of the `java-library` plugin which allows for various optimizations. See https://docs.gradle.org/current/userguide/java_library_plugin.html
3. **Add support for Jacoco**
We add support code coverage tracking via the latest version of Jacoco which has increasing support for Kotlin.
Closes #22
Diffstat (limited to 'opendc-model-odc/setup/build.gradle')
| -rw-r--r-- | opendc-model-odc/setup/build.gradle | 53 |
1 files changed, 5 insertions, 48 deletions
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" } |
