From a9d3bccc3d1a679994378088b20b5687a2fefa42 Mon Sep 17 00:00:00 2001
From: modmuss50 <modmuss50@gmail.com>
Date: Tue, 22 Aug 2023 23:09:40 +0100
Subject: [PATCH 1/4] Update JDT

---
 build.gradle.kts                              |   4 +--
 gradle.lockfile                               |  25 +++++++++---------
 gradle.properties                             |   2 +-
 gradle/wrapper/gradle-wrapper.jar             | Bin 61574 -> 61624 bytes
 gradle/wrapper/gradle-wrapper.properties      |   2 +-
 .../test/SourceCompatibilityTests.java        |   2 +-
 6 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 2f098fa..b96292b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
     `maven-publish`
     id("uk.jamierocks.propatcher") version "2.0.1"
     id("org.cadixdev.licenser") version "0.6.1"
-    id("com.github.johnrengelman.shadow") version "6.1.0"
+    id("com.github.johnrengelman.shadow") version "7.1.2"
 }
 
 val artifactId = name.toLowerCase()
@@ -33,7 +33,7 @@ dependencyLocking {
     lockMode.set(LockMode.STRICT)
 }
 
-val jdtVersion = "org.eclipse.jdt:org.eclipse.jdt.core:3.32.0"
+val jdtVersion = "org.eclipse.jdt:org.eclipse.jdt.core:3.34.0"
 dependencies {
     // JDT pulls all of these deps in, however they do not specify the exact version to use so they can get updated without us knowing.
     // Depend specifically on these versions to prevent them from being updated under our feet.
diff --git a/gradle.lockfile b/gradle.lockfile
index ac133af..a96c440 100644
--- a/gradle.lockfile
+++ b/gradle.lockfile
@@ -6,20 +6,21 @@ org.cadixdev:at:0.1.0-rc1=compileClasspath,runtimeClasspath,testCompileClasspath
 org.cadixdev:bombe:0.3.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.cadixdev:lorenz-io-jam:0.5.7=testRuntimeClasspath
 org.cadixdev:lorenz:0.5.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jdt:org.eclipse.jdt.core:3.32.0=compileClasspath,jdt,jdtSources,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.platform:org.eclipse.core.commands:3.10.300=compileClasspath,jdt,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.platform:org.eclipse.core.contenttype:3.8.200=compileClasspath,jdt,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.platform:org.eclipse.core.expressions:3.8.200=compileClasspath,jdt,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.platform:org.eclipse.core.filesystem:1.9.500=compileClasspath,jdt,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.platform:org.eclipse.core.jobs:3.13.200=compileClasspath,jdt,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.platform:org.eclipse.core.resources:3.18.100=compileClasspath,jdt,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.platform:org.eclipse.core.runtime:3.26.100=compileClasspath,jdt,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jdt:ecj:3.34.0=compileClasspath,jdt,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jdt:org.eclipse.jdt.core:3.34.0=compileClasspath,jdt,jdtSources,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.platform:org.eclipse.core.commands:3.11.0=compileClasspath,jdt,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.platform:org.eclipse.core.contenttype:3.9.0=compileClasspath,jdt,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.platform:org.eclipse.core.expressions:3.9.0=compileClasspath,jdt,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.platform:org.eclipse.core.filesystem:1.10.0=compileClasspath,jdt,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.platform:org.eclipse.core.jobs:3.14.0=compileClasspath,jdt,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.platform:org.eclipse.core.resources:3.19.0=compileClasspath,jdt,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.platform:org.eclipse.core.runtime:3.27.0=compileClasspath,jdt,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.eclipse.platform:org.eclipse.equinox.app:1.6.200=compileClasspath,jdt,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.platform:org.eclipse.equinox.common:3.17.0=compileClasspath,jdt,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.platform:org.eclipse.equinox.preferences:3.10.100=compileClasspath,jdt,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.platform:org.eclipse.equinox.common:3.18.0=compileClasspath,jdt,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.platform:org.eclipse.equinox.preferences:3.10.200=compileClasspath,jdt,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.eclipse.platform:org.eclipse.equinox.registry:3.11.200=compileClasspath,jdt,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.platform:org.eclipse.osgi:3.18.200=compileClasspath,jdt,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.platform:org.eclipse.text:3.12.300=compileClasspath,jdt,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.platform:org.eclipse.osgi:3.18.400=compileClasspath,jdt,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.platform:org.eclipse.text:3.13.0=compileClasspath,jdt,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-api:5.7.0=testCompileClasspath,testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-engine:5.7.0=testRuntimeClasspath
 org.junit.platform:junit-platform-commons:1.7.0=testCompileClasspath,testRuntimeClasspath
diff --git a/gradle.properties b/gradle.properties
index 82616b0..7f896da 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,5 @@
 group = net.fabricmc
 name = Mercury
-version = 0.3.0
+version = 0.3.1
 description = A source transformation and -remapping framework for Java.
 url = https://github.com/FabricMC/Mercury
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 943f0cbfa754578e88a3dae77fce6e3dea56edbf..afba109285af78dbd2a1d187e33ac4f87c76e392 100644
GIT binary patch
delta 6679
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
Cn(^uY

delta 6711
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
N0Rn>h&;K*$e*kC({~`bY

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index f398c33..4e86b92 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.2-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/test/java/org/cadixdev/mercury/test/SourceCompatibilityTests.java b/src/test/java/org/cadixdev/mercury/test/SourceCompatibilityTests.java
index 96ddfc9..5676286 100644
--- a/src/test/java/org/cadixdev/mercury/test/SourceCompatibilityTests.java
+++ b/src/test/java/org/cadixdev/mercury/test/SourceCompatibilityTests.java
@@ -33,6 +33,6 @@ void setSourceCompatibilityFromRelease() {
 		Assertions.assertEquals(JavaCore.VERSION_17, mercury.getSourceCompatibility());
 
 		mercury.setSourceCompatibilityFromRelease(99);
-		Assertions.assertEquals(JavaCore.VERSION_19, mercury.getSourceCompatibility());
+		Assertions.assertEquals(JavaCore.VERSION_20, mercury.getSourceCompatibility());
 	}
 }

From 053edd3d0d015919d6525aadde80d5f079525b3a Mon Sep 17 00:00:00 2001
From: Jason <11360596+jpenilla@users.noreply.github.com>
Date: Tue, 22 Aug 2023 15:11:43 -0700
Subject: [PATCH 2/4] Add missing break for IBinding.PACKAGE (#2)

---
 src/main/java/org/cadixdev/mercury/remapper/RemapperVisitor.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/org/cadixdev/mercury/remapper/RemapperVisitor.java b/src/main/java/org/cadixdev/mercury/remapper/RemapperVisitor.java
index 377ced7..dbcabf0 100644
--- a/src/main/java/org/cadixdev/mercury/remapper/RemapperVisitor.java
+++ b/src/main/java/org/cadixdev/mercury/remapper/RemapperVisitor.java
@@ -191,6 +191,7 @@ protected void visit(SimpleName node, IBinding binding) {
                 // This is ignored because it should be covered by separate handling
                 // of QualifiedName (for full-qualified class references),
                 // PackageDeclaration and ImportDeclaration
+                break;
             default:
                 throw new IllegalStateException("Unhandled binding: " + binding.getClass().getSimpleName() + " (" + binding.getKind() + ')');
         }

From 9938cb0849243684bb8f2ec47cda7f6311be7513 Mon Sep 17 00:00:00 2001
From: modmuss50 <modmuss50@gmail.com>
Date: Tue, 22 Aug 2023 23:14:52 +0100
Subject: [PATCH 3/4] Build against Java 17 to match JDT.

---
 .github/workflows/build.yml | 2 +-
 build.gradle.kts            | 2 +-
 gradle.properties           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 17e58b4..990690d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -4,7 +4,7 @@ jobs:
   build:
     strategy:
       matrix:
-        java: [11-jdk, 17-jdk]
+        java: [17-jdk]
     runs-on: ubuntu-22.04
     container:
       image: eclipse-temurin:${{ matrix.java }}
diff --git a/build.gradle.kts b/build.gradle.kts
index b96292b..25b09b3 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -113,7 +113,7 @@ tasks.withType<Test> {
 }
 
 tasks.withType<JavaCompile> {
-    options.release.set(11)
+    options.release.set(17)
 }
 
 tasks.jar {
diff --git a/gradle.properties b/gradle.properties
index 7f896da..61f4b1c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,5 @@
 group = net.fabricmc
 name = Mercury
-version = 0.3.1
+version = 0.4.0
 description = A source transformation and -remapping framework for Java.
 url = https://github.com/FabricMC/Mercury

From 75b2f49b9f01f5cc97e7656874a013d76075412e Mon Sep 17 00:00:00 2001
From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
Date: Sun, 5 Nov 2023 09:53:59 -0700
Subject: [PATCH 4/4] bump base_version to 0.1.3

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 9ab02ed..66a3f46 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,6 @@
 group = dev.architectury
 og_group = org.cadixdev
 name = Mercury
-base_version = 0.1.2
+base_version = 0.1.3
 description = A source transformation and -remapping framework for Java.
 url = https://github.com/architectury/Mercury