Update build

Author: blootsvoets

Dockerfile

@@ -31,6 +31,7 @@ MAINTAINER Joris Borgdorff <[email protected]>, Yatharth Ranjan<yatharth.ranjan@k
 
 LABEL description="RADAR-base output data restructuring"
 
+ENV RADAR_OUTPUT_RESTRUCTURE_OPTS=""
 ENV JAVA_OPTS="-Djava.security.egd=file:/dev/./urandom -XX:+UseG1GC -XX:MaxHeapFreeRatio=10 -XX:MinHeapFreeRatio=10"
 
 COPY --from=builder /code/build/third-party/* /usr/lib/

Dockerfile.hdfs

@@ -1,20 +1,16 @@
 plugins {
-    id 'java'
-    id 'java-library'
+    id 'org.jetbrains.kotlin.jvm'
     id 'application'
     id 'com.jfrog.bintray' version '1.8.5'
     id 'maven-publish'
-    id 'org.jetbrains.kotlin.jvm'
+    id "org.jetbrains.dokka"
     id 'com.avast.gradle.docker-compose' version "0.13.4"
 }
 
 group 'org.radarbase'
-version '1.1.6-SNAPSHOT'
+version '1.2.0-SNAPSHOT'
 mainClassName = 'org.radarbase.output.Application'
 
-sourceCompatibility = '1.8'
-targetCompatibility = '1.8'
-
 ext {
     moduleDescription = 'RADAR-base output restructuring'
     website = 'https://radar-base.org'
@@ -80,21 +76,15 @@ dependencies {
     testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: junitVersion
     testImplementation group: 'org.hamcrest', name: 'hamcrest-all', version: '1.3'
     testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0"
-}
 
-compileKotlin {
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
+    dokkaHtmlPlugin("org.jetbrains.dokka:kotlin-as-java-plugin:$kotlinVersion")
 }
-compileTestKotlin {
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-}
-compileIntegrationTestKotlin {
+
+tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "11"
+        apiVersion = "1.4"
+        languageVersion = "1.4"
     }
 }
 
@@ -186,18 +176,17 @@ task sourcesJar(type: Jar, dependsOn: classes) {
     manifest.from sharedManifest
 }
 
-task javadocJar(type: Jar, dependsOn: javadoc) {
-    archiveClassifier.set('javadoc')
-    from javadoc.destinationDir
-    manifest.from sharedManifest
+task dokkaJar(type: Jar, dependsOn: dokkaJavadoc) {
+    archiveClassifier.set("javadoc")
+    from("$buildDir/dokka/javadoc/")
 }
 
 publishing {
     publications {
         mavenJar(MavenPublication) {
             from components.java
             artifact sourcesJar
-            artifact javadocJar
+            artifact dokkaJar
             pom {
                 url = githubUrl as String
                 description = moduleDescription

build.gradle

@@ -2,7 +2,10 @@ pluginManagement {
     resolutionStrategy {
         eachPlugin {
             if ( requested.id.id == 'org.jetbrains.kotlin.jvm' ) {
-                useModule( "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" )
+                useModule("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
+            }
+            if (requested.id.id == "org.jetbrains.dokka") {
+                useModule("org.jetbrains.dokka:dokka-gradle-plugin:$kotlinVersion")
             }
         }
     }

settings.gradle

@@ -0,0 +1,27 @@
+package org.radarbase.output.util
+
+import org.hamcrest.MatcherAssert.assertThat
+import org.hamcrest.Matchers.`is`
+import org.hamcrest.Matchers.equalTo
+import org.junit.jupiter.api.Assertions.*
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.io.TempDir
+import java.nio.file.Files
+import java.nio.file.Path
+
+internal class TemporaryDirectoryTest {
+    @Test
+    fun createAndDelete(@TempDir root: Path) {
+        TemporaryDirectory(root, "worker-").use {
+            assertThat(Files.list(root).count(), `is`(1))
+            Files.createTempFile(it.path, "test", "txt")
+            Files.createTempFile(it.path, "test", "txt")
+
+            assertThat(Files.list(it.path).count(), `is`(2))
+            assertThat(Files.list(root).count(), `is`(1))
+        }
+
+        assertThat(Files.list(root).count(), `is`(0))
+    }
+}