Skip to content

Commit

Permalink
Update JDT
Browse files Browse the repository at this point in the history
  • Loading branch information
modmuss50 committed Aug 22, 2023
1 parent b51d0b2 commit a9d3bcc
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 17 deletions.
4 changes: 2 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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.
Expand Down
25 changes: 13 additions & 12 deletions gradle.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -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
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}
}

0 comments on commit a9d3bcc

Please sign in to comment.