set compiler release flag to the correct java version

moehreag · moehreag · commit 839f1cb7534b · 2024-12-14T21:54:50.000+01:00
diff --git a/1.16_combat-6/build.gradle.kts b/1.16_combat-6/build.gradle.kts
@@ -75,6 +75,14 @@ tasks.runClient {
 	classpath(sourceSets.getByName("test").runtimeClasspath)
 }
 
+tasks.withType(JavaCompile::class).configureEach {
+	options.encoding = "UTF-8"
+
+	if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_18)) {
+		options.release = 17
+	}
+}
+
 java {
 	sourceCompatibility = JavaVersion.VERSION_17
 	targetCompatibility = JavaVersion.VERSION_17
diff --git a/1.16_combat-6/src/main/java/io/github/axolotlclient/api/chat/ChatWidget.java b/1.16_combat-6/src/main/java/io/github/axolotlclient/api/chat/ChatWidget.java
@@ -101,7 +101,7 @@ private void addMessage(ChatMessage message) {
 		boolean scrollToBottom = getScrollAmount() == getMaxScroll();
 
 		if (!messages.isEmpty()) {
-			ChatMessage prev = messages.getLast();
+			ChatMessage prev = messages.get(messages.size()-1);
 			if (!(prev.sender().equals(message.sender()) && prev.senderDisplayName().equals(message.senderDisplayName()))) {
 				addEntry(new NameChatLine(message));
 			} else {
@@ -127,7 +127,7 @@ private void addMessage(ChatMessage message) {
 	private void loadMessages() {
 		long before;
 		if (!messages.isEmpty()) {
-			before = messages.getFirst().timestamp().getEpochSecond();
+			before = messages.get(0).timestamp().getEpochSecond();
 		} else {
 			before = Instant.now().getEpochSecond();
 		}
diff --git a/1.20/build.gradle.kts b/1.20/build.gradle.kts
@@ -81,6 +81,14 @@ tasks.processResources {
 	}
 }
 
+tasks.withType(JavaCompile::class).configureEach {
+	options.encoding = "UTF-8"
+
+	if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_18)) {
+		options.release = 17
+	}
+}
+
 java {
 	sourceCompatibility = JavaVersion.VERSION_17
 	targetCompatibility = JavaVersion.VERSION_17
diff --git a/1.20/src/main/java/io/github/axolotlclient/api/chat/ChatWidget.java b/1.20/src/main/java/io/github/axolotlclient/api/chat/ChatWidget.java
@@ -91,7 +91,7 @@ private void addMessage(ChatMessage message) {
 		boolean scrollToBottom = getScrollAmount() == getMaxScroll();
 
 		if (!messages.isEmpty()) {
-			ChatMessage prev = messages.getLast();
+			ChatMessage prev = messages.get(messages.size()-1);
 			if (!(prev.sender().equals(message.sender()) && prev.senderDisplayName().equals(message.senderDisplayName()))) {
 				addEntry(new NameChatLine(message));
 			} else {
@@ -117,7 +117,7 @@ private void addMessage(ChatMessage message) {
 	private void loadMessages() {
 		long before;
 		if (!messages.isEmpty()) {
-			before = messages.getFirst().timestamp().getEpochSecond();
+			before = messages.get(0).timestamp().getEpochSecond();
 		} else {
 			before = Instant.now().getEpochSecond();
 		}
diff --git a/1.21.4/build.gradle.kts b/1.21.4/build.gradle.kts
@@ -95,6 +95,14 @@ tasks.processResources {
 	}
 }
 
+tasks.withType(JavaCompile::class).configureEach {
+	options.encoding = "UTF-8"
+
+	if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_22)) {
+		options.release = 21
+	}
+}
+
 java {
 	sourceCompatibility = JavaVersion.VERSION_21
 	targetCompatibility = JavaVersion.VERSION_21
diff --git a/1.21/build.gradle.kts b/1.21/build.gradle.kts
@@ -85,6 +85,17 @@ tasks.processResources {
 	}
 }
 
+tasks.withType(JavaCompile::class).configureEach {
+	// Ensure that the encoding is set to UTF-8, no matter what the system default is
+	// this fixes some edge cases with special characters not displaying correctly
+	// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
+	options.encoding = "UTF-8"
+
+	if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_22)) {
+		options.release = 21
+	}
+}
+
 java {
 	sourceCompatibility = JavaVersion.VERSION_21
 	targetCompatibility = JavaVersion.VERSION_21
diff --git a/1.8.9/build.gradle.kts b/1.8.9/build.gradle.kts
@@ -98,6 +98,14 @@ tasks.runClient {
 	classpath(sourceSets.getByName("test").runtimeClasspath)
 }
 
+tasks.withType(JavaCompile::class).configureEach {
+	options.encoding = "UTF-8"
+
+	if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_18)) {
+		options.release = 17
+	}
+}
+
 java {
 	sourceCompatibility = JavaVersion.VERSION_17
 	targetCompatibility = JavaVersion.VERSION_17
diff --git a/1.8.9/src/main/java/io/github/axolotlclient/api/chat/ChatWidget.java b/1.8.9/src/main/java/io/github/axolotlclient/api/chat/ChatWidget.java
@@ -101,7 +101,7 @@ private void addMessage(ChatMessage message) {
 		boolean scrollToBottom = getScrollAmount() == getMaxScroll();
 
 		if (!messages.isEmpty()) {
-			ChatMessage prev = messages.getLast();
+			ChatMessage prev = messages.get(messages.size()-1);
 			if (!(prev.sender().equals(message.sender()) && prev.senderDisplayName().equals(message.senderDisplayName()))) {
 				entries.add(new NameChatLine(message));
 			} else {
@@ -127,7 +127,7 @@ private void addMessage(ChatMessage message) {
 	private void loadMessages() {
 		long before;
 		if (!messages.isEmpty()) {
-			before = messages.getFirst().timestamp().getEpochSecond();
+			before = messages.get(0).timestamp().getEpochSecond();
 		} else {
 			before = Instant.now().getEpochSecond();
 		}
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -78,7 +78,7 @@ subprojects {
 				}
 				val oldName = old.fileName.toString()
 				val oldVer = oldName.substring(0, oldName.indexOf("+"))
-				val mcVer = oldName.substring(oldName.indexOf("+")+1, oldName.length-4)
+				val mcVer = oldName.substring(oldName.indexOf("+")+1, oldName.length-4).removeSuffix("-sources")
 				if (!project.version.toString().contains(mcVer)) {
 					return@forEach
 				}
diff --git a/common/build.gradle.kts b/common/build.gradle.kts
@@ -62,6 +62,14 @@ tasks.processResources {
 	}
 }
 
+tasks.withType(JavaCompile::class).configureEach {
+	options.encoding = "UTF-8"
+
+	if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_18)) {
+		options.release = 17
+	}
+}
+
 tasks.withType(AbstractArchiveTask::class).configureEach {
 	isPreserveFileTimestamps = false
 	isReproducibleFileOrder = true
diff --git a/common/src/main/java/io/github/axolotlclient/api/Response.java b/common/src/main/java/io/github/axolotlclient/api/Response.java
@@ -148,7 +148,7 @@ public <T> T ifBodyHas(String path, Supplier<T> supplier) {
 	}
 
 	public Optional<String> firstHeader(String name) {
-		return Optional.ofNullable(headers.getOrDefault(name, null)).map(List::getFirst);
+		return Optional.ofNullable(headers.getOrDefault(name, null)).map(index -> index.get(0));
 	}
 
 	public record Error(int httpCode, String description) {
diff --git a/common/src/main/java/io/github/axolotlclient/api/requests/ChannelRequest.java b/common/src/main/java/io/github/axolotlclient/api/requests/ChannelRequest.java
@@ -64,13 +64,9 @@ private static Channel parseChannel(Response response) {
 				}
 			}).join();
 		if (participants.size() == 1) {
-			try {
-				User other = owner.equals(API.getInstance().getSelf()) ? participants.getFirst() : owner;
-				if (createDmChannelName(other.getUuid()).equals(name)) {
-					return new Channel.DM(id, name, persistence, participants, owner, deserialized);
-				}
-			} catch (Throwable t) {
-				t.printStackTrace();
+			User other = owner.equals(API.getInstance().getSelf()) ? participants.get(0) : owner;
+			if (createDmChannelName(other.getUuid()).equals(name)) {
+				return new Channel.DM(id, name, persistence, participants, owner, deserialized);
 			}
 		}
 		return new Channel.Group(id, name, persistence, participants, owner, deserialized);
@@ -95,9 +91,9 @@ public static CompletableFuture<?> createChannel(String name, Persistence persis
 			participants.add(UUIDHelper.getUuid(username));
 		}
 		return API.getInstance().post(Request.Route.CHANNEL.builder()
-				.field("name", name).field("persistence", persistence.toJson())
-				.field("participants", participants).build());
-			//.thenApply(Response::getPlainBody).thenCompose(ChannelRequest::getById);
+			.field("name", name).field("persistence", persistence.toJson())
+			.field("participants", participants).build());
+		//.thenApply(Response::getPlainBody).thenCompose(ChannelRequest::getById);
 	}
 
 	public static void updateChannel(String id, String name, Persistence persistence, String... additionalUsers) {
@@ -118,7 +114,7 @@ public static CompletableFuture<Channel> getOrCreateDM(User user) {
 			if (dm.getOwner().equals(API.getInstance().getSelf()) && dm.getReceiver().equals(user)) {
 				return true;
 			}
-			return c.getOwner().equals(user) && dm.getParticipants().getFirst().equals(API.getInstance().getSelf());
+			return c.getOwner().equals(user) && dm.getParticipants().get(0).equals(API.getInstance().getSelf());
 		}).findFirst()).thenApply(opt -> opt.orElseGet(() -> API.getInstance().post(Request.Route.CHANNEL.builder()
 				.field("name", createDmChannelName(user.getUuid())).field("persistence", Persistence.of(Persistence.Type.CHANNEL, 0, 0).toJson())
 				.field("participants", List.of(user.getUuid())).build())
diff --git a/common/src/main/java/io/github/axolotlclient/api/types/PkSystem.java b/common/src/main/java/io/github/axolotlclient/api/types/PkSystem.java
@@ -96,7 +96,7 @@ private static CompletableFuture<PkSystem> create(JsonObject system) {
 					list.add(Member.fromObject(e.getAsJsonObject()))
 				);
 				builder.fronters(list);
-				builder.firstFronter(list.getFirst());
+				builder.firstFronter(list.get(0));
 				log("Fetched fronters list");
 			}).thenCompose(v -> queryPkAPI("systems/@me/members").thenAccept(object -> {
 				JsonArray array = object.getAsJsonArray();
diff --git a/gradle.properties b/gradle.properties
@@ -6,7 +6,7 @@ org.gradle.parallel=true
 axolotlclient.modules.all=true
 
 # Mod Properties
-version=3.1.0-beta.25
+version=3.1.0-beta.26
 
 maven_group=io.github.axolotlclient
 

Original file line number	Diff line number	Diff line change
`@@ -81,6 +81,14 @@ tasks.processResources {`
`81`	`81`	`}`
`82`	`82`	`}`
`83`	`83`
	`84`	`+tasks.withType(JavaCompile::class).configureEach {`
	`85`	`+ options.encoding = "UTF-8"`
	`86`	`+`
	`87`	`+ if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_18)) {`
	`88`	`+ options.release = 17`
	`89`	`+ }`
	`90`	`+}`
	`91`	`+`
`84`	`92`	`java {`
`85`	`93`	`sourceCompatibility = JavaVersion.VERSION_17`
`86`	`94`	`targetCompatibility = JavaVersion.VERSION_17`
Original file line number	Diff line number	Diff line change
`@@ -95,6 +95,14 @@ tasks.processResources {`
`95`	`95`	`}`
`96`	`96`	`}`
`97`	`97`
	`98`	`+tasks.withType(JavaCompile::class).configureEach {`
	`99`	`+ options.encoding = "UTF-8"`
	`100`	`+`
	`101`	`+ if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_22)) {`
	`102`	`+ options.release = 21`
	`103`	`+ }`
	`104`	`+}`
	`105`	`+`
`98`	`106`	`java {`
`99`	`107`	`sourceCompatibility = JavaVersion.VERSION_21`
`100`	`108`	`targetCompatibility = JavaVersion.VERSION_21`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ subprojects {`
`78`	`78`	`}`
`79`	`79`	`val oldName = old.fileName.toString()`
`80`	`80`	`val oldVer = oldName.substring(0, oldName.indexOf("+"))`
`81`		`- val mcVer = oldName.substring(oldName.indexOf("+")+1, oldName.length-4)`
	`81`	`+ val mcVer = oldName.substring(oldName.indexOf("+")+1, oldName.length-4).removeSuffix("-sources")`
`82`	`82`	`if (!project.version.toString().contains(mcVer)) {`
`83`	`83`	`return@forEach`
`84`	`84`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,14 @@ tasks.processResources {`
`62`	`62`	`}`
`63`	`63`	`}`
`64`	`64`
	`65`	`+tasks.withType(JavaCompile::class).configureEach {`
	`66`	`+ options.encoding = "UTF-8"`
	`67`	`+`
	`68`	`+ if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_18)) {`
	`69`	`+ options.release = 17`
	`70`	`+ }`
	`71`	`+}`
	`72`	`+`
`65`	`73`	`tasks.withType(AbstractArchiveTask::class).configureEach {`
`66`	`74`	`isPreserveFileTimestamps = false`
`67`	`75`	`isReproducibleFileOrder = true`