Update dependencies

Author: lucko

.github/workflows/ci.yml

@@ -15,26 +15,24 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
-      - name: validate gradle wrapper
-        uses: gradle/wrapper-validation-action@v1
-
-      - uses: actions/setup-java@v3
+      - name: Setup Java
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: '21'
 
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/actions/setup-gradle@v4
 
       - name: Run build and tests with Gradle wrapper
-        run: ./gradlew test build PdockerTests
+        run: ./gradlew test build -PdockerTests
 
       - name: Publish test report
-        uses: mikepenz/action-junit-report@v3
+        uses: mikepenz/action-junit-report@v5
         if: success() || failure()
         with:
           report_paths: 'build/test-results/test/TEST-*.xml'

build.gradle

@@ -27,7 +27,7 @@ repositories {
 }
 
 test {
-    onlyIf { project.hasProperty('dockerTests') }
+    //onlyIf { project.hasProperty('dockerTests') }
     useJUnitPlatform()
     testLogging {
         events = [TestLogEvent.PASSED, TestLogEvent.FAILED, TestLogEvent.SKIPPED]

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,7 @@
-#Sun Oct 08 18:14:53 BST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -32,6 +32,9 @@
 import net.luckperms.rest.service.MiscService;
 import net.luckperms.rest.service.TrackService;
 import net.luckperms.rest.service.UserService;
+import okhttp3.OkHttpClient;
+
+import java.util.function.Consumer;
 
 /**
  * A Java client for the LuckPerms REST API.
@@ -125,6 +128,14 @@ interface Builder {
          */
         Builder apiKey(String apiKey);
 
+        /**
+         * Sets a custom HTTP client configurer.
+         *
+         * @param clientConfigurer the client configurer
+         * @return this builder
+         */
+        Builder httpClientConfigurer(Consumer<OkHttpClient.Builder> clientConfigurer);
+
         /**
          * Builds a client.
          *

gradlew

@@ -42,6 +42,7 @@
 import java.io.IOException;
 import java.util.Objects;
 import java.util.concurrent.TimeUnit;
+import java.util.function.Consumer;
 
 class LuckPermsRestClientImpl implements LuckPermsRestClient {
     private final OkHttpClient httpClient;
@@ -55,7 +56,7 @@ class LuckPermsRestClientImpl implements LuckPermsRestClient {
     private final EventService eventService;
     private final MiscService miscService;
 
-    LuckPermsRestClientImpl(String baseUrl, String apiKey) {
+    LuckPermsRestClientImpl(String baseUrl, String apiKey, Consumer<OkHttpClient.Builder> clientConfigurer) {
         OkHttpClient.Builder clientBuilder = new OkHttpClient.Builder();
 
         if (apiKey != null && !apiKey.isEmpty()) {
@@ -64,6 +65,10 @@ class LuckPermsRestClientImpl implements LuckPermsRestClient {
 
         clientBuilder.readTimeout(60, TimeUnit.SECONDS);
 
+        if (clientConfigurer != null) {
+            clientConfigurer.accept(clientBuilder);
+        }
+
         this.httpClient = clientBuilder.build();
         this.eventCallAdapterFactory = new EventCallAdapterFactory(this.httpClient);
 
@@ -72,6 +77,7 @@ class LuckPermsRestClientImpl implements LuckPermsRestClient {
                 .baseUrl(baseUrl)
                 .addCallAdapterFactory(this.eventCallAdapterFactory)
                 .addConverterFactory(GsonConverterFactory.create())
+                .validateEagerly(true)
                 .build();
 
         this.userService = retrofit.create(UserService.class);
@@ -127,6 +133,7 @@ public void close() {
     static final class BuilderImpl implements Builder {
         private String baseUrl = null;
         private String apiKey = null;
+        private Consumer<OkHttpClient.Builder> clientConfigurer = null;
 
         BuilderImpl() {
 
@@ -144,10 +151,16 @@ public Builder apiKey(String apiKey) {
             return this;
         }
 
+        @Override
+        public Builder httpClientConfigurer(Consumer<OkHttpClient.Builder> clientConfigurer) {
+            this.clientConfigurer = clientConfigurer;
+            return this;
+        }
+
         @Override
         public LuckPermsRestClient build() {
             Objects.requireNonNull(this.baseUrl, "baseUrl must be configured!");
-            return new LuckPermsRestClientImpl(this.baseUrl, this.apiKey);
+            return new LuckPermsRestClientImpl(this.baseUrl, this.apiKey, this.clientConfigurer);
         }
     }