Skip to content

Commit 6688885

Browse files
adam1929adam1929
authored
Support for iOS x86_64 and arm64 archs
1 parent 07df817 commit 6688885

File tree

34 files changed

+118
-106
lines changed

34 files changed

+118
-106
lines changed

‎android/ExponeaSDK.Android.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@
2020
<RestoreProjectStyle>PackageReference</RestoreProjectStyle>
2121
<PackOnBuild>true</PackOnBuild>
2222
<PackageId>ExponeaSDK.Android</PackageId>
23-
<PackageVersion>3.6.2</PackageVersion>
23+
<PackageVersion>3.6.2.1</PackageVersion>
2424
<Authors>Exponea</Authors>
2525
<Copyright>Exponea</Copyright>
2626
<Owners>Exponea</Owners>
2727
<Title>ExponeaSDK.Android</Title>
2828
<Description>Binding library for Exponea Android SDK</Description>
29-
<ReleaseVersion>3.6.2</ReleaseVersion>
29+
<ReleaseVersion>3.6.2.1</ReleaseVersion>
3030
<SynchReleaseVersion>false</SynchReleaseVersion>
3131
<Summary>Binding library for Exponea Android SDK</Summary>
3232
<PackageLicenseUrl>https://spdx.org/licenses/MIT</PackageLicenseUrl>

‎android/ExponeaSDK.Android.sln

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Global
2323
SolutionGuid = {6ECD14D6-DFA1-4871-9CF4-2FB0A892952E}
2424
EndGlobalSection
2525
GlobalSection(MonoDevelopProperties) = preSolution
26-
version = 3.6.2
26+
version = 3.6.2.1
2727
Policies = $0
2828
$0.VersionControlPolicy = $1
2929
$0.DotNetNamingPolicy = $2

‎example/ExamplePushContentExtension/Entitlements.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<dict>
55
<key>com.apple.security.application-groups</key>
66
<array>
7-
<string>group.com.exponea.xamarin</string>
7+
<string>group.com.exponea.ExponeaSDK-Example2</string>
88
</array>
99
<key>aps-environment</key>
1010
<string>development</string>

‎example/ExamplePushContentExtension/ExamplePushContentExtension.csproj

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<RootNamespace>ExamplePushContentExtension</RootNamespace>
1111
<AssemblyName>ExamplePushContentExtension</AssemblyName>
1212
<IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
13-
<ReleaseVersion>1.2.1</ReleaseVersion>
13+
<ReleaseVersion>1.2.2</ReleaseVersion>
1414
</PropertyGroup>
1515
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
1616
<DebugSymbols>true</DebugSymbols>
@@ -20,7 +20,7 @@
2020
<DefineConstants>DEBUG;</DefineConstants>
2121
<ErrorReport>prompt</ErrorReport>
2222
<WarningLevel>4</WarningLevel>
23-
<CodesignKey>Apple Development: Michaela Okruhlicová (Z88SMR689C)</CodesignKey>
23+
<CodesignKey>Apple Development: Adam Mihalik (9ZX7RBSVJF)</CodesignKey>
2424
<MtouchDebug>true</MtouchDebug>
2525
<MtouchNoSymbolStrip>true</MtouchNoSymbolStrip>
2626
<MtouchFastDev>true</MtouchFastDev>
@@ -30,7 +30,7 @@
3030
<MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
3131
<DeviceSpecificBuild>false</DeviceSpecificBuild>
3232
<MtouchVerbosity></MtouchVerbosity>
33-
<CodesignProvision>VS: WildCard Development</CodesignProvision>
33+
<CodesignProvision>VS: com.exponea.ExponeaSDK-Example2.ExampleNotificationContent Development</CodesignProvision>
3434
</PropertyGroup>
3535
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
3636
<DebugType>pdbonly</DebugType>
@@ -39,7 +39,7 @@
3939
<DefineConstants></DefineConstants>
4040
<ErrorReport>prompt</ErrorReport>
4141
<WarningLevel>4</WarningLevel>
42-
<CodesignKey>iPhone Distribution: Panaxeo, s.r.o. (UVDCL7YSZS)</CodesignKey>
42+
<CodesignKey>Apple Development: Adam Mihalik (9ZX7RBSVJF)</CodesignKey>
4343
<MtouchFloat32>true</MtouchFloat32>
4444
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
4545
<MtouchLink>SdkOnly</MtouchLink>
@@ -48,7 +48,7 @@
4848
<MtouchVerbosity></MtouchVerbosity>
4949
<CodesignExtraArgs>--deep</CodesignExtraArgs>
5050
<MtouchUseLlvm>true</MtouchUseLlvm>
51-
<CodesignProvision>Exponea Xamarin Content Distribution</CodesignProvision>
51+
<CodesignProvision>VS: com.exponea.ExponeaSDK-Example2.ExampleNotificationContent Development</CodesignProvision>
5252
</PropertyGroup>
5353
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
5454
<DebugType>pdbonly</DebugType>
@@ -57,13 +57,13 @@
5757
<DefineConstants></DefineConstants>
5858
<ErrorReport>prompt</ErrorReport>
5959
<WarningLevel>4</WarningLevel>
60-
<CodesignKey>Apple Development: Michaela Okruhlicová (Z88SMR689C)</CodesignKey>
60+
<CodesignKey>Apple Development: Adam Mihalik (9ZX7RBSVJF)</CodesignKey>
6161
<MtouchNoSymbolStrip>true</MtouchNoSymbolStrip>
6262
<MtouchLink>None</MtouchLink>
6363
<MtouchArch>x86_64</MtouchArch>
6464
<MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
6565
<MtouchVerbosity></MtouchVerbosity>
66-
<CodesignProvision>VS: WildCard Development</CodesignProvision>
66+
<CodesignProvision>VS: com.exponea.ExponeaSDK-Example2.ExampleNotificationContent Development</CodesignProvision>
6767
</PropertyGroup>
6868
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' ">
6969
<DebugSymbols>true</DebugSymbols>
@@ -85,6 +85,7 @@
8585
<MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
8686
<MtouchVerbosity></MtouchVerbosity>
8787
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
88+
<CodesignProvision>VS: com.exponea.ExponeaSDK-Example2.ExampleNotificationContent Development</CodesignProvision>
8889
</PropertyGroup>
8990
<ItemGroup>
9091
<Reference Include="System" />
@@ -128,7 +129,7 @@
128129
<HintPath>..\packages\System.Memory.4.5.5\lib\netstandard2.0\System.Memory.dll</HintPath>
129130
</Reference>
130131
<Reference Include="NativeLibrary">
131-
<HintPath>..\packages\ExponeaSDK.iOS.Notifications.2.16.3\lib\xamarinios10\NativeLibrary.dll</HintPath>
132+
<HintPath>..\packages\ExponeaSDK.iOS.Notifications.2.16.3.1\lib\xamarinios10\NativeLibrary.dll</HintPath>
132133
</Reference>
133134
</ItemGroup>
134135
<ItemGroup>

‎example/ExamplePushContentExtension/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<key>CFBundleName</key>
88
<string>ExamplePushContentExtension</string>
99
<key>CFBundleIdentifier</key>
10-
<string>com.exponea.xamarin.xamarincontentextension</string>
10+
<string>com.exponea.ExponeaSDK-Example2.ExampleNotificationContent</string>
1111
<key>CFBundleDevelopmentRegion</key>
1212
<string>en</string>
1313
<key>CFBundleInfoDictionaryVersion</key>

‎example/ExamplePushContentExtension/NotificationViewController.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ namespace ExamplePushContentExtension
1212
public partial class NotificationViewController : UIViewController, IUNNotificationContentExtension
1313
{
1414

15-
ExponeaNotificationHandler notificationHandler = new ExponeaNotificationHandler("group.com.exponea.xamarin");
15+
ExponeaNotificationHandler notificationHandler = new ExponeaNotificationHandler("group.com.exponea.ExponeaSDK-Example2");
1616

1717
#region Constructors
1818
protected NotificationViewController(IntPtr handle) : base(handle)

‎example/ExamplePushContentExtension/packages.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="ExponeaSDK.iOS.Notifications" version="2.16.3" targetFramework="xamarinios10" />
3+
<package id="ExponeaSDK.iOS.Notifications" version="2.16.3.1" targetFramework="xamarinios10" />
44
<package id="Microsoft.Bcl.AsyncInterfaces" version="7.0.0" targetFramework="xamarinios10" />
55
<package id="System.Buffers" version="4.5.1" targetFramework="xamarinios10" />
66
<package id="System.Memory" version="4.5.5" targetFramework="xamarinios10" />
@@ -12,4 +12,4 @@
1212
<package id="Xamarin.Android.Google.Code.Gson" version="2.8.8" targetFramework="xamarinios10" />
1313
<package id="Xamarin.Essentials" version="1.7.5" targetFramework="xamarinios10" />
1414
<package id="Xamarin.Forms" version="5.0.0.2578" targetFramework="xamarinios10" />
15-
</packages>
15+
</packages>

‎example/ExamplePushServiceExtension/Entitlements.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<dict>
55
<key>com.apple.security.application-groups</key>
66
<array>
7-
<string>group.com.exponea.xamarin</string>
7+
<string>group.com.exponea.ExponeaSDK-Example2</string>
88
</array>
99
<key>aps-environment</key>
1010
<string>development</string>

‎example/ExamplePushServiceExtension/ExamplePushServiceExtension.csproj

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<RootNamespace>ExamplePushServiceExtension</RootNamespace>
1111
<AssemblyName>ExamplePushServiceExtension</AssemblyName>
1212
<IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
13-
<ReleaseVersion>1.2.1</ReleaseVersion>
13+
<ReleaseVersion>1.2.2</ReleaseVersion>
1414
</PropertyGroup>
1515
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
1616
<DebugSymbols>true</DebugSymbols>
@@ -20,7 +20,8 @@
2020
<DefineConstants>DEBUG;</DefineConstants>
2121
<ErrorReport>prompt</ErrorReport>
2222
<WarningLevel>4</WarningLevel>
23-
<CodesignKey>Apple Development: Michaela Okruhlicová (Z88SMR689C)</CodesignKey>
23+
<CodesignProvision>VS: com.exponea.ExponeaSDK-Example2.ExampleNotificationService Development</CodesignProvision>
24+
<CodesignKey>Apple Development: Adam Mihalik (9ZX7RBSVJF)</CodesignKey>
2425
<MtouchDebug>true</MtouchDebug>
2526
<MtouchNoSymbolStrip>true</MtouchNoSymbolStrip>
2627
<MtouchFastDev>true</MtouchFastDev>
@@ -30,7 +31,6 @@
3031
<MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
3132
<DeviceSpecificBuild>false</DeviceSpecificBuild>
3233
<MtouchVerbosity></MtouchVerbosity>
33-
<CodesignProvision>VS: WildCard Development</CodesignProvision>
3434
</PropertyGroup>
3535
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
3636
<DebugType>pdbonly</DebugType>
@@ -39,7 +39,7 @@
3939
<DefineConstants></DefineConstants>
4040
<ErrorReport>prompt</ErrorReport>
4141
<WarningLevel>4</WarningLevel>
42-
<CodesignKey>iPhone Distribution: Panaxeo, s.r.o. (UVDCL7YSZS)</CodesignKey>
42+
<CodesignKey>Apple Development: Adam Mihalik (9ZX7RBSVJF)</CodesignKey>
4343
<MtouchUseLlvm>true</MtouchUseLlvm>
4444
<MtouchFloat32>true</MtouchFloat32>
4545
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
@@ -48,7 +48,7 @@
4848
<MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
4949
<MtouchVerbosity></MtouchVerbosity>
5050
<CodesignExtraArgs>--deep</CodesignExtraArgs>
51-
<CodesignProvision>Exponea Examarin Service Distribution</CodesignProvision>
51+
<CodesignProvision>VS: com.exponea.ExponeaSDK-Example2.ExampleNotificationService Development</CodesignProvision>
5252
</PropertyGroup>
5353
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
5454
<DebugType>pdbonly</DebugType>
@@ -57,13 +57,13 @@
5757
<DefineConstants></DefineConstants>
5858
<ErrorReport>prompt</ErrorReport>
5959
<WarningLevel>4</WarningLevel>
60-
<CodesignKey>Apple Development: Michaela Okruhlicová (Z88SMR689C)</CodesignKey>
60+
<CodesignKey>Apple Development: Adam Mihalik (9ZX7RBSVJF)</CodesignKey>
6161
<MtouchNoSymbolStrip>true</MtouchNoSymbolStrip>
6262
<MtouchLink>None</MtouchLink>
6363
<MtouchArch>x86_64</MtouchArch>
6464
<MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
6565
<MtouchVerbosity></MtouchVerbosity>
66-
<CodesignProvision>VS: WildCard Development</CodesignProvision>
66+
<CodesignProvision>VS: com.exponea.ExponeaSDK-Example2.ExampleNotificationService Development</CodesignProvision>
6767
</PropertyGroup>
6868
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' ">
6969
<DebugSymbols>true</DebugSymbols>
@@ -85,6 +85,7 @@
8585
<MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
8686
<MtouchVerbosity></MtouchVerbosity>
8787
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
88+
<CodesignProvision>VS: com.exponea.ExponeaSDK-Example2.ExampleNotificationService Development</CodesignProvision>
8889
</PropertyGroup>
8990
<ItemGroup>
9091
<Reference Include="System" />
@@ -128,7 +129,7 @@
128129
<HintPath>..\packages\System.Memory.4.5.5\lib\netstandard2.0\System.Memory.dll</HintPath>
129130
</Reference>
130131
<Reference Include="NativeLibrary">
131-
<HintPath>..\packages\ExponeaSDK.iOS.Notifications.2.16.3\lib\xamarinios10\NativeLibrary.dll</HintPath>
132+
<HintPath>..\packages\ExponeaSDK.iOS.Notifications.2.16.3.1\lib\xamarinios10\NativeLibrary.dll</HintPath>
132133
</Reference>
133134
</ItemGroup>
134135
<ItemGroup>

‎example/ExamplePushServiceExtension/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<key>CFBundleName</key>
88
<string>ExamplePushServiceExtension</string>
99
<key>CFBundleIdentifier</key>
10-
<string>com.exponea.xamarin.xamarinserviceextension</string>
10+
<string>com.exponea.ExponeaSDK-Example2.ExampleNotificationService</string>
1111
<key>CFBundleDevelopmentRegion</key>
1212
<string>en</string>
1313
<key>CFBundleInfoDictionaryVersion</key>

‎example/ExamplePushServiceExtension/NotificationService.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public class NotificationService : UNNotificationServiceExtension
1313
public UNMutableNotificationContent BestAttemptContent { get; set; }
1414
#endregion
1515

16-
ExponeaNotificationHandler notificationHandler = new ExponeaNotificationHandler("group.com.exponea.xamarin");
16+
ExponeaNotificationHandler notificationHandler = new ExponeaNotificationHandler("group.com.exponea.ExponeaSDK-Example2");
1717

1818
#region Constructors
1919
protected NotificationService(IntPtr handle) : base(handle)

‎example/ExamplePushServiceExtension/packages.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="ExponeaSDK.iOS.Notifications" version="2.16.3" targetFramework="xamarinios10" />
3+
<package id="ExponeaSDK.iOS.Notifications" version="2.16.3.1" targetFramework="xamarinios10" />
44
<package id="Microsoft.Bcl.AsyncInterfaces" version="7.0.0" targetFramework="xamarinios10" />
55
<package id="System.Buffers" version="4.5.1" targetFramework="xamarinios10" />
66
<package id="System.Memory" version="4.5.5" targetFramework="xamarinios10" />
@@ -12,4 +12,4 @@
1212
<package id="Xamarin.Android.Google.Code.Gson" version="2.8.8" targetFramework="xamarinios10" />
1313
<package id="Xamarin.Essentials" version="1.7.5" targetFramework="xamarinios10" />
1414
<package id="Xamarin.Forms" version="5.0.0.2578" targetFramework="xamarinios10" />
15-
</packages>
15+
</packages>

‎example/XamarinExample.Android/Properties/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66
<uses-permission android:name="android.permission.INTERNET" />
77
<uses-permission android:name="android.permission.ACCEPT_HANDOVER" />
88
<meta-data android:name="ExponeaAuthProvider" android:value="com.exponea.example.services.ExampleAuthProvider" />
9-
</manifest>
9+
</manifest>

‎example/XamarinExample.Android/Resources/Resource.designer.cs

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎example/XamarinExample.Android/XamarinExample.Android.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<AndroidHttpClientHandlerType>Xamarin.Android.Net.AndroidClientHandler</AndroidHttpClientHandlerType>
2323
<NuGetPackageImportStamp>
2424
</NuGetPackageImportStamp>
25-
<ReleaseVersion>1.2.1</ReleaseVersion>
25+
<ReleaseVersion>1.2.2</ReleaseVersion>
2626
</PropertyGroup>
2727
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2828
<DebugSymbols>true</DebugSymbols>
@@ -71,7 +71,7 @@
7171
<Version>123.1.1.1</Version>
7272
</PackageReference>
7373
<PackageReference Include="ExponeaSDK">
74-
<Version>1.2.1</Version>
74+
<Version>1.2.2</Version>
7575
</PackageReference>
7676
</ItemGroup>
7777
<ItemGroup>

‎example/XamarinExample.Huawei/Resources/Resource.designer.cs

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎example/XamarinExample.Huawei/XamarinExample.Huawei.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<NuGetPackageImportStamp>
2424
</NuGetPackageImportStamp>
2525
<AndroidManifestMerger>manifestmerger.jar</AndroidManifestMerger>
26-
<ReleaseVersion>1.2.1</ReleaseVersion>
26+
<ReleaseVersion>1.2.2</ReleaseVersion>
2727
</PropertyGroup>
2828
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2929
<DebugSymbols>true</DebugSymbols>
@@ -77,7 +77,7 @@
7777
<Version>6.3.0.402</Version>
7878
</PackageReference>
7979
<PackageReference Include="ExponeaSDK">
80-
<Version>1.2.1</Version>
80+
<Version>1.2.2</Version>
8181
</PackageReference>
8282
</ItemGroup>
8383
<ItemGroup>

‎example/XamarinExample.iOS/Entitlements.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<string>development</string>
1111
<key>com.apple.security.application-groups</key>
1212
<array>
13-
<string>group.com.exponea.xamarin</string>
13+
<string>group.com.exponea.ExponeaSDK-Example2</string>
1414
</array>
1515
</dict>
1616
</plist>

‎example/XamarinExample.iOS/Info.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@
3535
<string>remote-notification</string>
3636
</array>
3737
<key>CFBundleIdentifier</key>
38-
<string>com.exponea.xamarin</string>
38+
<string>com.exponea.ExponeaSDK-Example2</string>
3939
<key>CFBundleShortVersionString</key>
40-
<string>1.2.1</string>
40+
<string>1.2.2</string>
4141
<key>CFBundleVersion</key>
4242
<string>6</string>
4343
</dict>

0 commit comments

Comments
 (0)