v1.0.2: Replaced embedded libraries with single patched class

Aivean · Jul 18, 2015 · 44b2104 · 44b2104
1 parent fa9108c
commit 44b2104
Show file tree

Hide file tree

Showing 6 changed files with 800 additions and 25 deletions.
diff --git a/lib/procyon-compilertools-0.5.29.jar b/lib/procyon-compilertools-0.5.29.jar
diff --git a/lib/procyon-core-0.5.29.jar b/lib/procyon-core-0.5.29.jar
diff --git a/lib/procyon-decompiler-0.5.29.jar b/lib/procyon-decompiler-0.5.29.jar
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.github.scalatojava</groupId>
     <artifactId>scala-to-java</artifactId>
-    <version>1.0.1</version>
+    <version>1.0.2</version>
 
     <packaging>jar</packaging>
     <properties>
@@ -43,31 +43,10 @@
             <artifactId>scala-reflect</artifactId>
             <version>${scala.version}</version>
         </dependency>
-        <!--<dependency>-->
-            <!--<groupId>org.bitbucket.mstrobel</groupId>-->
-            <!--<artifactId>procyon-compilertools</artifactId>-->
-            <!--<version>0.5.29</version>-->
-        <!--</dependency>-->
         <dependency>
             <groupId>org.bitbucket.mstrobel</groupId>
             <artifactId>procyon-compilertools</artifactId>
             <version>0.5.29</version>
-            <scope>system</scope>
-            <systemPath>${project.basedir}/lib/procyon-compilertools-0.5.29.jar</systemPath>
-        </dependency>
-        <dependency>
-            <groupId>org.bitbucket.mstrobel</groupId>
-            <artifactId>procyon-core</artifactId>
-            <version>0.5.29</version>
-            <scope>system</scope>
-            <systemPath>${project.basedir}/lib/procyon-core-0.5.29.jar</systemPath>
-        </dependency>
-        <dependency>
-            <groupId>org.bitbucket.mstrobel</groupId>
-            <artifactId>procyon-decompiler</artifactId>
-            <version>0.5.29</version>
-            <scope>system</scope>
-            <systemPath>${project.basedir}/lib/procyon-decompiler-0.5.29.jar</systemPath>
         </dependency>
         <dependency>
             <groupId>org.scalatest</groupId>
@@ -155,9 +134,11 @@
                             <mainClass>com.github.scalatojava.Main</mainClass>
                         </manifest>
                     </archive>
-                    <descriptorRefs>
-                        <descriptorRef>jar-with-dependencies</descriptorRef>
-                    </descriptorRefs>
+                    <descriptors>
+                        <descriptor>
+                            src/assembly/jar-with-dependencies-override.xml
+                        </descriptor>
+                    </descriptors>
                     <finalName>scala-to-java</finalName>
                     <appendAssemblyId>false</appendAssemblyId>
                 </configuration>

diff --git a/src/assembly/jar-with-dependencies-override.xml b/src/assembly/jar-with-dependencies-override.xml
@@ -0,0 +1,25 @@
+<assembly
+        xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3
+        http://maven.apache.org/xsd/assembly-1.1.3.xsd">
+    <id>jar-with-dependencies-override</id>
+    <formats>
+        <format>jar</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <dependencySets>
+        <dependencySet>
+            <outputDirectory>/</outputDirectory>
+            <useProjectArtifact>true</useProjectArtifact>
+            <unpack>true</unpack>
+            <scope>runtime</scope>
+        </dependencySet>
+    </dependencySets>
+    <fileSets>
+        <fileSet>
+            <directory>${project.build.directory}/classes</directory>
+            <outputDirectory>/</outputDirectory>
+        </fileSet>
+    </fileSets>
+</assembly>