From b777a6bd988996c8847fd8d1296802d3b59d13f1 Mon Sep 17 00:00:00 2001
From: jespergravgaard <jesper@balmangravgaard.dk>
Date: Wed, 26 Sep 2018 19:57:15 +0200
Subject: [PATCH] Updated libraries. Added packaging assembly to maven POM.

---
 ... => Maven__info_picocli_picocli_3_6_0.xml} |  8 ++---
 .../libraries/Maven__org_antlr_antlr4_4_7.xml | 13 --------
 .../Maven__org_antlr_antlr4_4_7_1.xml         | 13 ++++++++
 ...Maven__org_antlr_antlr4_runtime_4_7_1.xml} |  8 ++---
 .idea/libraries/org_antlr_antlr4_4_7_1.xml    | 32 ++++++++++++++++++
 .../org_antlr_antlr4_runtime_4_7_1.xml        | 14 ++++++++
 kickc.iml                                     | 24 +++++++-------
 pom.xml                                       | 19 +++++++----
 src/main/assembly/assembly.xml                | 33 +++++++++++++++++++
 src/main/java/dk/camelot64/kickc/KickC.java   |  5 ++-
 10 files changed, 128 insertions(+), 41 deletions(-)
 rename .idea/libraries/{Maven__info_picocli_picocli_3_5_2.xml => Maven__info_picocli_picocli_3_6_0.xml} (68%)
 delete mode 100644 .idea/libraries/Maven__org_antlr_antlr4_4_7.xml
 create mode 100644 .idea/libraries/Maven__org_antlr_antlr4_4_7_1.xml
 rename .idea/libraries/{Maven__org_antlr_antlr4_runtime_4_7.xml => Maven__org_antlr_antlr4_runtime_4_7_1.xml} (63%)
 create mode 100644 .idea/libraries/org_antlr_antlr4_4_7_1.xml
 create mode 100644 .idea/libraries/org_antlr_antlr4_runtime_4_7_1.xml
 create mode 100644 src/main/assembly/assembly.xml

diff --git a/.idea/libraries/Maven__info_picocli_picocli_3_5_2.xml b/.idea/libraries/Maven__info_picocli_picocli_3_6_0.xml
similarity index 68%
rename from .idea/libraries/Maven__info_picocli_picocli_3_5_2.xml
rename to .idea/libraries/Maven__info_picocli_picocli_3_6_0.xml
index b0f17c8fc..bd18a6cb1 100644
--- a/.idea/libraries/Maven__info_picocli_picocli_3_5_2.xml
+++ b/.idea/libraries/Maven__info_picocli_picocli_3_6_0.xml
@@ -1,13 +1,13 @@
 <component name="libraryTable">
-  <library name="Maven: info.picocli:picocli:3.5.2">
+  <library name="Maven: info.picocli:picocli:3.6.0">
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/info/picocli/picocli/3.5.2/picocli-3.5.2.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/info/picocli/picocli/3.6.0/picocli-3.6.0.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/info/picocli/picocli/3.5.2/picocli-3.5.2-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/info/picocli/picocli/3.6.0/picocli-3.6.0-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/info/picocli/picocli/3.5.2/picocli-3.5.2-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/info/picocli/picocli/3.6.0/picocli-3.6.0-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_antlr_antlr4_4_7.xml b/.idea/libraries/Maven__org_antlr_antlr4_4_7.xml
deleted file mode 100644
index 93dd5b455..000000000
--- a/.idea/libraries/Maven__org_antlr_antlr4_4_7.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.antlr:antlr4:4.7">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/antlr/antlr4/4.7/antlr4-4.7.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/antlr/antlr4/4.7/antlr4-4.7-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/antlr/antlr4/4.7/antlr4-4.7-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_antlr_antlr4_4_7_1.xml b/.idea/libraries/Maven__org_antlr_antlr4_4_7_1.xml
new file mode 100644
index 000000000..95934904a
--- /dev/null
+++ b/.idea/libraries/Maven__org_antlr_antlr4_4_7_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.antlr:antlr4:4.7.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/antlr/antlr4/4.7.1/antlr4-4.7.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/antlr/antlr4/4.7.1/antlr4-4.7.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/antlr/antlr4/4.7.1/antlr4-4.7.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_antlr_antlr4_runtime_4_7.xml b/.idea/libraries/Maven__org_antlr_antlr4_runtime_4_7_1.xml
similarity index 63%
rename from .idea/libraries/Maven__org_antlr_antlr4_runtime_4_7.xml
rename to .idea/libraries/Maven__org_antlr_antlr4_runtime_4_7_1.xml
index 5b74a7f8e..4fc437abb 100644
--- a/.idea/libraries/Maven__org_antlr_antlr4_runtime_4_7.xml
+++ b/.idea/libraries/Maven__org_antlr_antlr4_runtime_4_7_1.xml
@@ -1,13 +1,13 @@
 <component name="libraryTable">
-  <library name="Maven: org.antlr:antlr4-runtime:4.7">
+  <library name="Maven: org.antlr:antlr4-runtime:4.7.1">
     <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/antlr/antlr4-runtime/4.7/antlr4-runtime-4.7.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/antlr/antlr4-runtime/4.7.1/antlr4-runtime-4.7.1.jar!/" />
     </CLASSES>
     <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/antlr/antlr4-runtime/4.7/antlr4-runtime-4.7-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/antlr/antlr4-runtime/4.7.1/antlr4-runtime-4.7.1-javadoc.jar!/" />
     </JAVADOC>
     <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/antlr/antlr4-runtime/4.7/antlr4-runtime-4.7-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/antlr/antlr4-runtime/4.7.1/antlr4-runtime-4.7.1-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/org_antlr_antlr4_4_7_1.xml b/.idea/libraries/org_antlr_antlr4_4_7_1.xml
new file mode 100644
index 000000000..199b0e3c1
--- /dev/null
+++ b/.idea/libraries/org_antlr_antlr4_4_7_1.xml
@@ -0,0 +1,32 @@
+<component name="libraryTable">
+  <library name="org.antlr:antlr4:4.7.1" type="repository">
+    <properties maven-id="org.antlr:antlr4:4.7.1" />
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/antlr/antlr4/4.7.1/antlr4-4.7.1.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/antlr/antlr4-runtime/4.7.1/antlr4-runtime-4.7.1.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/antlr/antlr-runtime/3.5.2/antlr-runtime-3.5.2.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/antlr/ST4/4.0.8/ST4-4.0.8.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/abego/treelayout/org.abego.treelayout.core/1.0.3/org.abego.treelayout.core-1.0.3.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/javax.json/1.0.4/javax.json-1.0.4.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/ibm/icu/icu4j/58.2/icu4j-58.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/antlr/antlr4/4.7.1/antlr4-4.7.1-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/antlr/antlr4-runtime/4.7.1/antlr4-runtime-4.7.1-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/antlr/antlr-runtime/3.5.2/antlr-runtime-3.5.2-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/antlr/ST4/4.0.8/ST4-4.0.8-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/abego/treelayout/org.abego.treelayout.core/1.0.3/org.abego.treelayout.core-1.0.3-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/javax.json/1.0.4/javax.json-1.0.4-javadoc.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/ibm/icu/icu4j/58.2/icu4j-58.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/antlr/antlr4/4.7.1/antlr4-4.7.1-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/antlr/antlr4-runtime/4.7.1/antlr4-runtime-4.7.1-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/antlr/antlr-runtime/3.5.2/antlr-runtime-3.5.2-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/antlr/ST4/4.0.8/ST4-4.0.8-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/abego/treelayout/org.abego.treelayout.core/1.0.3/org.abego.treelayout.core-1.0.3-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/glassfish/javax.json/1.0.4/javax.json-1.0.4-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/com/ibm/icu/icu4j/58.2/icu4j-58.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/org_antlr_antlr4_runtime_4_7_1.xml b/.idea/libraries/org_antlr_antlr4_runtime_4_7_1.xml
new file mode 100644
index 000000000..f3f783483
--- /dev/null
+++ b/.idea/libraries/org_antlr_antlr4_runtime_4_7_1.xml
@@ -0,0 +1,14 @@
+<component name="libraryTable">
+  <library name="org.antlr:antlr4-runtime:4.7.1" type="repository">
+    <properties maven-id="org.antlr:antlr4-runtime:4.7.1" />
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/antlr/antlr4-runtime/4.7.1/antlr4-runtime-4.7.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/antlr/antlr4-runtime/4.7.1/antlr4-runtime-4.7.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/antlr/antlr4-runtime/4.7.1/antlr4-runtime-4.7.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/kickc.iml b/kickc.iml
index 26524d0bf..41129d6c5 100644
--- a/kickc.iml
+++ b/kickc.iml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
@@ -11,16 +11,18 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: org.antlr:antlr4:4.7" level="project" />
-    <orderEntry type="library" name="Maven: org.antlr:antlr4-runtime:4.7" level="project" />
-    <orderEntry type="library" name="Maven: org.antlr:antlr-runtime:3.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.antlr:ST4:4.0.8" level="project" />
-    <orderEntry type="library" name="Maven: org.abego.treelayout:org.abego.treelayout.core:1.0.3" level="project" />
-    <orderEntry type="library" name="Maven: org.glassfish:javax.json:1.0.4" level="project" />
-    <orderEntry type="library" name="Maven: com.ibm.icu:icu4j:58.2" level="project" />
-    <orderEntry type="library" name="Maven: junit:junit:4.12" level="project" />
-    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
+    <orderEntry type="library" name="org.antlr:antlr4:4.7.1" level="project" />
+    <orderEntry type="library" name="org.antlr:antlr4-runtime:4.7.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.antlr:antlr4:4.7.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.antlr:antlr-runtime:3.5.2" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.antlr:ST4:4.0.8" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.abego.treelayout:org.abego.treelayout.core:1.0.3" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.glassfish:javax.json:1.0.4" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.ibm.icu:icu4j:58.2" level="project" />
+    <orderEntry type="library" name="Maven: org.antlr:antlr4-runtime:4.7.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
     <orderEntry type="library" name="Maven: cml.kickass:kickassembler:4.19" level="project" />
-    <orderEntry type="library" name="Maven: info.picocli:picocli:3.5.2" level="project" />
+    <orderEntry type="library" name="Maven: info.picocli:picocli:3.6.0" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 1602531a3..2a8b3e619 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
-        <argLine> -Xmx2048m</argLine>
+        <argLine>-Xmx2048m</argLine>
     </properties>
 
     <repositories>
@@ -26,12 +26,19 @@
         <dependency>
             <groupId>org.antlr</groupId>
             <artifactId>antlr4</artifactId>
-            <version>4.7</version>
+            <version>4.7.1</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.antlr</groupId>
+            <artifactId>antlr4-runtime</artifactId>
+            <version>4.7.1</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <version>4.12</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>cml.kickass</groupId>
@@ -41,7 +48,7 @@
         <dependency>
             <groupId>info.picocli</groupId>
             <artifactId>picocli</artifactId>
-            <version>3.5.2</version>
+            <version>3.6.0</version>
         </dependency>
     </dependencies>
 
@@ -113,9 +120,9 @@
                 <artifactId>maven-assembly-plugin</artifactId>
                 <version>3.1.0</version>
                 <configuration>
-                    <descriptorRefs>
-                        <descriptorRef>bin</descriptorRef>
-                    </descriptorRefs>
+                    <descriptors>
+                        <descriptor>src/main/assembly/assembly.xml</descriptor>
+                    </descriptors>
                 </configuration>
                 <executions>
                     <execution>
diff --git a/src/main/assembly/assembly.xml b/src/main/assembly/assembly.xml
new file mode 100644
index 000000000..985de778d
--- /dev/null
+++ b/src/main/assembly/assembly.xml
@@ -0,0 +1,33 @@
+<assembly>
+    <id>bin</id>
+    <!-- Specifies that our binary distribution is a zip package -->
+    <formats>
+        <format>zip</format>
+    </formats>
+
+    <!-- Adds the dependencies of our application to the lib directory -->
+    <dependencySets>
+        <dependencySet>
+            <useProjectArtifact>false</useProjectArtifact>
+            <outputDirectory>lib</outputDirectory>
+            <unpack>false</unpack>
+        </dependencySet>
+    </dependencySets>
+
+    <fileSets>
+        <fileSet>
+            <directory>src/main/kc/stdlib</directory>
+            <outputDirectory>stdlib</outputDirectory>
+            <includes>
+                <include>*.kc</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>${project.build.directory}</directory>
+            <outputDirectory>lib</outputDirectory>
+            <includes>
+                <include>*.jar</include>
+            </includes>
+        </fileSet>
+    </fileSets>
+</assembly>
\ No newline at end of file
diff --git a/src/main/java/dk/camelot64/kickc/KickC.java b/src/main/java/dk/camelot64/kickc/KickC.java
index 60fb599f2..53f8705b9 100644
--- a/src/main/java/dk/camelot64/kickc/KickC.java
+++ b/src/main/java/dk/camelot64/kickc/KickC.java
@@ -1,5 +1,6 @@
 package dk.camelot64.kickc;
 
+import dk.camelot64.kickc.model.CompileError;
 import dk.camelot64.kickc.model.Program;
 import kickass.KickAssembler;
 import picocli.CommandLine;
@@ -9,8 +10,6 @@ import java.nio.file.*;
 import java.util.List;
 import java.util.concurrent.Callable;
 
-import static junit.framework.TestCase.fail;
-
 /** KickC Commandline */
 @CommandLine.Command(
       description = "Compiles a KickC source file, creating a KickAssembler source file. " +
@@ -117,7 +116,7 @@ public class KickC implements Callable<Void> {
          int kasmResult = KickAssembler.main2(new String[]{asmPath.toString(), "-log", kasmLogPath.toString(), "-o", prgPath.toString(), "-vicesymbols", "-showmem"});
          System.setOut(new PrintStream(new FileOutputStream(FileDescriptor.out)));
          if(kasmResult != 0) {
-            fail("KickAssembling file failed! " + kasmLogOutputStream.toString());
+            throw new CompileError("KickAssembling file failed! " + kasmLogOutputStream.toString());
          }
       }