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.
master
Graham 5 years ago
parent 475965ac85
commit 2debabbdcd
  1. 3
      .gitmodules
  2. 9
      decompiler/pom.xml
  3. 1
      fernflower
  4. 18
      pom.xml

3
.gitmodules vendored

@ -1,3 +0,0 @@
[submodule "fernflower"]
path = fernflower
url = https://github.com/openrs2/fernflower.git

@ -14,11 +14,6 @@
<name>OpenRS2 Decompiler</name> <name>OpenRS2 Decompiler</name>
<dependencies> <dependencies>
<dependency>
<groupId>dev.openrs2</groupId>
<artifactId>openrs2-fernflower</artifactId>
<version>${project.version}</version>
</dependency>
<dependency> <dependency>
<groupId>dev.openrs2</groupId> <groupId>dev.openrs2</groupId>
<artifactId>openrs2-util</artifactId> <artifactId>openrs2-util</artifactId>
@ -28,5 +23,9 @@
<groupId>ch.qos.logback</groupId> <groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId> <artifactId>logback-classic</artifactId>
</dependency> </dependency>
<dependency>
<groupId>dev.openrs2</groupId>
<artifactId>fernflower</artifactId>
</dependency>
</dependencies> </dependencies>
</project> </project>

@ -1 +0,0 @@
Subproject commit e4d2d24f9b4d074d3f8c43d3d659535c4f7b15eb

@ -14,7 +14,6 @@
<module>decompiler</module> <module>decompiler</module>
<module>deob</module> <module>deob</module>
<module>deob-annotations</module> <module>deob-annotations</module>
<module>fernflower</module>
<module>game</module> <module>game</module>
<module>gl-natives</module> <module>gl-natives</module>
<module>util</module> <module>util</module>
@ -51,6 +50,11 @@
<artifactId>asm</artifactId> <artifactId>asm</artifactId>
<version>7.1</version> <version>7.1</version>
</dependency> </dependency>
<dependency>
<groupId>dev.openrs2</groupId>
<artifactId>fernflower</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency> <dependency>
<groupId>org.ow2.asm</groupId> <groupId>org.ow2.asm</groupId>
<artifactId>asm-commons</artifactId> <artifactId>asm-commons</artifactId>
@ -71,24 +75,12 @@
<artifactId>slf4j-api</artifactId> <artifactId>slf4j-api</artifactId>
<version>1.7.26</version> <version>1.7.26</version>
</dependency> </dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.13.1</version>
<scope>test</scope>
</dependency>
<dependency> <dependency>
<groupId>org.junit.jupiter</groupId> <groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId> <artifactId>junit-jupiter</artifactId>
<version>5.5.1</version> <version>5.5.1</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>

Loading…
Cancel
Save