Skip to content

Commit

Permalink
switch CI to use java11, rather than java9 (#860)
Browse files Browse the repository at this point in the history
  • Loading branch information
jkwatson authored Feb 14, 2020
1 parent 84f4443 commit 7e34851
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 5 deletions.
10 changes: 5 additions & 5 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,18 +45,18 @@ jobs:
paths:
- ~/.gradle
key: gradle-{{ checksum "build.gradle" }}
java9:
java11:
environment:
# Configure the JVM and Gradle to avoid OOM errors
_JAVA_OPTIONS: "-Xmx3g"
GRADLE_OPTS: "-Dorg.gradle.daemon=false -Dorg.gradle.workers.max=2"
docker:
- image: circleci/openjdk:9-jdk
- image: circleci/openjdk:11.0.6-jdk-buster
steps:
- checkout
- restore_cache:
keys:
- java9-gradle-{{ checksum "build.gradle" }}
- java11-gradle-{{ checksum "build.gradle" }}
# make in missing in openjdk:9-jdk image
- run: sudo apt-get update && sudo apt-get install -y make
- run:
Expand All @@ -68,11 +68,11 @@ jobs:
- save_cache:
paths:
- ~/.gradle
key: java9-gradle-{{ checksum "build.gradle" }}
key: java11-gradle-{{ checksum "build.gradle" }}

workflows:
version: 2
build_and_test:
jobs:
- build
- java9
- java11
6 changes: 6 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,12 @@ subprojects {
}

apply from: "${rootProject.projectDir}/gradle/publish.gradle"

javadoc {
options {
source "1.8"
}
}
}

wrapper {
Expand Down

0 comments on commit 7e34851

Please sign in to comment.