diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8c9ab81..9ba232a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -42,6 +42,15 @@ jobs: with: name: 'doorsofdoom.apk' path: android-mvn/target/doorsofdoom.apk + - name: Build desktop + run: | + cd desktop-mvn + mvn --batch-mode -Dcartridge.artifactId=doorsofdoom -Dcartridge.groupId=com.github.msx80.omicron -Dcartridge.version=$GITHUB_DDVER clean package + - name: Deploy Desktop + uses: actions/upload-artifact@v4 + with: + name: 'doorsofdoom-desktop.jar' + path: desktop-mvn/target/doorsofdoom-desktop.jar - name: Deploy cartridge uses: actions/upload-artifact@v4 with: diff --git a/android-mvn/pom.xml b/android-mvn/pom.xml index 4e09f18..776abf5 100644 --- a/android-mvn/pom.xml +++ b/android-mvn/pom.xml @@ -21,7 +21,7 @@ 1.8 UTF-8 1.12.1 - 0.0.7 + 0.0.8 diff --git a/android-mvn/src/main/AndroidManifest.xml.template b/android-mvn/src/main/AndroidManifest.xml.template index 578c583..cc41eeb 100644 --- a/android-mvn/src/main/AndroidManifest.xml.template +++ b/android-mvn/src/main/AndroidManifest.xml.template @@ -19,5 +19,5 @@ android:label="Crash report" > - + diff --git a/desktop-mvn/assembly.xml b/desktop-mvn/assembly.xml new file mode 100644 index 0000000..77da693 --- /dev/null +++ b/desktop-mvn/assembly.xml @@ -0,0 +1,17 @@ + + desktop + + jar + + false + + + / + true + true + runtime + + + \ No newline at end of file diff --git a/desktop-mvn/pom.xml b/desktop-mvn/pom.xml new file mode 100644 index 0000000..e66bfa1 --- /dev/null +++ b/desktop-mvn/pom.xml @@ -0,0 +1,96 @@ + + + 4.0.0 + + com.github.msx80.omicron + desktop-wrapper + 1.0.0 + + + + + + + + 1.8 + 1.8 + UTF-8 + 1.12.1 + 0.0.8 + + + + + jitpack.io + https://jitpack.io + + + + + + ${cartridge.artifactId} + ${cartridge.groupId} + ${cartridge.version} + + + + com.github.msx80.omicron + desktop-lib + ${omicron.engine.version} + + + + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.13.0 + + + + + + + + + + maven-assembly-plugin + + + + com.github.msx80.omicron.MainLauncher + + + + assembly.xml + + ${cartridge.artifactId} + + + + make-assembly + package + + single + + + + + + + + diff --git a/doorsofdoom/pom.xml b/doorsofdoom/pom.xml index 2f5da73..877bf43 100644 --- a/doorsofdoom/pom.xml +++ b/doorsofdoom/pom.xml @@ -11,7 +11,7 @@ UTF-8 8 8 - 0.0.7 + 0.0.8 @@ -29,7 +29,7 @@ com.github.msx80 omicron-basics - 0.0.2 + 0.0.3 com.google.code.gson