Merge branch 'master' into release

.github/workflows/release.yml

@@ -5,7 +5,7 @@ on:
     branches: [ release ]
 
 jobs:
-  release:
+  release-windows:
 
     runs-on: windows-latest
 
@@ -19,6 +19,7 @@ jobs:
     - name: Build with Maven
       run: |
         mvn -B package
+        mvn -B jpackage:jpackage@win
         $version= mvn help:evaluate -Dexpression="project.version" -q -DforceStdout
         echo "VERSION=$version" >> $env:GITHUB_ENV
         echo "Release version $version" > CHANGELOG
@@ -33,3 +34,29 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         GITHUB_REPOSITORY: jameshball/osci-render
+
+  release-mac:
+
+    runs-on: macos-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up JDK 15
+        uses: actions/setup-java@v2
+        with:
+          java-version: '15'
+          distribution: 'adopt'
+      - name: Build with Maven
+        run: |
+          mvn -B package
+          mvn -B jpackage:jpackage@mac
+          version=$(mvn help:evaluate -Dexpression="project.version" -q -DforceStdout)
+          echo "VERSION=$version" >> $GITHUB_ENV
+      - name: Release
+        uses: softprops/action-gh-release@v1
+        with:
+          tag_name: v${{ env.VERSION }}
+          files: target/osci-render-${{ env.VERSION }}.dmg
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_REPOSITORY: jameshball/osci-render

README.md

@@ -10,7 +10,7 @@ Some of this was built as part of a 24hr hackathon: IC Hack 20. The original rep
 
 ### Video Demonstration
 
-[![osci-render demonstration](https://img.youtube.com/vi/oEX0mnv6PLM/0.jpg)](https://www.youtube.com/watch?v=oEX0mnv6PLM)
+[![osci-render demonstration](https://img.youtube.com/vi/feQzC_Tz5K4/0.jpg)](https://www.youtube.com/watch?v=feQzC_Tz5K4)
 
 ## Current Features
 

pom.xml

@@ -126,16 +126,18 @@
                 <executions>
                     <execution>
                         <id>win</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>jpackage</goal>
-                        </goals>
                         <configuration>
                             <icon>src/main/resources/icons/icon.ico</icon>
                             <winMenu>true</winMenu>
                             <winMenuGroup>osci-render</winMenuGroup>
                         </configuration>
                     </execution>
+                    <execution>
+                        <id>mac</id>
+                        <configuration>
+                            <icon>src/main/resources/icons/icon.icns</icon>
+                        </configuration>
+                    </execution>
                 </executions>
             </plugin>
             <plugin>