Skip to content

Commit

Permalink
refactor(ci): gradle 7.0.0 on jdk16
Browse files Browse the repository at this point in the history
- update gradle.properties for spotless jdk16 work around
- diffplug/spotless#834
  • Loading branch information
flyingfishflash committed Apr 29, 2021
1 parent 838c02d commit aeec972
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ steps:
-c "select count(*) from pg_catalog.pg_tables;"
- name: build
image: gradle:6.8-jdk15
image: gradle:7.0.0-jdk16-hotspot
depends_on:
- "cache pull"
- "verify postgres"
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -165,5 +165,4 @@ dist/
.idea/*
backend/src/main/resources/basic_ledger.gnucash
backend/src/main/resources/db/initialization/
gradle.properties
version
6 changes: 3 additions & 3 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ build-jar:
- backend/build

unit-tests:
image: gradle:6.8-jdk15
image: gradle:7.0.0-jdk16-hotspot
stage: tests
needs: ["build-jar"]
script:
Expand All @@ -107,7 +107,7 @@ unit-tests:
- backend/build

h2-integration-tests:
image: gradle:6.8-jdk15
image: gradle:7.0.0-jdk16-hotspot
stage: tests
needs: ["build-jar"]
script:
Expand All @@ -124,7 +124,7 @@ h2-integration-tests:
- backend/build

postgres-integration-tests:
image: gradle:6.8-jdk15
image: gradle:7.0.0-jdk16-hotspot
stage: tests
needs: ["build-jar"]
services:
Expand Down
2 changes: 1 addition & 1 deletion backend/Dockerfile.multistage
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM gradle:6.8-jdk15 AS build
FROM gradle:7.0.0-jdk16-hotspot AS build
COPY --chown=gradle:gradle . /home/gradle/src
WORKDIR /home/gradle/src
#RUN gradle --no-daemon bootJar
Expand Down
7 changes: 7 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# work around for JDK 16
# https://github.com/diffplug/spotless/issues/834
org.gradle.jvmargs=--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \
--add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \
--add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED \
--add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \
--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED

0 comments on commit aeec972

Please sign in to comment.