Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
hillelcoren committed Nov 1, 2023
2 parents 2cb8160 + 15a5157 commit 17d6125
Show file tree
Hide file tree
Showing 9 changed files with 14 additions and 14 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/flatpak.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
# cancel-in-progress: true

env:
project-id: com.invoiceninja.app
project-id: com.invoiceninja.InvoiceNinja

jobs:
build-flutter-app:
Expand Down Expand Up @@ -57,10 +57,10 @@ jobs:
cd build/linux/x64/release/bundle || exit
tar -czaf $archiveName ./*
shasum -a 256 $archiveName > Hash.txt
shasum -a 256 $archiveName > Hashes.txt
mv $archiveName "$baseDir"/
mv Hash.txt "$baseDir"/
mv Hashes.txt "$baseDir"/
- name: Upload app archive to workflow
uses: actions/upload-artifact@v3
Expand All @@ -72,7 +72,7 @@ jobs:
uses: actions/upload-artifact@v3
with:
name: Invoice-Ninja-Hash
path: Hash.txt
path: Hashes.txt

- name: Download artifacts
uses: actions/download-artifact@v3
Expand All @@ -86,7 +86,7 @@ jobs:
draft: false
prerelease: false
title: "Latest Release"
automatic_release_tag: "v5.0.128"
automatic_release_tag: "v5.0.129"
files: |
${{ github.workspace }}/artifacts/Invoice-Ninja-Archive
${{ github.workspace }}/artifacts/Invoice-Ninja-Hash
Expand Down
File renamed without changes
2 changes: 1 addition & 1 deletion bump_version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ echo "Bump version... $current_version => $new_vesion"
sed -i -e "s/version: 5.0.$current_version+$current_version/version: 5.0.$new_vesion+$new_vesion/g" ./pubspec.yaml
sed -i -e "s/version: 5.0.$current_version+$current_version/version: 5.0.$new_vesion+$new_vesion/g" ./pubspec.foss.yaml
sed -i -e "s/v5.0.$current_version/v5.0.$new_vesion/g" ./.github/workflows/flatpak.yml
sed -i -e 's/<releases>/<releases>\n <release version="5.0.'$new_vesion'" date="XXXX-XX-XX"\/>/g' ./flatpak/com.invoiceninja.app.metainfo.xml
sed -i -e 's/<releases>/<releases>\n <release version="5.0.'$new_vesion'" date="XXXX-XX-XX"\/>/g' ./flatpak/com.invoiceninja.InvoiceNinja.metainfo.xml
sed -i -e "s/kClientVersion = '5.0.$current_version'/kClientVersion = '5.0.$new_vesion'/g" ./lib/constants.dart
sed -i -e "s/version: '5.0.$current_version'/version: '5.0.$new_vesion'/g" ./snap/snapcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Name=Invoice Ninja
Comment=Create invoices, accept payments, track expenses & time tasks
Categories=Productivity;

Icon=com.invoiceninja.app
Icon=com.invoiceninja.InvoiceNinja
Exec=invoiceninja_client
Terminal=false
StartupWMClass=invoiceninja_client
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
https://www.freedesktop.org/software/appstream/metainfocreator/#/
-->
<component type="desktop-application">
<id>com.invoiceninja.app</id>
<id>com.invoiceninja.InvoiceNinja</id>
<name>Invoice Ninja</name>
<summary>Create invoices, accept payments, track expenses &amp; time tasks</summary>
<developer_name>Hillel Coren</developer_name>
Expand Down Expand Up @@ -39,14 +39,14 @@
All of these features combine to help you receive the money you deserve and reduce the amount of time you spend on repetitive invoicing tasks. Spend less time on paperwork and more time at your craft.
</p>
</description>
<launchable type="desktop-id">com.invoiceninja.app.desktop</launchable>
<launchable type="desktop-id">com.invoiceninja.InvoiceNinja.desktop</launchable>
<screenshots>
<screenshot type="default">
<image>https://github.com/invoiceninja/admin-portal/blob/master/samples/screenshots/5.png</image>
</screenshot>
</screenshots>
<content_rating type="oars-1.1"/>
<releases>
<release version="5.0.128" date="2023-11-01"/>
<release version="5.0.129" date="2023-11-01"/>
</releases>
</component>
2 changes: 1 addition & 1 deletion lib/constants.dart
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ class Constants {
}

// TODO remove version once #46609 is fixed
const String kClientVersion = '5.0.128';
const String kClientVersion = '5.0.129';
const String kMinServerVersion = '5.0.4';

const String kAppName = 'Invoice Ninja';
Expand Down
2 changes: 1 addition & 1 deletion pubspec.foss.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: invoiceninja_flutter
description: Client for Invoice Ninja
version: 5.0.128+128
version: 5.0.129+129
homepage: https://invoiceninja.com
documentation: https://invoiceninja.github.io
publish_to: none
Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: invoiceninja_flutter
description: Client for Invoice Ninja
version: 5.0.128+128
version: 5.0.129+129
homepage: https://invoiceninja.com
documentation: https://invoiceninja.github.io
publish_to: none
Expand Down
2 changes: 1 addition & 1 deletion snap/snapcraft.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: invoiceninja
version: '5.0.128'
version: '5.0.129'
summary: Create invoices, accept payments, track expenses & time tasks
description: "### Note: if the app fails to run using `snap run invoiceninja` it may help to run `/snap/invoiceninja/current/bin/invoiceninja` instead
Expand Down

0 comments on commit 17d6125

Please sign in to comment.