Merge pull request #27 from cassidyjames/flatpak

Release 2.0.0

.github/workflows/ci.yml

@@ -0,0 +1,45 @@
+name: CI
+
+on:
+  pull_request:
+    types:
+      - opened
+      - reopened
+      - synchronize
+
+jobs:
+  flatpak:
+    name: Flatpak
+    runs-on: ubuntu-latest
+
+    container:
+      image: ghcr.io/elementary/flatpak-platform/runtime:daily
+      options: --privileged
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Build
+        uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v3
+        with:
+          bundle: clairvoyant.flatpak
+          manifest-path: com.github.cassidyjames.clairvoyant.yml
+          run-tests: true
+          repository-name: appcenter
+          repository-url: https://flatpak.elementary.io/repo.flatpakrepo
+          cache-key: "flatpak-builder-${{ github.sha }}"
+
+  lint:
+    name: Lint
+    runs-on: ubuntu-latest
+
+    container:
+      image: valalang/lint
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Lint
+        run: io.elementary.vala-lint -d .

.github/workflows/gettext.yml

@@ -9,6 +9,8 @@ jobs:
     - uses: actions/checkout@v1
     - uses: elementary/actions/gettext-template@master
       env:
-        GITHUB_TOKEN: ${{ secrets.GIT_USER_TOKEN }}
+        GIT_USER_TOKEN: "${{ secrets.GIT_USER_TOKEN }}"
+        GIT_USER_NAME: "cassidyjames"
+        GIT_USER_EMAIL: "c@ssidyjam.es"
       with:
         translation_branch: 'main'

.github/workflows/release.yml

@@ -1,16 +1,26 @@
+---
+
 name: Release
+
 on:
   pull_request:
     branches: main
     types: closed
+
 jobs:
-  release:
-    runs-on: ubuntu-latest
-    if: github.event.pull_request.merged == true && true == contains(join(github.event.pull_request.labels.*.name), 'Release')
-    steps:
-    - uses: actions/checkout@v1
-    - uses: elementary/actions/release@master
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        release_branch: 'hera'
+  create_release:
+     name: Create Release
+     runs-on: ubuntu-latest
+
+     if: github.event.pull_request.merged == true && true == contains(join(github.event.pull_request.labels.*.name), 'Release')
+
+     steps:
+       - name: Checkout
+         uses: actions/checkout@v2
+
+       - name: Release
+         uses: elementary/actions/release@master
+         env:
+           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+         with:
+           release_branch: 'odin'

.gitignore

@@ -1,2 +1,3 @@
 *~
 build/
+.flatpak-builder/

com.github.cassidyjames.clairvoyant.yml

@@ -0,0 +1,15 @@
+app-id: com.github.cassidyjames.clairvoyant
+runtime: io.elementary.Platform
+runtime-version: '6'
+sdk: io.elementary.Sdk
+command: com.github.cassidyjames.clairvoyant
+finish-args:
+  - '--share=ipc'
+  - '--socket=fallback-x11'
+  - '--socket=wayland'
+modules:
+  - name: clairvoyant
+    buildsystem: meson
+    sources:
+      - type: dir
+        path: .

data/com.github.cassidyjames.clairvoyant.appdata.xml.in

@@ -30,6 +30,17 @@
     </screenshot>
   </screenshots>
   <releases>
+    <release version="2.0.0" date="2021-08-09">
+      <description>
+        <p>Hello, Odin</p>
+        <ul>
+          <li>Updated for OS 6 and Flatpak</li>
+          <li>Turkish translations thanks to Safak GENISOL</li>
+          <li>Portuguese translations thanks to André Barata</li>
+          <li>Spanish translations thanks to @kevincos5</li>
+        </ul>
+      </description>
+    </release>
     <release version="1.1.4" date="2020-02-20">
       <description>
         <p>Refreshed icons thanks to Micah Ilbery</p>
@@ -121,9 +132,10 @@
   <url type="help">https://cassidyjames.com/support</url>
   <!--url type="contact">https://cassidyjames.com/support</url-->
   <custom>
-    <value key="x-appcenter-color-primary">#fff</value>
-    <value key="x-appcenter-color-primary-text">#485a6c</value>
+    <value key="x-appcenter-color-primary">#0e141f</value>
+    <value key="x-appcenter-color-primary-text">#fff</value>
     <value key="x-appcenter-suggested-price">1</value>
+    <value key="x-appcenter-stripe">pk_live_MzEz9Fza8ow47eRWJUuXktda00xmU0FR9J</value>
   </custom>
 </component>
 

meson.build

@@ -1,7 +1,7 @@
 project(
     'com.github.cassidyjames.clairvoyant',
     'vala', 'c',
-    version: '1.1.4'
+    version: '2.0.0'
 )
 
 gnome = import('gnome')