Merge pull request #19 from jameshball/master

Add .jar to releases

.github/workflows/release.yml

@@ -5,7 +5,7 @@ on:
     branches: [ release ]
 
 jobs:
-  build:
+  release:
 
     runs-on: windows-latest
 
@@ -27,7 +27,9 @@ jobs:
       with:
         body_path: CHANGELOG
         tag_name: v${{ env.VERSION }}
-        files: target/osci-render-${{ env.VERSION }}.exe
+        files: |
+          target/osci-render-${{ env.VERSION }}.exe
+          target/osci-render-${{ env.VERSION }}.jar
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         GITHUB_REPOSITORY: jameshball/osci-render

pom.xml

@@ -36,6 +36,7 @@
             </plugin>
             <plugin>
                 <artifactId>maven-jar-plugin</artifactId>
+                <version>3.2.0</version>
                 <executions>
                     <execution>
                         <id>default-jar</id>
@@ -47,6 +48,29 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <mainClass>sh.ball.gui.Gui</mainClass>
+                        </manifest>
+                    </archive>
+                    <descriptorRefs>
+                        <descriptorRef>jar-with-dependencies</descriptorRef>
+                    </descriptorRefs>
+                    <appendAssemblyId>false</appendAssemblyId>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>make-assembly</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>

src/main/java/sh/ball/audio/effect/EventFactory.java

@@ -23,4 +23,14 @@ public class EventFactory {
     long tmp = Math.round(value);
     return (double) tmp / factor;
   }
+
+  public static Effect edgeStretch(double value) {
+    return (count, v) -> {
+      if (count % 2 == 0) {
+        return v.translate(new Vector2(value, 0));
+      } else {
+        return v.translate(new Vector2(-value, 0));
+      }
+    };
+  }
 }

src/main/java/sh/ball/gui/Controller.java

@@ -5,12 +5,10 @@ import sh.ball.audio.AudioPlayer;
 import sh.ball.audio.effect.Effect;
 import sh.ball.audio.FrameProducer;
 
-import java.awt.event.ActionListener;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
-import java.util.EventListener;
 import java.util.List;
 import java.util.Map;
 import java.util.ResourceBundle;
@@ -23,8 +21,6 @@ import javafx.fxml.Initializable;
 import javafx.stage.FileChooser;
 import javafx.stage.Stage;
 
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
 import javax.xml.parsers.ParserConfigurationException;
 
 import org.xml.sax.SAXException;