diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 179c9960..44684948 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,7 +14,7 @@ jobs: name: Bluecherry Client Android runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: token: ${{ secrets.GITHUB_TOKEN }} submodules: recursive @@ -84,7 +84,7 @@ jobs: runs-on: macos-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: token: ${{ secrets.GITHUB_TOKEN }} submodules: recursive @@ -126,7 +126,7 @@ jobs: runs-on: macos-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: token: ${{ secrets.GITHUB_TOKEN }} submodules: recursive @@ -138,6 +138,11 @@ jobs: - run: flutter gen-l10n - run: flutter pub get + + - name: Update Pods + working-directory: ./ios/ + run: pod repo update + - run: flutter build macos --verbose - run: 7z a bluecherry-macos.7z build/macos/Build/Products/Release/unity.app - name: Release @@ -167,7 +172,7 @@ jobs: runs-on: windows-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: token: ${{ secrets.GITHUB_TOKEN }} submodules: recursive @@ -228,7 +233,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: token: ${{ secrets.GITHUB_TOKEN }} submodules: recursive @@ -363,7 +368,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: token: ${{ secrets.GITHUB_TOKEN }} submodules: recursive @@ -389,7 +394,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: token: ${{ secrets.GITHUB_TOKEN }} submodules: recursive diff --git a/README.md b/README.md index 7d818c33..e23625d4 100644 --- a/README.md +++ b/README.md @@ -43,10 +43,10 @@ | Android | iOS | Windows | GNU/Linux | MacOS | | ---------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------- | -| [arm64 `.apk`](https://github.com/bluecherrydvr/unity/releases/download/v3.0.0-beta19/bluecherry-android-arm64-v8a-release.apk) | [App Store](https://apps.apple.com/us/app/bluecherry-mobile/id1555805139) | [Windows Setup](https://github.com/bluecherrydvr/unity/releases/download/v3.0.0-beta19/bluecherry-windows-setup.exe) | 🚧 **SOON** ~~`AppImage`~~ | [Executable `.app`](https://github.com/bluecherrydvr/unity/releases/download/v3.0.0-beta19/bluecherry-macos.7z) | -| [armabi `.apk`](https://github.com/bluecherrydvr/unity/releases/download/v3.0.0-beta19/bluecherry-android-armeabi-v7a-release.apk) | | 🚧 **SOON** ~~`winget install bluecherry`~~ | [Ubuntu/Debian `.deb`](https://github.com/bluecherrydvr/unity/releases/download/v3.0.0-beta19/bluecherry-linux-x86_64.deb) | 🚧 **SOON** ~~[App Store](https://github.com/bluecherrydvr/unity/issues/112)~~ | -| [x86_64 `.apk`](https://github.com/bluecherrydvr/unity/releases/download/v3.0.0-beta19/bluecherry-android-x86_64-release.apk) | | 🚧 **SOON** ~~Microsoft Store~~ | [Raw Executable `.tar.gz`](https://github.com/bluecherrydvr/unity/releases/download/v3.0.0-beta19/bluecherry-linux-x86_64.tar.gz) | | -| 🚧 **SOON** ~~Play Store~~ | | | [Fedora/Red Hat Linux `.rpm`](https://github.com/bluecherrydvr/unity/releases/download/v3.0.0-beta19/bluecherry-linux-x86_64.rpm) | | +| [arm64 `.apk`](https://github.com/bluecherrydvr/unity/releases/download/v3.0.0-beta20/bluecherry-android-arm64-v8a-release.apk) | [App Store](https://apps.apple.com/us/app/bluecherry-mobile/id1555805139) | [Windows Setup](https://github.com/bluecherrydvr/unity/releases/download/v3.0.0-beta20/bluecherry-windows-setup.exe) | 🚧 **SOON** ~~`AppImage`~~ | [Executable `.app`](https://github.com/bluecherrydvr/unity/releases/download/v3.0.0-beta20/bluecherry-macos.7z) | +| [armabi `.apk`](https://github.com/bluecherrydvr/unity/releases/download/v3.0.0-beta20/bluecherry-android-armeabi-v7a-release.apk) | | 🚧 **SOON** ~~`winget install bluecherry`~~ | [Ubuntu/Debian `.deb`](https://github.com/bluecherrydvr/unity/releases/download/v3.0.0-beta20/bluecherry-linux-x86_64.deb) | 🚧 **SOON** ~~[App Store](https://github.com/bluecherrydvr/unity/issues/112)~~ | +| [x86_64 `.apk`](https://github.com/bluecherrydvr/unity/releases/download/v3.0.0-beta20/bluecherry-android-x86_64-release.apk) | | 🚧 **SOON** ~~Microsoft Store~~ | [Raw Executable `.tar.gz`](https://github.com/bluecherrydvr/unity/releases/download/v3.0.0-beta20/bluecherry-linux-x86_64.tar.gz) | | +| 🚧 **SOON** ~~Play Store~~ | | | [Fedora/Red Hat Linux `.rpm`](https://github.com/bluecherrydvr/unity/releases/download/v3.0.0-beta20/bluecherry-linux-x86_64.rpm) | | Or download the latest release [here](https://github.com/bluecherrydvr/unity/releases). diff --git a/android/build.gradle b/android/build.gradle index 51dd94f0..e9ae3a26 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,12 +1,12 @@ buildscript { - ext.kotlin_version = '1.7.10' + ext.kotlin_version = '2.0.21' repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.1.2' + classpath 'com.android.tools.build:gradle:7.1.3' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath 'com.google.gms:google-services:4.3.10' } diff --git a/bluecherry_appcast.xml b/bluecherry_appcast.xml index 881dd203..cc59909c 100644 --- a/bluecherry_appcast.xml +++ b/bluecherry_appcast.xml @@ -2,6 +2,11 @@ Bluecherry - Appcast + + Version 3.0.0-beta20 + Security and Usability + Mon, 18 Nov 2024 + Version 3.0.0-beta19 Linux and Timeline enhancements. diff --git a/installer/windows-installer.iss b/installer/windows-installer.iss index 0ad52487..cdd1941d 100644 --- a/installer/windows-installer.iss +++ b/installer/windows-installer.iss @@ -2,7 +2,7 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "Bluecherry DVR" -#define MyAppVersion "3.0.0-beta19" +#define MyAppVersion "3.0.0-beta20" #define MyAppPublisher "Bluecherry DVR" #define MyAppURL "https://www.bluecherrydvr.com/" #define MyAppExeName "bluecherry_client.exe" diff --git a/linux/debian/DEBIAN/control b/linux/debian/DEBIAN/control index 3fdbf72e..6fd78fac 100644 --- a/linux/debian/DEBIAN/control +++ b/linux/debian/DEBIAN/control @@ -1,5 +1,5 @@ Package: bluecherrydvr -Version: 3.0.0-beta19 +Version: 3.0.0-beta20 Section: base Priority: optional Homepage: https://www.bluecherrydvr.com/ diff --git a/linux/debian/usr/share/metainfo/bluecherry.appdata.xml b/linux/debian/usr/share/metainfo/bluecherry.appdata.xml index 5c7a4056..9dd1064d 100644 --- a/linux/debian/usr/share/metainfo/bluecherry.appdata.xml +++ b/linux/debian/usr/share/metainfo/bluecherry.appdata.xml @@ -36,6 +36,7 @@ bluecherrydvr.desktop + | | | | diff --git a/linux/rpm/bluecherry.spec b/linux/rpm/bluecherry.spec index 9ef4d7ae..dc0ca805 100644 --- a/linux/rpm/bluecherry.spec +++ b/linux/rpm/bluecherry.spec @@ -1,5 +1,5 @@ Name: bluecherrydvr -Version: 3.0.0_beta19 +Version: 3.0.0_beta20 Release: 1 Summary: Bluecherry client written in Flutter. License: EULA diff --git a/macos/Podfile.lock b/macos/Podfile.lock index 2a0ea7df..42a0ab64 100644 --- a/macos/Podfile.lock +++ b/macos/Podfile.lock @@ -8,31 +8,31 @@ PODS: - FlutterMacOS - device_info_plus (0.0.1): - FlutterMacOS - - Firebase/CoreOnly (11.2.0): - - FirebaseCore (= 11.2.0) - - Firebase/Messaging (11.2.0): + - Firebase/CoreOnly (11.4.2): + - FirebaseCore (= 11.4.2) + - Firebase/Messaging (11.4.2): - Firebase/CoreOnly - - FirebaseMessaging (~> 11.2.0) - - firebase_core (3.6.0): - - Firebase/CoreOnly (~> 11.2.0) + - FirebaseMessaging (~> 11.4.0) + - firebase_core (3.8.0): + - Firebase/CoreOnly (~> 11.4.0) - FlutterMacOS - - firebase_messaging (15.1.3): - - Firebase/CoreOnly (~> 11.2.0) - - Firebase/Messaging (~> 11.2.0) + - firebase_messaging (15.1.5): + - Firebase/CoreOnly (~> 11.4.0) + - Firebase/Messaging (~> 11.4.0) - firebase_core - FlutterMacOS - - FirebaseCore (11.2.0): - - FirebaseCoreInternal (~> 11.0) + - FirebaseCore (11.4.2): + - FirebaseCoreInternal (< 12.0, >= 11.4.2) - GoogleUtilities/Environment (~> 8.0) - GoogleUtilities/Logger (~> 8.0) - - FirebaseCoreInternal (11.3.0): + - FirebaseCoreInternal (11.5.0): - "GoogleUtilities/NSData+zlib (~> 8.0)" - - FirebaseInstallations (11.3.0): + - FirebaseInstallations (11.4.0): - FirebaseCore (~> 11.0) - GoogleUtilities/Environment (~> 8.0) - GoogleUtilities/UserDefaults (~> 8.0) - PromisesObjC (~> 2.4) - - FirebaseMessaging (11.2.0): + - FirebaseMessaging (11.4.0): - FirebaseCore (~> 11.0) - FirebaseInstallations (~> 11.0) - GoogleDataTransport (~> 10.0) @@ -41,6 +41,8 @@ PODS: - GoogleUtilities/Reachability (~> 8.0) - GoogleUtilities/UserDefaults (~> 8.0) - nanopb (~> 3.30910.0) + - flutter_secure_storage_macos (6.1.1): + - FlutterMacOS - FlutterMacOS (1.0.0) - fvp (0.24.1): - Flutter @@ -73,6 +75,9 @@ PODS: - GoogleUtilities/UserDefaults (8.0.2): - GoogleUtilities/Logger - GoogleUtilities/Privacy + - local_auth_darwin (0.0.1): + - Flutter + - FlutterMacOS - mdk (0.29.1) - media_kit_libs_macos_video (1.0.4): - FlutterMacOS @@ -91,7 +96,7 @@ PODS: - PromisesObjC (2.4.0) - screen_brightness_macos (0.1.0): - FlutterMacOS - - screen_retriever (0.0.1): + - screen_retriever_macos (0.0.1): - FlutterMacOS - url_launcher_macos (0.0.1): - FlutterMacOS @@ -110,14 +115,16 @@ DEPENDENCIES: - device_info_plus (from `Flutter/ephemeral/.symlinks/plugins/device_info_plus/macos`) - firebase_core (from `Flutter/ephemeral/.symlinks/plugins/firebase_core/macos`) - firebase_messaging (from `Flutter/ephemeral/.symlinks/plugins/firebase_messaging/macos`) + - flutter_secure_storage_macos (from `Flutter/ephemeral/.symlinks/plugins/flutter_secure_storage_macos/macos`) - FlutterMacOS (from `Flutter/ephemeral`) - fvp (from `Flutter/ephemeral/.symlinks/plugins/fvp/darwin`) + - local_auth_darwin (from `Flutter/ephemeral/.symlinks/plugins/local_auth_darwin/darwin`) - media_kit_libs_macos_video (from `Flutter/ephemeral/.symlinks/plugins/media_kit_libs_macos_video/macos`) - media_kit_video (from `Flutter/ephemeral/.symlinks/plugins/media_kit_video/macos`) - package_info_plus (from `Flutter/ephemeral/.symlinks/plugins/package_info_plus/macos`) - path_provider_foundation (from `Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/darwin`) - screen_brightness_macos (from `Flutter/ephemeral/.symlinks/plugins/screen_brightness_macos/macos`) - - screen_retriever (from `Flutter/ephemeral/.symlinks/plugins/screen_retriever/macos`) + - screen_retriever_macos (from `Flutter/ephemeral/.symlinks/plugins/screen_retriever_macos/macos`) - url_launcher_macos (from `Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos`) - video_player_avfoundation (from `Flutter/ephemeral/.symlinks/plugins/video_player_avfoundation/darwin`) - wakelock_plus (from `Flutter/ephemeral/.symlinks/plugins/wakelock_plus/macos`) @@ -149,10 +156,14 @@ EXTERNAL SOURCES: :path: Flutter/ephemeral/.symlinks/plugins/firebase_core/macos firebase_messaging: :path: Flutter/ephemeral/.symlinks/plugins/firebase_messaging/macos + flutter_secure_storage_macos: + :path: Flutter/ephemeral/.symlinks/plugins/flutter_secure_storage_macos/macos FlutterMacOS: :path: Flutter/ephemeral fvp: :path: Flutter/ephemeral/.symlinks/plugins/fvp/darwin + local_auth_darwin: + :path: Flutter/ephemeral/.symlinks/plugins/local_auth_darwin/darwin media_kit_libs_macos_video: :path: Flutter/ephemeral/.symlinks/plugins/media_kit_libs_macos_video/macos media_kit_video: @@ -163,8 +174,8 @@ EXTERNAL SOURCES: :path: Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/darwin screen_brightness_macos: :path: Flutter/ephemeral/.symlinks/plugins/screen_brightness_macos/macos - screen_retriever: - :path: Flutter/ephemeral/.symlinks/plugins/screen_retriever/macos + screen_retriever_macos: + :path: Flutter/ephemeral/.symlinks/plugins/screen_retriever_macos/macos url_launcher_macos: :path: Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos video_player_avfoundation: @@ -177,33 +188,35 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: app_links: 10e0a0ab602ffaf34d142cd4862f29d34b303b2a awesome_notifications: 428f5c15a700b117418aed09e29c21c5806fcf69 - connectivity_plus: ddd7f30999e1faaef5967c23d5b6d503d10434db - device_info_plus: f1aae8670672f75c4c8850ecbe0b2ddef62b0a22 - Firebase: 98e6bf5278170668a7983e12971a66b2cd57fc8c - firebase_core: e88f946a4601cb1854178cb07da241bba5a6508e - firebase_messaging: e1b1c1504659e13d66131f62ec22919293cd0d11 - FirebaseCore: a282032ae9295c795714ded2ec9c522fc237f8da - FirebaseCoreInternal: ac26d09a70c730e497936430af4e60fb0c68ec4e - FirebaseInstallations: 58cf94dabf1e2bb2fa87725a9be5c2249171cda0 - FirebaseMessaging: c9ec7b90c399c7a6100297e9d16f8a27fc7f7152 + connectivity_plus: 4c41c08fc6d7c91f63bc7aec70ffe3730b04f563 + device_info_plus: 1b14eed9bf95428983aed283a8d51cce3d8c4215 + Firebase: 7fd5466678d964be78fbf536d8a3385da19c4828 + firebase_core: d95c4a2225d7b6ed46bc31fb2a6f421fc7c8285b + firebase_messaging: 821b4f05a071d54d6ed826923a48c9101b93d443 + FirebaseCore: 6b32c57269bd999aab34354c3923d92a6e5f3f84 + FirebaseCoreInternal: f47dd28ae7782e6a4738aad3106071a8fe0af604 + FirebaseInstallations: 6ef4a1c7eb2a61ee1f74727d7f6ce2e72acf1414 + FirebaseMessaging: f8a160d99c2c2e5babbbcc90c4a3e15db036aee2 + flutter_secure_storage_macos: 59459653abe1adb92abbc8ea747d79f8d19866c9 FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24 fvp: 81fd93b02f03649892a996cab2dc38d6804fa8de GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7 GoogleUtilities: 26a3abef001b6533cf678d3eb38fd3f614b7872d + local_auth_darwin: 66e40372f1c29f383a314c738c7446e2f7fdadc3 mdk: 3c49affb38303cf86fd9f8ea1e05fe029c4dc194 media_kit_libs_macos_video: b3e2bbec2eef97c285f2b1baa7963c67c753fb82 media_kit_video: c75b07f14d59706c775778e4dd47dd027de8d1e5 nanopb: fad817b59e0457d11a5dfbde799381cd727c1275 - package_info_plus: d2f71247aab4b6521434f887276093acc70d214c + package_info_plus: 12f1c5c2cfe8727ca46cbd0b26677728972d9a5b path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46 PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47 screen_brightness_macos: 2d6d3af2165592d9a55ffcd95b7550970e41ebda - screen_retriever: 59634572a57080243dd1bf715e55b6c54f241a38 + screen_retriever_macos: 776e0fa5d42c6163d2bf772d22478df4b302b161 url_launcher_macos: c82c93949963e55b228a30115bd219499a6fe404 video_player_avfoundation: 7c6c11d8470e1675df7397027218274b6d2360b3 wakelock_plus: 4783562c9a43d209c458cb9b30692134af456269 window_manager: 3a1844359a6295ab1e47659b1a777e36773cd6e8 -PODFILE CHECKSUM: fc440eeb0d20915f5d4e35398bad0e255e9e5d91 +PODFILE CHECKSUM: 9ebaf0ce3d369aaa26a9ea0e159195ed94724cf3 -COCOAPODS: 1.15.2 +COCOAPODS: 1.16.2 diff --git a/pubspec.lock b/pubspec.lock index 5021d7c3..7a467e0c 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -85,10 +85,10 @@ packages: dependency: "direct main" description: name: awesome_notifications - sha256: d9e46ce7f5171ee1e9b1c5bc6dc40bd77528561f592842ce97ce3a0a9ae155ef + sha256: d051ffb694a53da216ff13d02c8ec645d75320048262f7e6b3c1d95a4f54c902 url: "https://pub.dev" source: hosted - version: "0.9.3+1" + version: "0.10.0" boolean_selector: dependency: transitive description: @@ -658,7 +658,7 @@ packages: description: path: "libs/android/media_kit_libs_android_video" ref: HEAD - resolved-ref: "59b987e3c311dca450786f36b1881340c49476d8" + resolved-ref: "143143ac17bb0d9664a9df8dc3e4101748e952b4" url: "https://github.com/media-kit/media-kit/" source: git version: "1.3.6" @@ -667,7 +667,7 @@ packages: description: path: "libs/ios/media_kit_libs_ios_video" ref: HEAD - resolved-ref: "59b987e3c311dca450786f36b1881340c49476d8" + resolved-ref: "143143ac17bb0d9664a9df8dc3e4101748e952b4" url: "https://github.com/media-kit/media-kit/" source: git version: "1.1.4" @@ -676,7 +676,7 @@ packages: description: path: "libs/macos/media_kit_libs_macos_video" ref: HEAD - resolved-ref: "59b987e3c311dca450786f36b1881340c49476d8" + resolved-ref: "143143ac17bb0d9664a9df8dc3e4101748e952b4" url: "https://github.com/media-kit/media-kit/" source: git version: "1.1.4" @@ -685,7 +685,7 @@ packages: description: path: "libs/windows/media_kit_libs_windows_video" ref: HEAD - resolved-ref: "59b987e3c311dca450786f36b1881340c49476d8" + resolved-ref: "143143ac17bb0d9664a9df8dc3e4101748e952b4" url: "https://github.com/media-kit/media-kit/" source: git version: "1.0.10" @@ -853,10 +853,10 @@ packages: dependency: transitive description: name: permission_handler_html - sha256: af26edbbb1f2674af65a8f4b56e1a6f526156bc273d0e65dd8075fab51c78851 + sha256: "6b9cb54b7135073841a35513fba39e598b421702d5f4d92319992fd6eb5532a9" url: "https://pub.dev" source: hosted - version: "0.1.3+2" + version: "0.1.3+4" permission_handler_platform_interface: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 604f828c..35eb55a0 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -3,7 +3,7 @@ description: Bluecherry client written in Flutter. publish_to: "none" -version: 3.0.0-beta19 +version: 3.0.0-beta20 environment: sdk: ">=3.5.0 <4.0.0" @@ -33,8 +33,8 @@ dependencies: flutter_localized_locales: ^2.0.5 duration: ^4.0.3 firebase_core: ^3.6.0 - firebase_messaging: ^15.1.3 - awesome_notifications: ^0.9.3 + firebase_messaging: ^15.1.5 + awesome_notifications: ^0.10.0 wakelock_plus: ^1.1.4 app_links: ^6.3.2 win32_registry: ^1.1.2