From 61a9c0dca007d5dc82697448bf9910d7eca17aaf Mon Sep 17 00:00:00 2001
From: Connor Tumbleson <connor.tumbleson@gmail.com>
Date: Mon, 20 Jul 2026 19:43:18 -0400
Subject: [PATCH 1/2] fix: force UTF8 on yaml parsing

---
 brut.j.yaml/src/main/java/brut/yaml/YamlReader.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/brut.j.yaml/src/main/java/brut/yaml/YamlReader.java b/brut.j.yaml/src/main/java/brut/yaml/YamlReader.java
index b13bca2ff9..96281e2610 100644
--- a/brut.j.yaml/src/main/java/brut/yaml/YamlReader.java
+++ b/brut.j.yaml/src/main/java/brut/yaml/YamlReader.java
@@ -17,6 +17,7 @@
 package brut.yaml;
 
 import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -39,7 +40,7 @@ public void pushLine() {
     }
 
     public void read(InputStream in) {
-        Scanner scanner = new Scanner(in);
+        Scanner scanner = new Scanner(in, StandardCharsets.UTF_8.name());
         mLines = new ArrayList<>();
         while (scanner.hasNextLine()) {
             mLines.add(new YamlLine(scanner.nextLine()));

From 043302ca3ecf01d842b82cca30743b79f5550bf5 Mon Sep 17 00:00:00 2001
From: IgorEisberg <igoreisberg@gmail.com>
Date: Tue, 21 Jul 2026 04:57:06 +0300
Subject: [PATCH 2/2] fix JavaCompile task

---
 build.gradle.kts | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index e62eeb2d99..88c385ee00 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -81,6 +81,14 @@ subprojects {
         targetCompatibility = JavaVersion.VERSION_1_8
     }
 
+    tasks.withType<JavaCompile>().configureEach {
+        options.encoding = "UTF-8"
+
+        if (JavaVersion.current().isJava9Compatible) {
+            options.release.set(8)
+        }
+    }
+
     val mavenProjects = arrayOf(
         "brut.j.common", "brut.j.util", "brut.j.dir", "brut.j.xml", "brut.j.yaml",
         "apktool-lib", "apktool-cli"
@@ -98,10 +106,3 @@ tasks.register("release") {
 tasks.wrapper {
     distributionType = Wrapper.DistributionType.ALL
 }
-
-tasks.withType<JavaCompile> {
-    options.compilerArgs.add("-Xlint:-options")
-    options.compilerArgs.add("--release 8")
-
-    options.encoding = "UTF-8"
-}