From 6c6e1b4ce2d990651d3cd2984487a7f5db13dc61 Mon Sep 17 00:00:00 2001 From: Kenzie Togami Date: Wed, 16 Aug 2017 16:07:18 -0700 Subject: [PATCH] [Forge] Officially move to Java 8 --- worldedit-core/build.gradle | 2 +- worldedit-forge/build.gradle | 17 +++++++++++++---- .../sk89q/worldedit/forge/ForgeWorldEdit.java | 4 ---- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/worldedit-core/build.gradle b/worldedit-core/build.gradle index 079e3c124..ac79454fd 100644 --- a/worldedit-core/build.gradle +++ b/worldedit-core/build.gradle @@ -5,7 +5,7 @@ dependencies { compile 'de.schlichtherle:truezip:6.8.3' compile 'rhino:js:1.7R2' compile 'org.yaml:snakeyaml:1.9' - compile 'com.google.guava:guava:17.0' + compile 'com.google.guava:guava:21.0' compile 'com.sk89q:jchronic:0.2.4a' compile 'com.google.code.findbugs:jsr305:1.3.9' compile 'com.thoughtworks.paranamer:paranamer:2.6' diff --git a/worldedit-forge/build.gradle b/worldedit-forge/build.gradle index 99f981f45..cf8de1a5b 100644 --- a/worldedit-forge/build.gradle +++ b/worldedit-forge/build.gradle @@ -13,12 +13,21 @@ buildscript { apply plugin: 'net.minecraftforge.gradle.forge' +configurations.all { + resolutionStrategy { + force 'org.ow2.asm:asm:5.2' + } +} + dependencies { compile project(':worldedit-core') - compile 'org.spongepowered:spongeapi:3.1.0-SNAPSHOT' + compile 'org.spongepowered:spongeapi:6.0.0-SNAPSHOT' testCompile group: 'org.mockito', name: 'mockito-core', version: '1.9.0-rc1' } +sourceCompatibility = 1.8 +targetCompatibility = 1.8 + repositories { maven { name = "Sponge" @@ -26,11 +35,11 @@ repositories { } } -ext.forgeVersion = "14.21.1.2443" +ext.forgeVersion = "14.22.0.2456" minecraft { - version = "1.12-${project.forgeVersion}" - mappings = "snapshot_20170801" + version = "1.12.1-${project.forgeVersion}" + mappings = "snapshot_20170815" runDir = 'run' replaceIn "com/sk89q/worldedit/forge/ForgeWorldEdit.java" diff --git a/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgeWorldEdit.java b/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgeWorldEdit.java index ac575345b..3f4efbb14 100644 --- a/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgeWorldEdit.java +++ b/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgeWorldEdit.java @@ -63,10 +63,6 @@ import static com.google.common.base.Preconditions.checkNotNull; */ @Mod(modid = ForgeWorldEdit.MOD_ID, name = "WorldEdit", version = "%VERSION%", acceptableRemoteVersions = "*") public class ForgeWorldEdit { - - static { - Java8Detector.notifyIfNot8(); - } public static Logger logger; public static final String MOD_ID = "worldedit";