From 761d1f28b51aedd0e1e2449aedbbb48d59557c03 Mon Sep 17 00:00:00 2001 From: Sigve Hansen Date: Tue, 29 Jul 2025 11:03:23 +0200 Subject: [PATCH] Update Firebase package and bump Xcode in order to fix the build --- BMM.Core/Translation/ro/main.json | 5 +-- BMM.UI.Android/AndroidManifest.xml | 2 +- .../Adapters/BindableFragmentPagerAdapter.cs | 5 ++- .../NewMediaPlayer/Service/MusicService.cs | 5 +-- BMM.UI.Android/BMM.UI.Droid.csproj | 36 +++++++++---------- BMM.UI.iOS/BMM.UI.iOS.csproj | 6 ++-- BMM.sln | 5 +++ azure-pipelines-ios.yaml | 2 +- 8 files changed, 36 insertions(+), 30 deletions(-) diff --git a/BMM.Core/Translation/ro/main.json b/BMM.Core/Translation/ro/main.json index ece33183e..74c7ca07d 100644 --- a/BMM.Core/Translation/ro/main.json +++ b/BMM.Core/Translation/ro/main.json @@ -191,7 +191,7 @@ "Title": "Meniu", "Search": "Căutare", "Explore": "Explorează", - "MyContent": "Conţinutul meu", + "MyContent": "Conținutul meu", "Browse": "Răsfoiește", "Settings": "Setări", "HelpAndFeedback": "Ajutor şi Feedback", @@ -251,7 +251,8 @@ "AslaksenTheme1": "Crede în Dumnezeul minunilor", "AslaksenTheme2": "Am fost răstignit împreună cu Hristos", "AslaksenTheme3": "A se teme și a-L iubi pe Dumnezeu", - "AslaksenTheme4": "Smerenia este totul" + "AslaksenTheme4": "Smerenia este totul", + "AllEpisodes": "Toate episoadele" }, "CuratedPlaylistViewModel": { "Title": "Listă de redare" diff --git a/BMM.UI.Android/AndroidManifest.xml b/BMM.UI.Android/AndroidManifest.xml index 3eef64ec5..2be10bc9f 100644 --- a/BMM.UI.Android/AndroidManifest.xml +++ b/BMM.UI.Android/AndroidManifest.xml @@ -1,6 +1,6 @@ - + diff --git a/BMM.UI.Android/Application/Adapters/BindableFragmentPagerAdapter.cs b/BMM.UI.Android/Application/Adapters/BindableFragmentPagerAdapter.cs index 78ab89253..00f630a6f 100644 --- a/BMM.UI.Android/Application/Adapters/BindableFragmentPagerAdapter.cs +++ b/BMM.UI.Android/Application/Adapters/BindableFragmentPagerAdapter.cs @@ -7,7 +7,10 @@ using BMM.Core.ViewModels; using BMM.UI.Droid.Application.Extensions; using BMM.UI.Droid.Application.Helpers; +using Microsoft.Extensions.Logging; +using MvvmCross; using MvvmCross.Binding; +using MvvmCross.Logging; using MvvmCross.Views; using MvvmCross.WeakSubscription; using Fragment = AndroidX.Fragment.App.Fragment; @@ -71,7 +74,7 @@ protected virtual void SetItemsSource(IEnumerable value) if (_itemsSource != null && !(_itemsSource is IList)) { - MvxBindingLog.Warning("Binding to IEnumerable rather than IList - this can be inefficient, especially for large lists"); + MvxBindingLog.Instance?.LogWarning("Binding to IEnumerable rather than IList - this can be inefficient, especially for large lists"); } var newObservable = _itemsSource as INotifyCollectionChanged; diff --git a/BMM.UI.Android/Application/NewMediaPlayer/Service/MusicService.cs b/BMM.UI.Android/Application/NewMediaPlayer/Service/MusicService.cs index 8ff659123..2da19b2b7 100644 --- a/BMM.UI.Android/Application/NewMediaPlayer/Service/MusicService.cs +++ b/BMM.UI.Android/Application/NewMediaPlayer/Service/MusicService.cs @@ -146,10 +146,7 @@ public override void OnCreate() base.OnCreate(); - var sessionIntent = PackageManager.GetLaunchIntentForPackage(PackageName); - var pendingIntent = PendingIntent.GetActivity(this, 0, sessionIntent, PendingIntentsUtils.GetImmutable()); - - _mediaSession = new MediaSessionCompat(this, nameof(MusicService), null, pendingIntent); + _mediaSession = new MediaSessionCompat(this, nameof(MusicService), null, null); _mediaSession.Active = true; SessionToken = _mediaSession.SessionToken; diff --git a/BMM.UI.Android/BMM.UI.Droid.csproj b/BMM.UI.Android/BMM.UI.Droid.csproj index 9c8ba858f..af1be8338 100644 --- a/BMM.UI.Android/BMM.UI.Droid.csproj +++ b/BMM.UI.Android/BMM.UI.Droid.csproj @@ -1,6 +1,6 @@ - net8.0-android + net9.0-android 24 Exe disable @@ -8,7 +8,7 @@ org.brunstad.bmm 1 1.102.0 - 34 + 35 true BMM.UI.Droid BMM.UI.Android @@ -23,25 +23,25 @@ True - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + diff --git a/BMM.UI.iOS/BMM.UI.iOS.csproj b/BMM.UI.iOS/BMM.UI.iOS.csproj index 78ea120da..01f60108f 100644 --- a/BMM.UI.iOS/BMM.UI.iOS.csproj +++ b/BMM.UI.iOS/BMM.UI.iOS.csproj @@ -602,9 +602,9 @@ - - - + + + diff --git a/BMM.sln b/BMM.sln index 03eff0ca8..332982f55 100644 --- a/BMM.sln +++ b/BMM.sln @@ -77,6 +77,9 @@ Global {17B63452-8064-46E6-A1C8-DDF5605B5995}.UITests|iPhone.Build.0 = UITests|iPhone {17B63452-8064-46E6-A1C8-DDF5605B5995}.Debug|iPhone.Deploy.0 = Debug|iPhone {17B63452-8064-46E6-A1C8-DDF5605B5995}.Debug|iPhoneSimulator.Deploy.0 = Debug|iPhoneSimulator + {17B63452-8064-46E6-A1C8-DDF5605B5995}.Debug|Any CPU.ActiveCfg = Debug|iPhoneSimulator + {17B63452-8064-46E6-A1C8-DDF5605B5995}.Debug|Any CPU.Build.0 = Debug|iPhoneSimulator + {17B63452-8064-46E6-A1C8-DDF5605B5995}.Debug|Any CPU.Deploy.0 = Debug|iPhoneSimulator {9AB7A107-7947-4F98-8790-DC39AD51F4DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9AB7A107-7947-4F98-8790-DC39AD51F4DE}.Release|Any CPU.ActiveCfg = Release|Any CPU {9AB7A107-7947-4F98-8790-DC39AD51F4DE}.Release|Any CPU.Build.0 = Release|Any CPU @@ -182,6 +185,8 @@ Global {63502F3D-A8A9-4C3F-8E20-711B0470E7B3}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator {63502F3D-A8A9-4C3F-8E20-711B0470E7B3}.UITests|iPhone.ActiveCfg = UITests|iPhone {63502F3D-A8A9-4C3F-8E20-711B0470E7B3}.UITests|iPhone.Build.0 = UITests|iPhone + {63502F3D-A8A9-4C3F-8E20-711B0470E7B3}.Debug|Any CPU.ActiveCfg = Debug|iPhoneSimulator + {63502F3D-A8A9-4C3F-8E20-711B0470E7B3}.Debug|Any CPU.Build.0 = Debug|iPhoneSimulator {E60FF6C8-2AD8-49CB-B312-DB62F7C63560}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E60FF6C8-2AD8-49CB-B312-DB62F7C63560}.Debug|Any CPU.Build.0 = Debug|Any CPU {E60FF6C8-2AD8-49CB-B312-DB62F7C63560}.Debug|iPhone.ActiveCfg = Debug|Any CPU diff --git a/azure-pipelines-ios.yaml b/azure-pipelines-ios.yaml index f3c29eb1f..0f6c4cc85 100644 --- a/azure-pipelines-ios.yaml +++ b/azure-pipelines-ios.yaml @@ -15,7 +15,7 @@ trigger: variables: - name: xcode_version - value: '16.2' + value: '16.4' - name: branchName value: $[ replace(variables['Build.SourceBranch'], 'refs/heads/', '') ] - group: 'AppleCertificate'