Skip to content
Snippets Groups Projects
Commit 33ccd7a9 authored by René Schöne's avatar René Schöne
Browse files

Merge branch '45-upgrade-to-java-11' into 'dev'

Resolve "Upgrade to Java 11"

See merge request !18
parents 4937e1c8 e331808f
No related branches found
No related tags found
2 merge requests!19dev to master,!18Resolve "Upgrade to Java 11"
Pipeline #10038 passed
...@@ -29,7 +29,7 @@ cache: ...@@ -29,7 +29,7 @@ cache:
- .gradle/caches - .gradle/caches
build: build:
image: openjdk:8 image: openjdk:11
stage: build stage: build
script: script:
- ./gradlew --console=plain assemble - ./gradlew --console=plain assemble
...@@ -38,7 +38,7 @@ build: ...@@ -38,7 +38,7 @@ build:
- "eraser-base/src/gen" - "eraser-base/src/gen"
test: test:
image: openjdk:8 image: openjdk:11
tags: tags:
- docker - docker
stage: test stage: test
......
...@@ -9,6 +9,12 @@ repositories { ...@@ -9,6 +9,12 @@ repositories {
mavenCentral() mavenCentral()
} }
java {
toolchain {
languageVersion = JavaLanguageVersion.of(11)
}
}
dependencies { dependencies {
implementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: "${log4j_version}" implementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: "${log4j_version}"
implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: "${log4j_version}" implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: "${log4j_version}"
......
plugins { plugins {
id 'eraser.java-common-conventions' id 'eraser.java-common-conventions'
id 'java-library' id 'java-library'
id 'jastadd'
} }
dependencies { dependencies {
......
pluginManagement {
plugins {
id 'org.jastadd' version '1.13.3'
}
}
rootProject.name = 'eraser' rootProject.name = 'eraser'
include ':eraser-base' include ':eraser-base'
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment