Merge pull request #32 from ZenHarbinger/staging

Update to 2.6.0
ZenHarbinger · Jan 13, 2017 · 5d957d5 · 5d957d5
2 parents 80d6038 + e223073
commit 5d957d5
Show file tree

Hide file tree

Showing 84 changed files with 2,266 additions and 255 deletions.
diff --git a/.gitignore b/.gitignore
@@ -19,6 +19,7 @@ snap/
 target/
 debian/
 
+*.java~
 *.class
 
 # Mobile Tools for Java (J2ME)

diff --git a/README.md b/README.md
@@ -69,5 +69,5 @@ mvn clean package
 ## Run
 
 ```sh
-java -jar target/torgo-1.5.0.jar
+java -jar target/torgo-1.6.0.jar
 ```
diff --git a/TorgoInstallBuilder.xml b/TorgoInstallBuilder.xml
@@ -1,7 +1,7 @@
 <project>
     <shortName>Torgo</shortName>
     <fullName>Torgo</fullName>
-    <version>1.5.0</version>
+    <version>1.6.0</version>
     <logoImage>src/main/resources/torgo-48x48.png</logoImage>
     <splashImage>src/main/resources/org/tros/images/splash.png</splashImage>
     <componentList>

diff --git a/circle.yml b/circle.yml
@@ -6,6 +6,10 @@ test:
     - mvn -DskipTests=false clean cobertura:cobertura
   post:
     - bash <(curl -s https://codecov.io/bash)
+general:
+  branches:
+    ignore:
+      - gh-pages
 #general:
 #  branches:
 #    only:

diff --git a/codecov.yml b/codecov.yml
@@ -14,7 +14,15 @@ coverage:
     patch: true
     project: true
   ignore:
+#auto-generated files
     - .*/antlr/.*
+    - .*/rsyntax/.*
+#contrib files
+    - .*/org/tros/torgo/swing/JConsole.*
+    - .*/org/tros/torgo/viz/SpringUtilities.*
+    - .*/org/tros/utils/swing/JLinkButton.*
+#literally untestable in junit
+    - .*/org/tros/torgo/MainSplash.*
 parsers:
   gcov:
     branch_detection:

diff --git a/licenseheader.txt b/licenseheader.txt
@@ -1,7 +1,7 @@
 <#if licenseFirst??>
 ${licenseFirst}
 </#if>
-${licensePrefix}Copyright 2015-2016 Matthew Aguirre
+${licensePrefix}Copyright 2015-2017 Matthew Aguirre
 ${licensePrefix}
 ${licensePrefix}Licensed under the Apache License, Version 2.0 (the "License");
 ${licensePrefix}you may not use this file except in compliance with the License.

diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.tros</groupId>
     <artifactId>torgo</artifactId>
-    <version>1.5.0</version>
+    <version>1.6.0</version>
     <packaging>jar</packaging>
     <name>torgo</name>
     <url>http://tros.org/torgo/</url>
@@ -166,6 +166,42 @@
                 </plugins>
             </build>
         </profile>
+        <profile>
+            <id>forMac</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+                <property>
+                    <name>build.app</name>
+                    <value>true</value>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>sh.tak.appbundler</groupId>
+                        <artifactId>appbundle-maven-plugin</artifactId>
+                        <version>1.2.0</version>
+                        <configuration>
+                            <mainClass>org.tros.torgo.Main</mainClass>
+                            <generateDiskImageFile>true</generateDiskImageFile>
+                            <iconFile>torgo.icns</iconFile>
+                            <jvmVersion>1.8+</jvmVersion>
+                            <version>${project.version}</version>
+                            <jvmOptions>Dsun.java2d.opengl=true</jvmOptions>
+                            <NSHumanReadableCopyright>2015-2017 Matthew Aguirre</NSHumanReadableCopyright>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>bundle</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
         <profile>
             <id>forWindows</id>
             <activation>
@@ -219,6 +255,18 @@
     </profiles>
     <build>
         <plugins>
+<!--            <plugin>
+                <groupId>de.jflex</groupId>
+                <artifactId>maven-jflex-plugin</artifactId>
+                <version>1.0</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>-->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
@@ -240,6 +288,7 @@
                         <param>org.apache.commons.beanutils.Converter</param>
                         <param>org.tros.utils.converters.ConverterRegister</param>
                         <param>org.tros.torgo.InterpreterVisualization</param>
+                        <param>org.fife.ui.rsyntaxtextarea.TokenMakerRegistration</param>
                     </services>
                 </configuration>
                 <executions>
@@ -312,7 +361,7 @@
                         <format>html</format>
                         <format>xml</format>
                     </formats>
-                    <check />
+                    <check/>
                 </configuration>
             </plugin>
         </plugins>
@@ -360,7 +409,7 @@
             <version>4.6</version>
         </dependency>
         <dependency>
-            <groupId>com.fifesoft</groupId>
+            <groupId>org.tros</groupId>
             <artifactId>rsyntaxtextarea</artifactId>
             <version>2.6.0</version>
         </dependency>

diff --git a/snapcraft.yaml b/snapcraft.yaml
@@ -1,5 +1,5 @@
 name: torgo
-version: 1.5.0
+version: 1.6.0
 summary: A Logo interpreter written in Java.
 description: A Logo interpreter written in Java.
 grade: stable
@@ -16,7 +16,7 @@ parts:
     plugin: maven
     source: .
     maven-options:
-      - -DskipTests
+      - -DskipTests=true
     stage-packages:
       - fontconfig-config
       - default-jdk

diff --git a/src/main/java/org/tros/logo/DynamicLogoController.java b/src/main/java/org/tros/logo/DynamicLogoController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 Matthew Aguirre
+ * Copyright 2015-2017 Matthew Aguirre
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/java/org/tros/logo/ExpressionListener.java b/src/main/java/org/tros/logo/ExpressionListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 Matthew Aguirre
+ * Copyright 2015-2017 Matthew Aguirre
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/java/org/tros/logo/LexicalListener.java b/src/main/java/org/tros/logo/LexicalListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 Matthew Aguirre
+ * Copyright 2015-2017 Matthew Aguirre
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/java/org/tros/logo/LexicalLogoController.java b/src/main/java/org/tros/logo/LexicalLogoController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 Matthew Aguirre
+ * Copyright 2015-2017 Matthew Aguirre
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/java/org/tros/logo/LogoBlock.java b/src/main/java/org/tros/logo/LogoBlock.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 Matthew Aguirre
+ * Copyright 2015-2017 Matthew Aguirre
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/java/org/tros/logo/LogoCanvas.java b/src/main/java/org/tros/logo/LogoCanvas.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 Matthew Aguirre
+ * Copyright 2015-2017 Matthew Aguirre
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/java/org/tros/logo/LogoController.java b/src/main/java/org/tros/logo/LogoController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 Matthew Aguirre
+ * Copyright 2015-2017 Matthew Aguirre
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/java/org/tros/logo/LogoFor.java b/src/main/java/org/tros/logo/LogoFor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 Matthew Aguirre
+ * Copyright 2015-2017 Matthew Aguirre
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/java/org/tros/logo/LogoFunction.java b/src/main/java/org/tros/logo/LogoFunction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 Matthew Aguirre
+ * Copyright 2015-2017 Matthew Aguirre
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/java/org/tros/logo/LogoIf.java b/src/main/java/org/tros/logo/LogoIf.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 Matthew Aguirre
+ * Copyright 2015-2017 Matthew Aguirre
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/java/org/tros/logo/LogoProg.java b/src/main/java/org/tros/logo/LogoProg.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 Matthew Aguirre
+ * Copyright 2015-2017 Matthew Aguirre
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/java/org/tros/logo/LogoRepeat.java b/src/main/java/org/tros/logo/LogoRepeat.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 Matthew Aguirre
+ * Copyright 2015-2017 Matthew Aguirre
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/java/org/tros/logo/LogoStatement.java b/src/main/java/org/tros/logo/LogoStatement.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 Matthew Aguirre
+ * Copyright 2015-2017 Matthew Aguirre
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.