From b03ca5a1cfe9916fb575ff605f8e11179f5600e5 Mon Sep 17 00:00:00 2001 From: Asad Ali Date: Tue, 28 Mar 2023 11:15:09 +0500 Subject: [PATCH 1/4] ci(test-lts-java-versions): test suite for Java 11, 17 & 19 --- .github/workflows/build-and-test.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index e957a9d1..52e79eae 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -8,14 +8,17 @@ on: jobs: build-and-test: + name: Test using Java ${{ matrix.java }} runs-on: ubuntu-latest - + strategy: + matrix: + java: [ '8', '11', '17', '19' ] steps: - uses: actions/checkout@v3 - - name: Set up JDK 8 + - name: Set up JDK ${{ matrix.java }} uses: actions/setup-java@v3 with: - java-version: '8' + java-version: ${{ matrix.java }} distribution: 'temurin' cache: maven - name: Build with Maven From c9cf07a7eb977933b675eaa151aa140865e70204 Mon Sep 17 00:00:00 2001 From: Asad Ali Date: Tue, 28 Mar 2023 12:55:12 +0500 Subject: [PATCH 2/4] fixed incorrect doc blocks in TestHelper --- src/main/java/io/apimatic/core/utilities/TestHelper.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/io/apimatic/core/utilities/TestHelper.java b/src/main/java/io/apimatic/core/utilities/TestHelper.java index d4bf5cc3..5a347f48 100644 --- a/src/main/java/io/apimatic/core/utilities/TestHelper.java +++ b/src/main/java/io/apimatic/core/utilities/TestHelper.java @@ -227,7 +227,7 @@ private static boolean isProperSubsetOf( * @param allowExtra extra value is allowed?. * @param isOrdered object value is in order?. * @throws IOException Signal that I/O errors occur. - * @return true if left left JSON object is a proper subset of right JSON object. + * @return true if left left JSON object is a proper subset of right JSON object. */ public static boolean isJsonObjectProperSubsetOf( String leftObject, String rightObject, boolean checkValues, boolean allowExtra, @@ -441,7 +441,7 @@ private static boolean isListProperSubsetOf( * @param leftTree Left headers map. * @param rightTree Right headers map. * @param checkValues Check header values for equality?. - * @return true if left headers map is a proper subset of right headers map. + * @return true if left headers map is a proper subset of right headers map. */ public static boolean areHeadersProperSubsetOf( Map leftTree, Map rightTree, boolean checkValues) { From f0122ff3bea1b2c17a1bdc47b5dab81ea7e6004b Mon Sep 17 00:00:00 2001 From: Asad Ali Date: Tue, 28 Mar 2023 13:41:11 +0500 Subject: [PATCH 3/4] fix wrong indentation --- .github/workflows/build-and-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 52e79eae..6c31658a 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -5,7 +5,7 @@ on: branches: - main pull_request: - + jobs: build-and-test: name: Test using Java ${{ matrix.java }} From 7059aee6ded9ab3f326c419a47694442b8f35d14 Mon Sep 17 00:00:00 2001 From: Asad Ali Date: Tue, 28 Mar 2023 13:58:03 +0500 Subject: [PATCH 4/4] Added configuration source of javadoc to jdk version 8 --- pom.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pom.xml b/pom.xml index f43710f9..1b7e590e 100644 --- a/pom.xml +++ b/pom.xml @@ -228,6 +228,9 @@ org.apache.maven.plugins maven-javadoc-plugin 2.9.1 + + 8 + attach-javadocs