Skip to content

Commit c3a586c

Browse files
authored
Use lombok 1.18.32 to support Java 17 (#181)
The MapRoulette-backend is starting to move to java 17 and it'll be nice to have the MR-java-client support compiling, tho maybe not publishing, using java 17.
1 parent 78060c8 commit c3a586c

File tree

4 files changed

+8
-7
lines changed

4 files changed

+8
-7
lines changed

.github/workflows/publish-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ jobs:
88
runs-on: ubuntu-latest
99
steps:
1010
- uses: actions/checkout@v4
11-
- uses: actions/setup-java@v3
11+
- uses: actions/setup-java@v4
1212
with:
1313
java-version: '11'
1414
distribution: 'temurin'
1515
cache: 'gradle'
16-
- uses: gradle/wrapper-validation-action@v1
16+
- uses: gradle/wrapper-validation-action@v3
1717
- name: Publish maproulette-java-client
1818
env:
1919
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}

.github/workflows/publish-snapshot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
if: ${{ github.event.workflow_run.conclusion == 'success' }}
1111
steps:
1212
- uses: actions/checkout@v4
13-
- uses: actions/setup-java@v3
13+
- uses: actions/setup-java@v4
1414
with:
1515
java-version: '11'
1616
distribution: 'temurin'

.github/workflows/pull-request.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
strategy:
1919
matrix:
2020
# Jdk 17 requires gradle 7.3+ https://docs.gradle.org/current/userguide/compatibility.html
21-
java: [11]
21+
java: [11, 17]
2222

2323
steps:
2424
- uses: actions/checkout@v4
@@ -31,7 +31,7 @@ jobs:
3131
path: 'maproulette-backend'
3232
fetch-depth: 0
3333
- name: Set up JDK ${{ matrix.java }}
34-
uses: actions/setup-java@v3
34+
uses: actions/setup-java@v4
3535
with:
3636
distribution: 'temurin'
3737
java-version: ${{ matrix.java }}
@@ -52,6 +52,7 @@ jobs:
5252
pushd maproulette-backend
5353
touch ./conf/dev.conf
5454
echo 'include "application.conf"' >> ./conf/dev.conf
55+
echo 'play.http.secret.key = "GHACTION_9GcV9VDuy5JjYXBFldfD1Q+4/O8z2AAo3e9ID/tE9iM="' >> ./conf/dev.conf
5556
echo 'db.default {' >> ./conf/dev.conf
5657
echo ' url="jdbc:postgresql://localhost:5432/mr_test"' >> ./conf/dev.conf
5758
echo ' username="osm"' >> ./conf/dev.conf
@@ -88,4 +89,4 @@ jobs:
8889
runs-on: ubuntu-latest
8990
steps:
9091
- uses: actions/checkout@v4
91-
- uses: gradle/wrapper-validation-action@v1
92+
- uses: gradle/wrapper-validation-action@v3

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ ext {
2323
depJacksonVersion = "2.15.3"
2424
depJacocoVersion = "0.8.3"
2525
depJunitVersion = "5.10.2"
26-
depLombokVersion = "1.18.16"
26+
depLombokVersion = "1.18.32"
2727
depMockitoVersion = "5.11.0"
2828
depSlf4jVersion = "2.0.13"
2929
}

0 commit comments

Comments
 (0)