Pull upstream

.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 }}

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 og_group: String by project
@@ -44,7 +44,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.
@@ -126,7 +126,7 @@ tasks.withType<Test> {
 }
 
 tasks.withType<JavaCompile> {
-    options.release.set(11)
+    options.release.set(17)
 }
 
 tasks.build.configure { dependsOn(tasks.shadowJar) }

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

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

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

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() + ')');
         }

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());
 	}
 }