diff options
| author | Fabian Mastenbroek <mail.fabianm@gmail.com> | 2020-10-29 17:02:18 +0100 |
|---|---|---|
| committer | Fabian Mastenbroek <mail.fabianm@gmail.com> | 2020-10-29 17:56:45 +0100 |
| commit | bb62b80585b2453529f45b981617e8321b8ded2c (patch) | |
| tree | d278fa19ef842c361a67a02eb97597048e7949c2 | |
| parent | 1c3ac36f999c4e2d4573aebd4343c097fff2b637 (diff) | |
Add support for Java 15 build
| -rw-r--r-- | simulator/.dockerignore | 2 | ||||
| -rw-r--r-- | simulator/Dockerfile | 20 | ||||
| -rw-r--r-- | simulator/buildSrc/src/main/kotlin/kotlin-library-convention.gradle.kts | 4 |
3 files changed, 8 insertions, 18 deletions
diff --git a/simulator/.dockerignore b/simulator/.dockerignore index 816d338c..8cbb9e5e 100644 --- a/simulator/.dockerignore +++ b/simulator/.dockerignore @@ -6,5 +6,5 @@ .idea_modules/ .gradle -**/build/ +**/build diff --git a/simulator/Dockerfile b/simulator/Dockerfile index 880af95d..34280a17 100644 --- a/simulator/Dockerfile +++ b/simulator/Dockerfile @@ -1,31 +1,17 @@ -FROM openjdk:14-slim AS staging +FROM openjdk:15-slim MAINTAINER OpenDC Maintainers <opendc@atlarge-research.com> -# Build staging artifacts for dependency caching -COPY ./ /app -WORKDIR /app -RUN mkdir /staging \ - && cp -r buildSrc/ /staging \ - && cp gradle.properties /staging 2>/dev/null | true \ - && find -name "*.gradle.kts" | xargs cp --parents -t /staging - -FROM openjdk:14-slim AS builder - # Obtain (cache) Gradle wrapper COPY gradlew /app/ COPY gradle /app/gradle WORKDIR /app RUN ./gradlew --version -# Install (cache) project dependencies only -COPY --from=staging /staging/ /app/ -RUN ./gradlew clean build --no-daemon > /dev/null 2>&1 || true - # Build project COPY ./ /app/ RUN ./gradlew --no-daemon :opendc-runner-web:installDist -FROM openjdk:14-slim -COPY --from=builder /app/opendc-runner-web/build/install /app +FROM openjdk:15-slim +COPY --from=0 /app/opendc-runner-web/build/install /app WORKDIR /app CMD opendc-runner-web/bin/opendc-runner-web diff --git a/simulator/buildSrc/src/main/kotlin/kotlin-library-convention.gradle.kts b/simulator/buildSrc/src/main/kotlin/kotlin-library-convention.gradle.kts index 452db573..bbecf346 100644 --- a/simulator/buildSrc/src/main/kotlin/kotlin-library-convention.gradle.kts +++ b/simulator/buildSrc/src/main/kotlin/kotlin-library-convention.gradle.kts @@ -44,6 +44,10 @@ kotlin { explicitApi() } +jacoco { + toolVersion = "0.8.6" +} + tasks.withType<KotlinCompile>().configureEach { kotlinOptions.jvmTarget = "1.8" kotlinOptions.freeCompilerArgs += "-Xopt-in=kotlin.RequiresOptIn" |