Skip to content

Commit 2aaf85d

Browse files
sifferhanssifferhans
authored
Merge pull request #772 from bcc-code/bugfix/android-api-35
Update Android target API to 35
2 parents ee7c3f3 + e2693b0 commit 2aaf85d

5 files changed

Lines changed: 29 additions & 24 deletions

File tree

‎BMM.UI.Android/AndroidManifest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.brunstad.bmm" android:versionCode="1" android:versionName="DEV" android:installLocation="auto">
3-
<uses-sdk android:minSdkVersion="24" android:targetSdkVersion="34" />
3+
<uses-sdk android:minSdkVersion="24" android:targetSdkVersion="35" />
44
<application android:icon="@drawable/app_icon" android:label="BMM" android:windowSoftInputMode="adjustResize|adjustPan" android:networkSecurityConfig="@xml/network_security_config" android:fullBackupContent="@xml/auto_backup_rules">
55
<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version" />
66
<meta-data android:name="com.google.firebase.messaging.default_notification_icon" android:resource="@drawable/xam_mediamanager_notify_ic" />

‎BMM.UI.Android/Application/Adapters/BindableFragmentPagerAdapter.cs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@
77
using BMM.Core.ViewModels;
88
using BMM.UI.Droid.Application.Extensions;
99
using BMM.UI.Droid.Application.Helpers;
10+
using Microsoft.Extensions.Logging;
11+
using MvvmCross;
1012
using MvvmCross.Binding;
13+
using MvvmCross.Logging;
1114
using MvvmCross.Views;
1215
using MvvmCross.WeakSubscription;
1316
using Fragment = AndroidX.Fragment.App.Fragment;
@@ -71,7 +74,7 @@ protected virtual void SetItemsSource(IEnumerable<TViewModel> value)
7174

7275
if (_itemsSource != null && !(_itemsSource is IList))
7376
{
74-
MvxBindingLog.Warning("Binding to IEnumerable rather than IList - this can be inefficient, especially for large lists");
77+
MvxBindingLog.Instance?.LogWarning("Binding to IEnumerable rather than IList - this can be inefficient, especially for large lists");
7578
}
7679

7780
var newObservable = _itemsSource as INotifyCollectionChanged;

‎BMM.UI.Android/Application/NewMediaPlayer/Service/MusicService.cs‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -146,10 +146,7 @@ public override void OnCreate()
146146

147147
base.OnCreate();
148148

149-
var sessionIntent = PackageManager.GetLaunchIntentForPackage(PackageName);
150-
var pendingIntent = PendingIntent.GetActivity(this, 0, sessionIntent, PendingIntentsUtils.GetImmutable());
151-
152-
_mediaSession = new MediaSessionCompat(this, nameof(MusicService), null, pendingIntent);
149+
_mediaSession = new MediaSessionCompat(this, nameof(MusicService), null, null);
153150
_mediaSession.Active = true;
154151
SessionToken = _mediaSession.SessionToken;
155152

‎BMM.UI.Android/BMM.UI.Droid.csproj‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net8.0-android</TargetFramework>
3+
<TargetFramework>net9.0-android</TargetFramework>
44
<SupportedOSPlatformVersion>24</SupportedOSPlatformVersion>
55
<OutputType>Exe</OutputType>
66
<Nullable>disable</Nullable>
77
<ImplicitUsings>enable</ImplicitUsings>
88
<ApplicationId>org.brunstad.bmm</ApplicationId>
99
<ApplicationVersion>1</ApplicationVersion>
1010
<ApplicationDisplayVersion>1.102.0</ApplicationDisplayVersion>
11-
<TargetPlatformVersion>34</TargetPlatformVersion>
11+
<TargetPlatformVersion>35</TargetPlatformVersion>
1212
<UseMauiEssentials>true</UseMauiEssentials>
1313
<RootNamespace>BMM.UI.Droid</RootNamespace>
1414
<AssemblyName>BMM.UI.Android</AssemblyName>
@@ -23,25 +23,25 @@
2323
<EmbedAssembliesIntoApk>True</EmbedAssembliesIntoApk>
2424
</PropertyGroup>
2525
<ItemGroup>
26-
<PackageReference Include="MvvmCross" Version="9.2.0" />
27-
<PackageReference Include="MvvmCross.DroidX.RecyclerView" Version="9.2.0" />
28-
<PackageReference Include="MvvmCross.DroidX.SwipeRefreshLayout" Version="9.2.0" />
29-
<PackageReference Include="MvvmCross.Plugin.Color" Version="9.2.0" />
30-
<PackageReference Include="MvvmCross.Plugin.JsonLocalization" Version="9.2.0" />
31-
<PackageReference Include="NewRelic.MAUI.Android.Binding" Version="7.5.0" />
32-
<PackageReference Include="Sentry" Version="5.0.1" />
33-
<PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
26+
<PackageReference Include="MvvmCross" Version="9.4.0" />
27+
<PackageReference Include="MvvmCross.DroidX.RecyclerView" Version="9.4.0" />
28+
<PackageReference Include="MvvmCross.DroidX.SwipeRefreshLayout" Version="9.4.0" />
29+
<PackageReference Include="MvvmCross.Plugin.Color" Version="9.4.0" />
30+
<PackageReference Include="MvvmCross.Plugin.JsonLocalization" Version="9.4.0" />
31+
<PackageReference Include="NewRelic.MAUI.Android.Binding" Version="7.6.6" />
32+
<PackageReference Include="Sentry" Version="5.13.0" />
33+
<PackageReference Include="Serilog.Extensions.Logging" Version="9.0.2" />
3434
<PackageReference Include="XAB.FlexboxLayout" Version="3.0.0.2" />
3535
<PackageReference Include="Xam.Plugins.Android.ExoPlayer" Version="2.19.1" />
3636
<PackageReference Include="Xam.Plugins.Android.ExoPlayer.MediaSession" Version="2.19.1" />
37-
<PackageReference Include="Xamarin.AndroidX.Activity.Ktx" Version="1.9.1" />
38-
<PackageReference Include="Xamarin.AndroidX.Browser" Version="1.8.0.4" />
39-
<PackageReference Include="Xamarin.AndroidX.Collection.Ktx" Version="1.4.2" />
40-
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData.Core.Ktx" Version="2.8.4" />
41-
<PackageReference Include="Xamarin.AndroidX.Palette" Version="1.0.0.27" />
42-
<PackageReference Include="Xamarin.Firebase.Config" Version="122.0.0.1" />
43-
<PackageReference Include="Xamarin.Firebase.Messaging" Version="124.0.0.1" />
44-
<PackageReference Update="Microsoft.Maui.Essentials" Version="8.0.80" />
37+
<PackageReference Include="Xamarin.AndroidX.Activity.Ktx" Version="1.10.1.2" />
38+
<PackageReference Include="Xamarin.AndroidX.Browser" Version="1.8.0.10" />
39+
<PackageReference Include="Xamarin.AndroidX.Collection.Ktx" Version="1.5.0.2" />
40+
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData.Core.Ktx" Version="2.9.1" />
41+
<PackageReference Include="Xamarin.AndroidX.Palette" Version="1.0.0.33" />
42+
<PackageReference Include="Xamarin.Firebase.Config" Version="122.1.2" />
43+
<PackageReference Include="Xamarin.Firebase.Messaging" Version="124.1.2" />
44+
<PackageReference Update="Microsoft.Maui.Essentials" Version="9.0.90" />
4545
</ItemGroup>
4646
<ItemGroup>
4747
<ProjectReference Include="..\BMM.Core\BMM.Core.csproj" />

‎BMM.sln‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,9 @@ Global
7777
{17B63452-8064-46E6-A1C8-DDF5605B5995}.UITests|iPhone.Build.0 = UITests|iPhone
7878
{17B63452-8064-46E6-A1C8-DDF5605B5995}.Debug|iPhone.Deploy.0 = Debug|iPhone
7979
{17B63452-8064-46E6-A1C8-DDF5605B5995}.Debug|iPhoneSimulator.Deploy.0 = Debug|iPhoneSimulator
80+
{17B63452-8064-46E6-A1C8-DDF5605B5995}.Debug|Any CPU.ActiveCfg = Debug|iPhoneSimulator
81+
{17B63452-8064-46E6-A1C8-DDF5605B5995}.Debug|Any CPU.Build.0 = Debug|iPhoneSimulator
82+
{17B63452-8064-46E6-A1C8-DDF5605B5995}.Debug|Any CPU.Deploy.0 = Debug|iPhoneSimulator
8083
{9AB7A107-7947-4F98-8790-DC39AD51F4DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
8184
{9AB7A107-7947-4F98-8790-DC39AD51F4DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
8285
{9AB7A107-7947-4F98-8790-DC39AD51F4DE}.Release|Any CPU.Build.0 = Release|Any CPU
@@ -182,6 +185,8 @@ Global
182185
{63502F3D-A8A9-4C3F-8E20-711B0470E7B3}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
183186
{63502F3D-A8A9-4C3F-8E20-711B0470E7B3}.UITests|iPhone.ActiveCfg = UITests|iPhone
184187
{63502F3D-A8A9-4C3F-8E20-711B0470E7B3}.UITests|iPhone.Build.0 = UITests|iPhone
188+
{63502F3D-A8A9-4C3F-8E20-711B0470E7B3}.Debug|Any CPU.ActiveCfg = Debug|iPhoneSimulator
189+
{63502F3D-A8A9-4C3F-8E20-711B0470E7B3}.Debug|Any CPU.Build.0 = Debug|iPhoneSimulator
185190
{E60FF6C8-2AD8-49CB-B312-DB62F7C63560}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
186191
{E60FF6C8-2AD8-49CB-B312-DB62F7C63560}.Debug|Any CPU.Build.0 = Debug|Any CPU
187192
{E60FF6C8-2AD8-49CB-B312-DB62F7C63560}.Debug|iPhone.ActiveCfg = Debug|Any CPU

0 commit comments

Comments
 (0)