From e331808f5c822a829027981fe26fe98747cd9dae Mon Sep 17 00:00:00 2001 From: rschoene <rene.schoene@tu-dresden.de> Date: Sun, 20 Jun 2021 11:16:04 +0200 Subject: [PATCH] switch to java 11, and use JastAdd plugin properly --- .gitlab-ci.yml | 4 ++-- .../src/main/groovy/eraser.java-common-conventions.gradle | 6 ++++++ .../src/main/groovy/eraser.java-jastadd-conventions.gradle | 1 + settings.gradle | 6 ++++++ 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e86bf328..1fd92e48 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -29,7 +29,7 @@ cache: - .gradle/caches build: - image: openjdk:8 + image: openjdk:11 stage: build script: - ./gradlew --console=plain assemble @@ -38,7 +38,7 @@ build: - "eraser-base/src/gen" test: - image: openjdk:8 + image: openjdk:11 tags: - docker stage: test diff --git a/buildSrc/src/main/groovy/eraser.java-common-conventions.gradle b/buildSrc/src/main/groovy/eraser.java-common-conventions.gradle index 69029719..ce14101f 100644 --- a/buildSrc/src/main/groovy/eraser.java-common-conventions.gradle +++ b/buildSrc/src/main/groovy/eraser.java-common-conventions.gradle @@ -9,6 +9,12 @@ repositories { mavenCentral() } +java { + toolchain { + languageVersion = JavaLanguageVersion.of(11) + } +} + dependencies { implementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: "${log4j_version}" implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: "${log4j_version}" diff --git a/buildSrc/src/main/groovy/eraser.java-jastadd-conventions.gradle b/buildSrc/src/main/groovy/eraser.java-jastadd-conventions.gradle index 0bfe8d90..6d9382d3 100644 --- a/buildSrc/src/main/groovy/eraser.java-jastadd-conventions.gradle +++ b/buildSrc/src/main/groovy/eraser.java-jastadd-conventions.gradle @@ -1,6 +1,7 @@ plugins { id 'eraser.java-common-conventions' id 'java-library' + id 'jastadd' } dependencies { diff --git a/settings.gradle b/settings.gradle index 7a1998d5..15d204b2 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,3 +1,9 @@ +pluginManagement { + plugins { + id 'org.jastadd' version '1.13.3' + } +} + rootProject.name = 'eraser' include ':eraser-base' -- GitLab