Skip to content

Commit 852c274

Browse files
authored
Merge pull request #185 from steve-donovan/master
build support for jdk 8 & 11
2 parents 9c396b7 + 9303f63 commit 852c274

File tree

3 files changed

+16
-12
lines changed

3 files changed

+16
-12
lines changed

.github/workflows/build_gradle.yml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,18 @@ jobs:
1313

1414
runs-on: ubuntu-latest
1515

16+
strategy:
17+
matrix:
18+
java: [ '8', '11' ]
19+
env:
20+
JDK_VERSION: ${{ matrix.java }}
21+
name: Java ${{ matrix.java }} build
1622
steps:
17-
- uses: actions/checkout@v2
18-
- name: Set up JDK 8
19-
uses: actions/setup-java@v2
23+
- uses: actions/checkout@v3
24+
- name: Set up Java
25+
uses: actions/setup-java@v3
2026
with:
21-
java-version: '8'
27+
java-version: ${{ matrix.java }}
2228
distribution: 'adopt'
2329
cache: gradle
2430
- name: Grant execute permission for gradlew

build.gradle

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
id 'java'
3-
id 'io.franzbecker.gradle-lombok' version '4.0.0'
3+
id 'io.franzbecker.gradle-lombok' version '5.0.0'
44
id 'checkstyle'
55
id 'com.vanniktech.maven.publish' version '0.18.0'
66
id 'jacoco'
@@ -26,14 +26,15 @@ repositories {
2626

2727
dependencies {
2828
implementation 'com.google.code.gson:gson:2.9.0'
29-
implementation "org.projectlombok:lombok:1.16.16"
30-
testImplementation "org.mockito:mockito-core:2.12.0"
31-
testRuntimeOnly "org.slf4j:slf4j-api:1.7.10"
29+
compileOnly "org.projectlombok:lombok:1.18.24"
30+
annotationProcessor 'org.projectlombok:lombok:1.18.24'
31+
testCompileOnly 'org.projectlombok:lombok:1.18.24'
32+
testAnnotationProcessor 'org.projectlombok:lombok:1.18.24'
33+
testImplementation 'org.mockito:mockito-core:4.6.1'
3234
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.1'
3335
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.1'
3436
testImplementation 'org.assertj:assertj-core:3.22.0'
3537
testImplementation 'com.github.tomakehurst:wiremock:2.27.2'
36-
testImplementation 'io.rest-assured:rest-assured:5.0.0'
3738
testImplementation 'org.slf4j:slf4j-api:1.7.36'
3839
testImplementation 'org.slf4j:slf4j-simple:1.7.36'
3940
}

src/main/java/com/amadeus/Request.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
package com.amadeus;
22

3-
import com.amadeus.Constants;
4-
5-
import com.google.gson.JsonElement;
63
import java.io.IOException;
74
import java.net.HttpURLConnection;
85
import java.net.URL;

0 commit comments

Comments
 (0)