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

Merge remote-tracking branch 'origin/master'

parents 48c01ce8 23f6eec9
No related branches found
No related tags found
No related merge requests found
Pipeline #12949 passed
...@@ -14,13 +14,13 @@ cache: ...@@ -14,13 +14,13 @@ cache:
- .gradle/caches - .gradle/caches
build: build:
image: openjdk:11 image: openjdk:8
stage: build stage: build
script: script:
- ./gradlew assemble - ./gradlew assemble
createDoc: createDoc:
image: openjdk:11 image: openjdk:8
stage: build stage: build
script: script:
- "./gradlew :run" - "./gradlew :run"
...@@ -29,7 +29,7 @@ createDoc: ...@@ -29,7 +29,7 @@ createDoc:
- "pages/docs/config.md" - "pages/docs/config.md"
publish: publish:
image: openjdk:11 image: openjdk:8
stage: publish stage: publish
script: script:
- "./gradlew setDevVersionForCI" - "./gradlew setDevVersionForCI"
......
...@@ -16,6 +16,8 @@ gradlePlugin { ...@@ -16,6 +16,8 @@ gradlePlugin {
} }
} }
java.toolchain.languageVersion = JavaLanguageVersion.of(8)
def versionFile = 'src/main/resources/PreprocessorTesting.properties' def versionFile = 'src/main/resources/PreprocessorTesting.properties'
def oldProps = new Properties() def oldProps = new Properties()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment