Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
ereio committed Mar 12, 2022
2 parents eacca60 + 0fcb564 commit bb66c42
Show file tree
Hide file tree
Showing 11 changed files with 61 additions and 10 deletions.
10 changes: 5 additions & 5 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ trigger:
- push
steps:
- name: build android
image: cirrusci/flutter:2.8.1
image: cirrusci/flutter:2.10.3
commands:
# Keep track of the time when build was started
- echo $(date -Iseconds) > BUILD_START_TIME
Expand Down Expand Up @@ -61,7 +61,7 @@ trigger:
- push
steps:
- name: build android
image: cirrusci/flutter:2.8.1
image: cirrusci/flutter:2.10.3
commands:
# Keep track of the time when build was started
- echo $(date -Iseconds) > BUILD_START_TIME
Expand Down Expand Up @@ -115,7 +115,7 @@ trigger:
- push
steps:
- name: build linux
image: cirrusci/flutter:2.8.1
image: cirrusci/flutter:2.10.3
commands:
# Install dependencies
- apt-get update -y
Expand Down Expand Up @@ -159,7 +159,7 @@ steps:
# - push
#steps:
# - name: build linux
# image: cirrusci/flutter:2.8.1
# image: cirrusci/flutter:2.10.3
# commands:
# # Install dependencies
# - apt-get update -y
Expand Down Expand Up @@ -204,7 +204,7 @@ trigger:
- push
steps:
- name: build linux
image: cirrusci/flutter:2.8.1
image: cirrusci/flutter:2.10.3
commands:
# Install dependencies
- apt-get update -y
Expand Down
Binary file modified assets/icons/current/app_icon_desktop.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions assets/icons/current/app_icon_desktop.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/icons/current/app_icon_macos.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions assets/icons/current/app_icon_macos.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/syphon-branding.sketch
Binary file not shown.
5 changes: 5 additions & 0 deletions docs/codeowners.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# These owners will be the default owners for everything in
# the repo. Unless a later match takes precedence,
# @global-owner1 and @global-owner2 will be requested for
# review when someone opens a pull request.
* @ereio
28 changes: 28 additions & 0 deletions docs/release-copy.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
### 🔥 Hot Fixes
- template

### 🔮 New Features
- template

### 🐛 Bug Fixes
- template

### 💡 Improvements
- template

### 📐 Refactoring
- Lots!

----

#### 📦 Downloads:
- [Android](https://github.com/syphon-org/syphon/releases/download/0.x.x/syphon.android.apk)
- [MacOS](https://github.com/syphon-org/syphon/releases/download/0.x.x/syphon.macos.zip)
- [Linux (x64)](https://github.com/syphon-org/syphon/releases/download/0.x.x/syphon.linux.x64.0.x.x.tar.gz)
- [Linux (arm64)](https://github.com/syphon-org/syphon/releases/download/0.x.x/syphon.linux.arm64.tar.gz)

#### 🔑 SHA256
- Android - shasum
- MacOS - shasum
- Linux (x64) - shasum
- Linux (arm64) - shasum
2 changes: 2 additions & 0 deletions lib/store/sync/background/service.dart
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,8 @@ Future backgroundSync({
/// Inbox Style Notifications Only
///
if (settings.styleType == StyleType.Inbox) {
if (notifications.isEmpty) return;

var body = 'You have a new unread message';

if (uncheckedMessages.keys.length > 1) {
Expand Down
8 changes: 4 additions & 4 deletions macos/Runner.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -475,7 +475,7 @@
"$(inherited)",
"$(PROJECT_DIR)",
);
MACOSX_DEPLOYMENT_TARGET = 11;
MACOSX_DEPLOYMENT_TARGET = 10.11;
PRODUCT_BUNDLE_IDENTIFIER = org.syphon.syphon;
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_VERSION = 4.0;
Expand Down Expand Up @@ -612,8 +612,8 @@
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)",
);
MACOSX_DEPLOYMENT_TARGET = 11;
);
MACOSX_DEPLOYMENT_TARGET = 10.11;
PRODUCT_BUNDLE_IDENTIFIER = org.syphon.syphon;
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
Expand Down Expand Up @@ -645,7 +645,7 @@
"$(inherited)",
"$(PROJECT_DIR)",
);
MACOSX_DEPLOYMENT_TARGET = 11;
MACOSX_DEPLOYMENT_TARGET = 10.11;
PRODUCT_BUNDLE_IDENTIFIER = org.syphon.syphon;
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_VERSION = 4.0;
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: syphon
description: a privacy focused matrix client
version: 0.2.11+2110
version: 0.2.11+2111

environment:
sdk: ">=2.12.0 <3.0.0"
Expand Down

0 comments on commit bb66c42

Please sign in to comment.