From 2debabbdcd3c346f59cbe54a06920801465a6902 Mon Sep 17 00:00:00 2001 From: Graham Date: Sat, 10 Aug 2019 11:51:52 +0100 Subject: [PATCH] Remove fernflower submodule I think it's simpler for our Fernflower fork to be a standalone project that we pull in via a normal Maven dependency. --- .gitmodules | 3 --- decompiler/pom.xml | 9 ++++----- fernflower | 1 - pom.xml | 18 +++++------------- 4 files changed, 9 insertions(+), 22 deletions(-) delete mode 100644 .gitmodules delete mode 160000 fernflower diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 11f2650d5f..0000000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "fernflower"] - path = fernflower - url = https://github.com/openrs2/fernflower.git diff --git a/decompiler/pom.xml b/decompiler/pom.xml index 2f67e781a0..0c0dc6faf0 100644 --- a/decompiler/pom.xml +++ b/decompiler/pom.xml @@ -14,11 +14,6 @@ OpenRS2 Decompiler - - dev.openrs2 - openrs2-fernflower - ${project.version} - dev.openrs2 openrs2-util @@ -28,5 +23,9 @@ ch.qos.logback logback-classic + + dev.openrs2 + fernflower + diff --git a/fernflower b/fernflower deleted file mode 160000 index e4d2d24f9b..0000000000 --- a/fernflower +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e4d2d24f9b4d074d3f8c43d3d659535c4f7b15eb diff --git a/pom.xml b/pom.xml index 151545ac87..5f0723e4ad 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,6 @@ decompiler deob deob-annotations - fernflower game gl-natives util @@ -51,6 +50,11 @@ asm 7.1 + + dev.openrs2 + fernflower + 1.0.0-SNAPSHOT + org.ow2.asm asm-commons @@ -71,24 +75,12 @@ slf4j-api 1.7.26 - - org.assertj - assertj-core - 3.13.1 - test - org.junit.jupiter junit-jupiter 5.5.1 test - - junit - junit - 4.12 - test -