Cleanup, update and make it ready for Java 21 (#192)

* Cleanup, update and make it ready for Java 21 * Correct version * Correct build actions --------- Co-authored-by: Michael Lieshoff <[email protected]>
mlieshoff · Apr 30, 2024 · f18da67 · f18da67
1 parent eea4e9f
commit f18da67
Show file tree

Hide file tree

Showing 20 changed files with 78 additions and 404 deletions.
diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
@@ -13,7 +13,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: zulu
-          java-version: 17
+          java-version: 21
           server-id: packagecloud
           server-username: MAVEN_USERNAME
           server-password: MAVEN_PASSWORD

diff --git a/.github/workflows/nightlies.yml b/.github/workflows/nightlies.yml
@@ -13,7 +13,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: zulu
-          java-version: 17
+          java-version: 21
       - name: Start E2E tests
         run: mvn -B verify -PendToEnd
         env:

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -10,7 +10,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: zulu
-          java-version: 17
+          java-version: 21
       - name: Build with Maven
         run:
           mvn -B package
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,26 @@
 
 ## [Unreleased]
 
+## [4.0.5] - 2024-04-30
+
+### Changed
+
+- test scope: isNotBlank() and EMPTY not depending on wiremock anymore
+- test scope: clean up integration test base & tests
+- Source code is now ready for Java 21 (#173)
+- Binary code is now Java 21 compliant (#173)
+- JaCoCo from 0.8.11 to 0.8.12
+- Maven Compiler Plugin from 3.11.0 to 3.13.0
+- Maven Exec Plugin from 3.1.1 to 3.2.0
+- Maven Source Plugin from 3.3.0 to 3.3.1
+- Maven Surefire Plugin from 3.2.3 to 3.2.5
+- WireMock from 3.0.1 to 3.5.4
+- Google Formatter from 1.17.0 to 1.22.0
+
+### Removed
+
+- formatter file intellij_code_formatter.xml
+
 ## [4.0.4] - 2024-04-30
 
 ### Fixed
@@ -23,6 +43,7 @@
 - Lombok from 1.18.30 to 1.18.32
 - Mockito from 5.8.0 to 5.11.0
 - SLF4j from 2.0.9 to 2.0.13
+- Supercell API Wrapper Essentials from 1.0.0 to 1.0.1
 
 ## [4.0.2] - 2024-02-16
 
@@ -201,7 +222,8 @@
 
 - Create a Release job (#152)
 
-[unreleased]: https://github.com/mlieshoff/jcrapi2/compare/v4.0.4...HEAD
+[unreleased]: https://github.com/mlieshoff/jcrapi2/compare/v4.0.5...HEAD
+[4.0.5]: https://github.com/mlieshoff/jcrapi2/compare/v4.0.4...4.0.5
 [4.0.4]: https://github.com/mlieshoff/jcrapi2/compare/v4.0.3...4.0.4
 [4.0.3]: https://github.com/mlieshoff/jcrapi2/compare/v4.0.2...4.0.3
 [4.0.2]: https://github.com/mlieshoff/jcrapi2/compare/v4.0.1...4.0.2

diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 [![](https://img.shields.io/badge/java-packagecloud.io-844fec.svg)](https://packagecloud.io/)
 [![Nightlies](https://github.com/mlieshoff/jcrapi2/actions/workflows/nightlies.yml/badge.svg)](https://github.com/mlieshoff/jcrapi2/actions/workflows/nightlies.yml)
 
-# jcrapi2 4.0.4
+# jcrapi2 4.0.5
 A Java Wrapper For Official Supercell Clash Royal Api
 
 ## Why we don't use the Swagger scheme?
@@ -454,15 +454,15 @@ All requests are returning *java.concurrent.Future*. The execution will be async
 
 to Gradle:
 ```groovy
-    implementation group: 'jcrapi2', name: 'jcrapi2', version: '4.0.4'
+    implementation group: 'jcrapi2', name: 'jcrapi2', version: '4.0.5'
 ```
 
 to Maven:
 ```xml
     <dependency>
         <groupId>jcrapi2</groupId>
         <artifactId>jcrapi2</artifactId>
-        <version>4.0.4</version>
+        <version>4.0.5</version>
     </dependency>
 ```
 
@@ -492,6 +492,22 @@ Then initialize an instance of class Api like that:
 
 That's all, enjoy :)
 
+## Library updates
+
+Minor versions
+```
+mvn versions:update-parent versions:use-latest-releases versions:update-properties versions:commit -DallowMajorUpdates=false
+```
+
+Major versions
+```
+mvn versions:update-parent versions:use-latest-releases versions:update-properties versions:commit -DallowMajorUpdates=true
+```
+
+Update plugins
+```
+mvn versions:display-plugin-updates -U
+```
 ## Contributing
 
-1. Set up the formatting hook, via copying the files under ./jcrapi2/hooks to ./jcrapi2/.git/hooks
+1. Feel free to open Pull Requests with your ideas :)
diff --git a/VERSION.txt b/VERSION.txt
@@ -1 +1 @@
-v4.0.4
+v4.0.5
diff --git a/hooks/pre-commit b/hooks/pre-commit
@@ -7,7 +7,7 @@ echo "*********************************"
 
 java --version
 
-JAR_FILE=libs/google-java-format-1.17.0-all-deps.jar
+JAR_FILE=libs/google-java-format-1.22.0-all-deps.jar
 
 echo "get staged files..."
 filesToFormat="$(git --no-pager diff --name-status --no-color --staged | awk '$1 != "D" && $2 ~ /\.kts|\.java|\.kt/ { print $NF}')"