diff --git a/Salawat.desktop b/Salawat.desktop
new file mode 100644
index 0000000..ed41304
--- /dev/null
+++ b/Salawat.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Categories=Utility;Eduction;
+Exec=salawat
+GenericName=Prayer times (adhan) app
+Icon=io.github.dbchoco.Salawat
+Keywords=athan;azan;adhan;islam;prayer;
+Name=Salawat
+StartupNotify=true
+StartupWMClass=salawat
+Terminal=false
+Type=Application
\ No newline at end of file
diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml
index 6d5c692..38d826c 100644
--- a/dependency-reduced-pom.xml
+++ b/dependency-reduced-pom.xml
@@ -4,7 +4,7 @@
io.github.dbchoco
Salawat
Salawat
- 1.0
+ 1.0.0
Prayer times (Adhan) app that is higly customizable and light weight.
Available for Windows and GNU/Linux.
@@ -17,8 +17,8 @@
maven-compiler-plugin
3.9.0
-
- 18
+
+ 17
@@ -71,13 +71,14 @@
io.github.dbchoco.Salawat.FakeMain
- false
- false
+ true
+ true
${project.build.directory}/${project.artifactId}-${project.version}.jar
true
false
true
auto
+ Salawat.desktop
src/main/resources/io/github/dbchoco/Salawat/images/icon.png
@@ -107,6 +108,40 @@
+
+
+ flatpak
+
+
+
+ io.github.fvarrui
+ javapackager
+ 1.6.6
+
+
+
+ io.github.dbchoco.Salawat.FakeMain
+ true
+ true
+ ${project.build.directory}/${project.artifactId}-${project.version}.jar
+ true
+ false
+ true
+ auto
+ Salawat.desktop
+
+ src/main/resources/io/github/dbchoco/Salawat/images/icon.png
+ false
+ false
+
+
+
+
+
+
+
+
+
org.junit.jupiter
diff --git a/flathub/.gitignore b/flathub/.gitignore
new file mode 100644
index 0000000..51ab4d3
--- /dev/null
+++ b/flathub/.gitignore
@@ -0,0 +1,2 @@
+.flatpak-builder
+dist
\ No newline at end of file
diff --git a/flathub/io.github.dbchoco.Salawat.yml b/flathub/io.github.dbchoco.Salawat.yml
index f51cda3..fac3f84 100644
--- a/flathub/io.github.dbchoco.Salawat.yml
+++ b/flathub/io.github.dbchoco.Salawat.yml
@@ -2,6 +2,8 @@ app-id: io.github.dbchoco.Salawat
runtime: org.freedesktop.Platform
runtime-version: '21.08'
sdk: org.freedesktop.Sdk
+sdk-extensions:
+ - org.freedesktop.Sdk.Extension.openjdk17
command: salawat
separate-locales: false
finish-args:
@@ -9,25 +11,46 @@ finish-args:
- --socket=x11
- --socket=pulseaudio
- --share=network
+ - --env=PATH=/app/jre/bin:/app/bin:/usr/bin
+ - --env=JAVA_HOME=/app/jre
modules:
- name: salawat
buildsystem: simple
+ build-options:
+ env:
+ PATH: /app/bin:/usr/bin:/usr/lib/sdk/openjdk17/bin
+ MAVEN_OPTS: -Dmaven.repo.local=.m2/repository
+ JAVA_HOME: /usr/lib/sdk/openjdk17/jvm/openjdk-17
build-commands:
- install --directory --mode=0755 /app/salawat
- - install -Dm644 --target-directory=/app/salawat/ Salawat/*
+ - cp -r Salawat/* /app/salawat/
- install -Dm755 salawat.sh /app/bin/salawat
- - ls Salawat/
- - install -Dm644 Salawat/icon.png /app/share/icons/hicolor/128x128/apps/$FLATPAK_ID.png
+ - install -Dm644 Salawat/icon.png /app/share/icons/hicolor/512x512/apps/$FLATPAK_ID.png
- install -Dm644 Salawat/Salawat.desktop /app/share/applications/${FLATPAK_ID}.desktop
- - install -Dm644 io.github.dbchoco.Salawat.metainfo.xml /app/share/metainfo/$FLATPAK_ID.appdata.xml
+ - install -Dm644 io.github.dbchoco.Salawat.metainfo.xml /app/share/metainfo/$FLATPAK_ID.metainfo.xml
+
+ - mvn clean package -DpackagingPhase=none
+ - install -Dm755 -t "${FLATPAK_DEST}/bin" "es.estoes.wallpaperDownloader.sh"
+ - install -Dm644 -t "${FLATPAK_DEST}/share/es.estoes.wallpaperDownloader" "target/wallpaperdownloader.jar"
+ - install -Dm644 "deb/wallpaperdownloader.desktop" "${FLATPAK_DEST}/share/applications/es.estoes.wallpaperDownloader.desktop"
+ - install -Dm644 "deb/wallpaperdownloader.svg" "${FLATPAK_DEST}/share/icons/hicolor/scalable/apps/es.estoes.wallpaperDownloader.svg"
+ - install -Dm644 -t "${FLATPAK_DEST}/share/metainfo" "es.estoes.wallpaperDownloader.metainfo.xml"
+ - desktop-file-edit --remove-key=Version "${FLATPAK_DEST}/share/applications/es.estoes.wallpaperDownloader.desktop"
+ - desktop-file-edit --set-key=Exec --set-value="${FLATPAK_DEST}/bin/es.estoes.wallpaperDownloader.sh" "${FLATPAK_DEST}/share/applications/es.estoes.wallpaperDownloader.desktop"
+ - desktop-file-edit --set-icon=es.estoes.wallpaperDownloader "${FLATPAK_DEST}/share/applications/es.estoes.wallpaperDownloader.desktop"
sources:
- type: archive
- url: https://github.com/DBChoco/Salawat/releases/download/v1.0.0/Salawat-1.0-linux.tar.gz
- sha256: 59820046b3f3acd6aaefb6080c7c7e078fc8777d508022d6004d66cb2ac975fb
+ url: https://github.com/DBChoco/Salawat/releases/download/v1.0.0/Salawat-1.0.0-linux.tar.gz
+ sha256: 1fcc9201e9456e55a5cb40d53cad7aca4dd52784334ac1e912a75193ee9f09c9
dest: Salawat
- type: file
path: io.github.dbchoco.Salawat.metainfo.xml
- type: file
path: salawat.sh
-
+ - maven-dependencies.yaml
+ modules:
+ - name: openjdk
+ buildsystem: simple
+ build-commands:
+ - /usr/lib/sdk/openjdk17/install.sh
diff --git a/pom.xml b/pom.xml
index 4370a4f..f555d98 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
io.github.dbchoco
Salawat
- 1.0
+ 1.0.0
Salawat
Prayer times (Adhan) app that is higly customizable and light weight.
Available for Windows and GNU/Linux.
@@ -79,8 +79,8 @@
maven-compiler-plugin
3.9.0
-
- 18
+
+ 17
@@ -140,13 +140,14 @@
io.github.dbchoco.Salawat.FakeMain
- false
- false
+ true
+ true
${project.build.directory}/${project.artifactId}-${project.version}.jar
true
false
true
auto
+ Salawat.desktop
src/main/resources/io/github/dbchoco/Salawat/images/icon.png
@@ -184,7 +185,43 @@
-
+
+
+ flatpak
+
+
+
+ io.github.fvarrui
+ javapackager
+ 1.6.6
+
+
+
+
+ io.github.dbchoco.Salawat.FakeMain
+
+ true
+ true
+ ${project.build.directory}/${project.artifactId}-${project.version}.jar
+ true
+ false
+ false
+ auto
+ Salawat.desktop
+
+ src/main/resources/io/github/dbchoco/Salawat/images/icon.png
+ false
+ false
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file