Skip to content

Commit e8ce124

Browse files
MrMicky-FRMrMicky-FR
committed
Update build for Java 21
1 parent dbbc33d commit e8ce124

File tree

11 files changed

+60
-102
lines changed

11 files changed

+60
-102
lines changed

‎.github/workflows/build.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,19 @@ jobs:
1616

1717
steps:
1818
- name: Checkout repository
19-
uses: actions/checkout@v3
19+
uses: actions/checkout@v4
2020

2121
- name: Setup JDK ${{ matrix.java-version }}
22-
uses: actions/setup-java@v3
22+
uses: actions/setup-java@v4
2323
with:
2424
distribution: temurin
2525
java-version: ${{ matrix.java-version }}
2626

2727
- name: Validate Gradle Wrapper
28-
uses: gradle/wrapper-validation-action@v1
28+
uses: gradle/wrapper-validation-action@v3
2929

3030
- name: Setup Gradle
31-
uses: gradle/gradle-build-action@v2
31+
uses: gradle/gradle-build-action@v3
3232

3333
- name: Build
3434
run: ./gradlew build
@@ -44,13 +44,13 @@ jobs:
4444

4545
steps:
4646
- name: Checkout repository
47-
uses: actions/checkout@v3
47+
uses: actions/checkout@v4
4848

49-
- name: Setup JDK 11
50-
uses: actions/setup-java@v3
49+
- name: Setup JDK 17
50+
uses: actions/setup-java@v4
5151
with:
5252
distribution: temurin
53-
java-version: 11
53+
java-version: 17
5454

5555
- name: Publish to Sonatype
5656
run: ./gradlew publish
@@ -61,7 +61,7 @@ jobs:
6161
SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
6262

6363
- name: Upload artifacts
64-
uses: actions/upload-artifact@v3
64+
uses: actions/upload-artifact@v4
6565
with:
6666
name: AzAuth
6767
path: |

‎.github/workflows/codeql.yml‎

Lines changed: 0 additions & 39 deletions
This file was deleted.

‎README.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# AzAuth
22

33
[![Java CI](https://img.shields.io/github/actions/workflow/status/Azuriom/AzAuth/build.yml?branch=master&style=flat-square)](https://github.com/Azuriom/AzAuth/actions/workflows/build.yml)
4-
[![Code QL](https://img.shields.io/github/actions/workflow/status/Azuriom/AzAuth/codeql.yml?branch=master&style=flat-square&label=code%20quality)](https://github.com/Azuriom/AzAuth/actions/workflows/codeql.yml)
54
[![Maven Central](https://img.shields.io/maven-central/v/com.azuriom/azauth.svg?label=Maven%20Central&style=flat-square)](https://search.maven.org/search?q=g:%22com.azuriom%22%20AND%20a:%22azauth%22)
65
[![Chat](https://img.shields.io/discord/625774284823986183?color=5865f2&label=Discord&logo=discord&logoColor=fff&style=flat-square)](https://azuriom.com/discord)
76

‎build.gradle‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,16 @@ plugins {
55
}
66

77
group 'com.azuriom'
8-
version '1.0.0'
8+
version '1.0.0-SNAPSHOT'
99

1010
ext {
1111
isReleaseVersion = !version.endsWith('SNAPSHOT')
1212
}
1313

14-
sourceCompatibility = 1.8
15-
targetCompatibility = 1.8
14+
java {
15+
sourceCompatibility = 1.8
16+
targetCompatibility = 1.8
17+
}
1618

1719
tasks.withType(JavaCompile) {
1820
options.encoding = 'UTF-8'
@@ -23,11 +25,11 @@ repositories {
2325
}
2426

2527
dependencies {
26-
api 'com.google.code.gson:gson:2.9.1'
27-
compileOnlyApi 'org.jetbrains:annotations:23.1.0'
28+
api 'com.google.code.gson:gson:2.10.1'
29+
compileOnlyApi 'org.jetbrains:annotations:24.1.0'
2830

29-
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.1'
30-
testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.9.1'
31+
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
32+
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
3133
}
3234

3335
test {

‎gradle/wrapper/gradle-wrapper.jar‎

1.19 KB
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎gradlew‎

Lines changed: 11 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎gradlew.bat‎

Lines changed: 8 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/main/java/com/azuriom/azauth/AuthClient.java‎

Lines changed: 18 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,7 @@
66
import com.azuriom.azauth.gson.UuidAdapter;
77
import com.azuriom.azauth.model.ErrorResponse;
88
import com.azuriom.azauth.model.User;
9-
import com.google.gson.FieldNamingPolicy;
10-
import com.google.gson.Gson;
11-
import com.google.gson.GsonBuilder;
12-
import com.google.gson.JsonObject;
13-
import com.google.gson.JsonParseException;
9+
import com.google.gson.*;
1410
import org.jetbrains.annotations.Blocking;
1511
import org.jetbrains.annotations.Contract;
1612
import org.jetbrains.annotations.NotNull;
@@ -22,7 +18,7 @@
2218
import java.io.InputStreamReader;
2319
import java.io.OutputStream;
2420
import java.net.HttpURLConnection;
25-
import java.net.URL;
21+
import java.net.URI;
2622
import java.nio.charset.StandardCharsets;
2723
import java.time.Instant;
2824
import java.util.Objects;
@@ -95,8 +91,8 @@ public AuthClient(@NotNull String url) {
9591
*/
9692
@Blocking
9793
public @NotNull AuthResult<@NotNull User> login(@NotNull String email,
98-
@NotNull String password,
99-
@Nullable String code2fa) throws AuthException {
94+
@NotNull String password,
95+
@Nullable String code2fa) throws AuthException {
10096
return this.login(email, password, code2fa, User.class);
10197
}
10298

@@ -112,8 +108,8 @@ public AuthClient(@NotNull String url) {
112108
*/
113109
@Blocking
114110
public <T> @NotNull AuthResult<@NotNull T> login(@NotNull String email,
115-
@NotNull String password,
116-
@NotNull Class<T> responseType) throws AuthException {
111+
@NotNull String password,
112+
@NotNull Class<T> responseType) throws AuthException {
117113
return login(email, password, (String) null, responseType);
118114
}
119115

@@ -189,9 +185,9 @@ public AuthClient(@NotNull String url) {
189185
*/
190186
@Blocking
191187
public <T> @NotNull AuthResult<@NotNull T> login(@NotNull String email,
192-
@NotNull String password,
193-
@Nullable String code2fa,
194-
@NotNull Class<T> responseType) throws AuthException {
188+
@NotNull String password,
189+
@Nullable String code2fa,
190+
@NotNull Class<T> responseType) throws AuthException {
195191
JsonObject body = new JsonObject();
196192
body.addProperty("email", email);
197193
body.addProperty("password", password);
@@ -253,26 +249,17 @@ public void logout(@NotNull String accessToken) throws AuthException {
253249

254250
@Blocking
255251
@Contract("_, _, null -> null; _, _, !null -> !null")
256-
private <T> AuthResult<T> post(@NotNull String endPoint, @NotNull JsonObject body,
252+
private <T> AuthResult<T> post(@NotNull String endpoint,
253+
@NotNull JsonObject body,
257254
@Nullable Class<T> responseType) throws AuthException {
258255
try {
259-
return this.doPost(endPoint, body, responseType);
260-
} catch (IOException e) {
261-
throw new AuthException(e);
262-
}
263-
}
264-
265-
@Blocking
266-
@Contract("_, _, null -> null; _, _, !null -> !null")
267-
private <T> AuthResult<T> doPost(@NotNull String endPoint, @NotNull JsonObject body, @Nullable Class<T> responseType)
268-
throws AuthException, IOException {
269-
try {
270-
URL apiUrl = new URL(this.url + "/api/auth/" + endPoint);
271-
HttpURLConnection connection = (HttpURLConnection) apiUrl.openConnection();
256+
URI api = URI.create(this.url + "/api/auth/" + endpoint);
257+
HttpURLConnection connection = (HttpURLConnection) api.toURL().openConnection();
272258
connection.setRequestMethod("POST");
273259
connection.setDoOutput(true);
274-
connection.addRequestProperty("User-Agent", "AzAuth authenticator v1");
260+
connection.setUseCaches(false);
275261
connection.addRequestProperty("Content-Type", "application/json; charset=utf-8");
262+
connection.addRequestProperty("User-Agent", "AzAuth authenticator v1");
276263

277264
try (OutputStream out = connection.getOutputStream()) {
278265
out.write(body.toString().getBytes(StandardCharsets.UTF_8));
@@ -294,7 +281,8 @@ private <T> AuthResult<T> doPost(@NotNull String endPoint, @NotNull JsonObject b
294281
}
295282
}
296283

297-
private <T> AuthResult<T> handleResponse(HttpURLConnection connection, Class<T> type) throws AuthException, IOException {
284+
private <T> AuthResult<T> handleResponse(HttpURLConnection connection, Class<T> type)
285+
throws AuthException, IOException {
298286
try (BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream()))) {
299287
T response = GSON.fromJson(reader, type);
300288

@@ -320,7 +308,7 @@ private <T> AuthResult<T> handleClientError(HttpURLConnection connection)
320308

321309
throw new AuthException(response.getMessage());
322310
} catch (JsonParseException e) {
323-
throw new AuthException("Invalid JSON response from API (http " + status + ")");
311+
throw new AuthException("Invalid JSON response from API (HTTP " + status + ")", e);
324312
}
325313
}
326314
}

‎src/main/java/com/azuriom/azauth/AuthResult.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
public interface AuthResult<T> {
88

9-
default boolean isSuccess(){
9+
default boolean isSuccess() {
1010
return this instanceof Success;
1111
}
1212

0 commit comments

Comments
 (0)