From fd6da092ab831c61e0835e2420c5e44f319e3be8 Mon Sep 17 00:00:00 2001 From: "Blue (Lukas Rieger)" Date: Sun, 30 Aug 2020 14:41:51 +0200 Subject: [PATCH] Correct javax relocation --- implementations/cli/build.gradle | 2 +- implementations/fabric-1.15.2/build.gradle | 2 +- implementations/fabric-1.16.1/build.gradle | 2 +- implementations/fabric-1.16.2/build.gradle | 2 +- implementations/forge-1.14.4/build.gradle | 2 +- implementations/forge-1.15.2/build.gradle | 2 +- implementations/forge-1.16.2/build.gradle | 2 +- implementations/spigot/build.gradle | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/implementations/cli/build.gradle b/implementations/cli/build.gradle index 2adce00f..0225cac0 100644 --- a/implementations/cli/build.gradle +++ b/implementations/cli/build.gradle @@ -21,7 +21,7 @@ build.dependsOn shadowJar { relocate 'org.apache', 'de.bluecolored.shadow.apache' relocate 'com.github.benmanes.caffeine', 'de.bluecolored.shadow.benmanes.caffeine' relocate 'org.aopalliance', 'de.bluecolored.shadow.aopalliance' - relocate 'javax', 'de.bluecolored.javax' + relocate 'javax', 'de.bluecolored.shadow.javax' relocate 'com.mojang.brigadier', 'de.bluecolored.shadow.mojang.brigadier' relocate 'org.checkerframework', 'de.bluecolored.shadow.checkerframework' relocate 'org.codehaus', 'de.bluecolored.shadow.codehaus' diff --git a/implementations/fabric-1.15.2/build.gradle b/implementations/fabric-1.15.2/build.gradle index 3a8756f7..58604250 100644 --- a/implementations/fabric-1.15.2/build.gradle +++ b/implementations/fabric-1.15.2/build.gradle @@ -47,7 +47,7 @@ shadowJar { relocate 'com.github.benmanes.caffeine', 'de.bluecolored.shadow.benmanes.caffeine' relocate 'com.google.errorprone', 'de.bluecolored.shadow.google.errorprone' relocate 'org.aopalliance', 'de.bluecolored.shadow.aopalliance' - relocate 'javax.inject', 'de.bluecolored.javax.inject' + relocate 'javax.inject', 'de.bluecolored.shadow.javax.inject' relocate 'com.google.inject', 'de.bluecolored.shadow.google.inject' relocate 'org.checkerframework', 'de.bluecolored.shadow.checkerframework' relocate 'org.codehaus', 'de.bluecolored.shadow.codehaus' diff --git a/implementations/fabric-1.16.1/build.gradle b/implementations/fabric-1.16.1/build.gradle index 649ff20b..7f4ad7f8 100644 --- a/implementations/fabric-1.16.1/build.gradle +++ b/implementations/fabric-1.16.1/build.gradle @@ -47,7 +47,7 @@ shadowJar { relocate 'com.github.benmanes.caffeine', 'de.bluecolored.shadow.benmanes.caffeine' relocate 'com.google.errorprone', 'de.bluecolored.shadow.google.errorprone' relocate 'org.aopalliance', 'de.bluecolored.shadow.aopalliance' - relocate 'javax.inject', 'de.bluecolored.javax.inject' + relocate 'javax.inject', 'de.bluecolored.shadow.javax.inject' relocate 'com.google.inject', 'de.bluecolored.shadow.google.inject' relocate 'org.checkerframework', 'de.bluecolored.shadow.checkerframework' relocate 'org.codehaus', 'de.bluecolored.shadow.codehaus' diff --git a/implementations/fabric-1.16.2/build.gradle b/implementations/fabric-1.16.2/build.gradle index f304b7c8..cc41c788 100644 --- a/implementations/fabric-1.16.2/build.gradle +++ b/implementations/fabric-1.16.2/build.gradle @@ -47,7 +47,7 @@ shadowJar { relocate 'com.github.benmanes.caffeine', 'de.bluecolored.shadow.benmanes.caffeine' relocate 'com.google.errorprone', 'de.bluecolored.shadow.google.errorprone' relocate 'org.aopalliance', 'de.bluecolored.shadow.aopalliance' - relocate 'javax.inject', 'de.bluecolored.javax.inject' + relocate 'javax.inject', 'de.bluecolored.shadow.javax.inject' relocate 'com.google.inject', 'de.bluecolored.shadow.google.inject' relocate 'org.checkerframework', 'de.bluecolored.shadow.checkerframework' relocate 'org.codehaus', 'de.bluecolored.shadow.codehaus' diff --git a/implementations/forge-1.14.4/build.gradle b/implementations/forge-1.14.4/build.gradle index ba914a9d..02d541b3 100644 --- a/implementations/forge-1.14.4/build.gradle +++ b/implementations/forge-1.14.4/build.gradle @@ -45,7 +45,7 @@ build.dependsOn shadowJar { relocate 'com.github.benmanes.caffeine', 'de.bluecolored.shadow.benmanes.caffeine' relocate 'com.google.errorprone', 'de.bluecolored.shadow.google.errorprone' relocate 'org.aopalliance', 'de.bluecolored.shadow.aopalliance' - relocate 'javax.inject', 'de.bluecolored.javax.inject' + relocate 'javax.inject', 'de.bluecolored.shadow.javax.inject' relocate 'com.google.inject', 'de.bluecolored.shadow.google.inject' relocate 'org.checkerframework', 'de.bluecolored.shadow.checkerframework' relocate 'org.codehaus', 'de.bluecolored.shadow.codehaus' diff --git a/implementations/forge-1.15.2/build.gradle b/implementations/forge-1.15.2/build.gradle index 69e872e4..81e5cb3e 100644 --- a/implementations/forge-1.15.2/build.gradle +++ b/implementations/forge-1.15.2/build.gradle @@ -45,7 +45,7 @@ build.dependsOn shadowJar { relocate 'com.github.benmanes.caffeine', 'de.bluecolored.shadow.benmanes.caffeine' relocate 'com.google.errorprone', 'de.bluecolored.shadow.google.errorprone' relocate 'org.aopalliance', 'de.bluecolored.shadow.aopalliance' - relocate 'javax.inject', 'de.bluecolored.javax.inject' + relocate 'javax.inject', 'de.bluecolored.shadow.javax.inject' relocate 'com.google.inject', 'de.bluecolored.shadow.google.inject' relocate 'org.checkerframework', 'de.bluecolored.shadow.checkerframework' relocate 'org.codehaus', 'de.bluecolored.shadow.codehaus' diff --git a/implementations/forge-1.16.2/build.gradle b/implementations/forge-1.16.2/build.gradle index b6beee92..f71e5339 100644 --- a/implementations/forge-1.16.2/build.gradle +++ b/implementations/forge-1.16.2/build.gradle @@ -45,7 +45,7 @@ build.dependsOn shadowJar { relocate 'com.github.benmanes.caffeine', 'de.bluecolored.shadow.benmanes.caffeine' relocate 'com.google.errorprone', 'de.bluecolored.shadow.google.errorprone' relocate 'org.aopalliance', 'de.bluecolored.shadow.aopalliance' - relocate 'javax.inject', 'de.bluecolored.javax.inject' + relocate 'javax.inject', 'de.bluecolored.shadow.javax.inject' relocate 'com.google.inject', 'de.bluecolored.shadow.google.inject' relocate 'org.checkerframework', 'de.bluecolored.shadow.checkerframework' relocate 'org.codehaus', 'de.bluecolored.shadow.codehaus' diff --git a/implementations/spigot/build.gradle b/implementations/spigot/build.gradle index fa0c3936..479efa46 100644 --- a/implementations/spigot/build.gradle +++ b/implementations/spigot/build.gradle @@ -35,7 +35,7 @@ build.dependsOn shadowJar { relocate 'com.github.benmanes.caffeine', 'de.bluecolored.shadow.benmanes.caffeine' relocate 'com.google.errorprone', 'de.bluecolored.shadow.google.errorprone' relocate 'org.aopalliance', 'de.bluecolored.shadow.aopalliance' - relocate 'javax.inject', 'de.bluecolored.javax.inject' + relocate 'javax.inject', 'de.bluecolored.shadow.javax.inject' relocate 'com.google.inject', 'de.bluecolored.shadow.google.inject' relocate 'org.checkerframework', 'de.bluecolored.shadow.checkerframework' relocate 'org.codehaus', 'de.bluecolored.shadow.codehaus'