Skip to content

Commit

Permalink
Updates for latest iOS release (#3)
Browse files Browse the repository at this point in the history
  • Loading branch information
tamayok committed Apr 9, 2024
1 parent 39fa308 commit e3518de
Show file tree
Hide file tree
Showing 14 changed files with 283 additions and 199 deletions.
2 changes: 1 addition & 1 deletion APIs/Tealium.Common/Constants.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ public static class Constants
public static class Values
{
public const string pluginName = "Tealium-Maui";
public const string pluginVersion = "1.0.1";
public const string pluginVersion = "1.0.2";
}

public static class DataLayerKeys
Expand Down
18 changes: 9 additions & 9 deletions Bindings/iOS/TealiumWrapperCocoapods/Example/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
PODS:
- tealium-swift/Collect (2.12.0):
- tealium-swift/Collect (2.12.3):
- tealium-swift/Core
- tealium-swift/Core (2.12.0)
- tealium-swift/Lifecycle (2.12.0):
- tealium-swift/Core (2.12.3)
- tealium-swift/Lifecycle (2.12.3):
- tealium-swift/Core
- tealium-swift/RemoteCommands (2.12.0):
- tealium-swift/RemoteCommands (2.12.3):
- tealium-swift/Core
- tealium-swift/TagManagement (2.12.0):
- tealium-swift/TagManagement (2.12.3):
- tealium-swift/Core
- tealium-swift/VisitorService (2.12.0):
- tealium-swift/VisitorService (2.12.3):
- tealium-swift/Core
- TealiumWrapperCocoapods (0.1.0):
- tealium-swift/Collect (~> 2.12)
Expand All @@ -30,9 +30,9 @@ EXTERNAL SOURCES:
:path: "../"

SPEC CHECKSUMS:
tealium-swift: 0a099d2dae91be76cf6aed9f69806797d09c1cb9
TealiumWrapperCocoapods: 0d15b05eda711c75a70b6f221f9f1a1c5e5222db
tealium-swift: 3979f3eadf84e5c9ec391f2cba01375e36d4b26c
TealiumWrapperCocoapods: 73d1ff3a41fceb4a6f8c96dd3a2dbe4d5fa08821

PODFILE CHECKSUM: 4ba0d871bd1ff9d5ac6993cc0b797c597cd05a72

COCOAPODS: 1.14.3
COCOAPODS: 1.15.2

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1320"
LastUpgradeVersion = "1530"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1320"
LastUpgradeVersion = "1530"
version = "1.7">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Pod::Spec.new do |s|
TODO: Add long description of the pod here.
DESC

s.homepage = 'https://github.com/Tealium/tealium-maui'
s.homepage = 'https://github.com/Tealium/tealium-dotnet-maui'
s.license = { :type => 'MIT', :file => 'LICENSE' }
s.author = { 'Tealium Inc.' => 'tealium@tealium.com' }
s.source = { :git => 'https://github.com/Tealium/tealium-swift.git', :tag => s.version.to_s }
Expand Down
5 changes: 5 additions & 0 deletions NuGet/Host/tealium.maui/1.0.2/.nupkg.metadata
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"version": 2,
"contentHash": "lwIv65kYIHQKdeUlT1MFYuGEbJxvozl9je8eDBBi9KXYXLHys2J2Ya4d0xWqZ8vTarlMXvagcZ8YShyKAv5d7A==",
"source": null
}
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
lwIv65kYIHQKdeUlT1MFYuGEbJxvozl9je8eDBBi9KXYXLHys2J2Ya4d0xWqZ8vTarlMXvagcZ8YShyKAv5d7A==
28 changes: 28 additions & 0 deletions NuGet/Host/tealium.maui/1.0.2/tealium.maui.nuspec
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata>
<id>Tealium.Maui</id>
<version>1.0.2</version>
<authors>Tealium</authors>
<owners>Tealium</owners>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<license type="file">LICENSE.txt</license>
<licenseUrl>https://aka.ms/deprecateLicenseUrl</licenseUrl>
<icon>logo_64.png</icon>
<projectUrl>https://github.com/Tealium/tealium-maui</projectUrl>
<iconUrl>https://github.com/Tealium/tealium-maui/raw/master/logo_64.png</iconUrl>
<description>The Tealium MAUI integration brings support for Tealium's Native iOS and Android SDKs to the .NET MAUI platform. This package provides a single cross-platform API, enabling you to develop with Tealium once for both iOS and Android platforms. The Tealium Native SDKs for iOS and Android are embedded along with the lifecycle libraries.</description>
<releaseNotes>The embedded Tealium SDK versions are: iOS Swift v2.12.x and Android Kotlin v1.5.5.</releaseNotes>
<copyright>Copyright 2024</copyright>
<tags>Tealium iOS Android</tags>
<dependencies>
<group targetFramework="net8.0-android33.0">
<dependency id="Xamarin.Kotlin.StdLib" version="[1.5.0, 2.0.0)" />
<dependency id="Xamarin.KotlinX.Coroutines.Core" version="[1.5.0, 2.0.0)" />
<dependency id="Xamarin.KotlinX.Coroutines.Android" version="[1.5.0, 2.0.0)" />
</group>
<group targetFramework="net8.0" />
<group targetFramework="net8.0-ios12.0" />
</dependencies>
</metadata>
</package>
Binary file added NuGet/Packs/Tealium.Maui.1.0.2.nupkg
Binary file not shown.
4 changes: 2 additions & 2 deletions NuGet/Specs/Tealium.Maui.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package >
<metadata>
<id>Tealium.Maui</id>
<version>1.0.1</version>
<version>1.0.2</version>
<authors>Tealium</authors>
<owners>Tealium</owners>
<license type="file">LICENSE.txt</license>
Expand All @@ -11,7 +11,7 @@
<iconUrl>https://github.com/Tealium/tealium-maui/raw/master/logo_64.png</iconUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>The Tealium MAUI integration brings support for Tealium's Native iOS and Android SDKs to the .NET MAUI platform. This package provides a single cross-platform API, enabling you to develop with Tealium once for both iOS and Android platforms. The Tealium Native SDKs for iOS and Android are embedded along with the lifecycle libraries.</description>
<releaseNotes>The embedded Tealium SDK versions are: iOS Swift v2.10.0 and Android Kotlin v1.5.5.</releaseNotes>
<releaseNotes>The embedded Tealium SDK versions are: iOS Swift v2.12.x and Android Kotlin v1.5.5.</releaseNotes>
<copyright>Copyright 2024</copyright>
<tags>Tealium iOS Android</tags>
<!-- Insert within the <metadata> element -->
Expand Down
238 changes: 127 additions & 111 deletions TealiumMauiExample/TealiumMauiExample.csproj
Original file line number Diff line number Diff line change
@@ -1,112 +1,128 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0-android;net8.0-ios;net8.0-maccatalyst</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041.0</TargetFrameworks>
<?xml version="1.0" encoding="UTF-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net8.0-android;net8.0-ios;net8.0-maccatalyst</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041.0</TargetFrameworks>
<!--<TargetFrameworks>net7.0-android;net7.0-ios;net7.0-maccatalyst</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net7.0-windows10.0.19041.0</TargetFrameworks>-->
<!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
<!-- <TargetFrameworks>$(TargetFrameworks);net7.0-tizen</TargetFrameworks> -->
<OutputType>Exe</OutputType>
<RootNamespace>TealiumMauiExample</RootNamespace>
<UseMaui>true</UseMaui>
<SingleProject>true</SingleProject>
<ImplicitUsings>enable</ImplicitUsings>

<!-- Display name -->
<ApplicationTitle>TealiumMauiExample</ApplicationTitle>

<!-- App Identifier -->
<ApplicationId>com.tealium.example</ApplicationId>
<ApplicationIdGuid>1c9dee5e-03b9-4bc9-9a18-6a5cd98f57f6</ApplicationIdGuid>

<!-- Versions -->
<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
<ApplicationVersion>1</ApplicationVersion>

<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">11.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net8.0-ios|AnyCPU'">
<CreatePackage>false</CreatePackage>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net8.0-ios|AnyCPU'">
<CreatePackage>false</CreatePackage>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<!-- App Icon -->
<MauiIcon Include="Resources\AppIcon\appicon.svg" ForegroundFile="Resources\AppIcon\appiconfg.svg" Color="#512BD4" />

<!-- Splash Screen -->
<MauiSplashScreen Include="Resources\Splash\splash.svg" Color="#512BD4" BaseSize="128,128" />

<!-- Images -->
<MauiImage Include="Resources\Images\*" />
<MauiImage Update="Resources\Images\dotnet_bot.svg" BaseSize="168,208" />

<!-- Custom Fonts -->
<MauiFont Include="Resources\Fonts\*" />

<!-- Raw Assets (also remove the "Resources\Raw" prefix) -->
<MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\APIs\Tealium.Common\Tealium.Common.csproj">
<ReferenceSourceTarget></ReferenceSourceTarget>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Integrations\Firebase\Tealium.RemoteCommands.Firebase.Common\Tealium.RemoteCommands.Firebase.Common.csproj" />
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.Contains('-ios')) != false ">
<ProjectReference Include="..\APIs\Tealium.iOS\Tealium.iOS.csproj" />
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.Contains('-ios')) != false ">
<ProjectReference Include="..\APIs\Tealium.Platform.iOS\Tealium.Platform.iOS.csproj" />
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.Contains('-ios')) != false ">
<ProjectReference Include="..\Integrations\Firebase\Tealium.RemoteCommands.Firebase.iOS\Tealium.RemoteCommands.Firebase.iOS.csproj" />
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.Contains('-android')) != false ">
<ProjectReference Include="..\APIs\Tealium.Platform.Droid\Tealium.Platform.Droid.csproj">
<ReferenceSourceTarget></ReferenceSourceTarget>
</ProjectReference>
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.Contains('-android')) != false ">
<ProjectReference Include="..\APIs\Tealium.Droid\Tealium.Droid.csproj">
<ReferenceSourceTarget></ReferenceSourceTarget>
</ProjectReference>
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.Contains('-android')) != false ">
<ProjectReference Include="..\Integrations\Firebase\Tealium.RemoteCommands.Firebase.Droid\Tealium.RemoteCommands.Firebase.Droid.csproj">
<ReferenceSourceTarget></ReferenceSourceTarget>
</ProjectReference>
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0-android'">
<PackageReference Include="Xamarin.Firebase.Analytics" Version="121.2.0.1" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0-ios'">
<BundleResource Include="Platforms\iOS\GoogleService-Info.plist" />
</ItemGroup>
<ItemGroup>
<None Remove="Platforms\iOS\firebase.json" />
<None Remove="Platforms\Android\firebase.json" />
<None Remove="Platforms\Android\EmptyJSONFile.json" />
</ItemGroup>
<ItemGroup>
<BundleResource Include="Platforms\iOS\firebase.json" />
<BundleResource Include="Platforms\Android\google-services.json" />
</ItemGroup>
<ItemGroup>
<AndroidAsset Include="Platforms\Android\firebase.json" />
</ItemGroup>
</Project>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net7.0-windows10.0.19041.0</TargetFrameworks>-->
<!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
<!-- <TargetFrameworks>$(TargetFrameworks);net7.0-tizen</TargetFrameworks> -->
<OutputType>Exe</OutputType>
<RootNamespace>TealiumMauiExample</RootNamespace>
<UseMaui>true</UseMaui>
<SingleProject>true</SingleProject>
<ImplicitUsings>enable</ImplicitUsings>

<!-- Display name -->
<ApplicationTitle>TealiumMauiExample</ApplicationTitle>

<!-- App Identifier -->
<ApplicationId>com.tealium.example</ApplicationId>
<ApplicationIdGuid>1c9dee5e-03b9-4bc9-9a18-6a5cd98f57f6</ApplicationIdGuid>

<!-- Versions -->
<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
<ApplicationVersion>1</ApplicationVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">11.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net8.0-ios|AnyCPU'">
<CreatePackage>false</CreatePackage>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net8.0-ios|AnyCPU'">
<CreatePackage>false</CreatePackage>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>

<!-- App Icon -->
<MauiIcon Include="Resources\AppIcon\appicon.svg" ForegroundFile="Resources\AppIcon\appiconfg.svg" Color="#512BD4" />

<!-- Splash Screen -->
<MauiSplashScreen Include="Resources\Splash\splash.svg" Color="#512BD4" BaseSize="128,128" />

<!-- Images -->
<MauiImage Include="Resources\Images\*" />
<MauiImage Update="Resources\Images\dotnet_bot.svg" BaseSize="168,208" />

<!-- Custom Fonts -->
<MauiFont Include="Resources\Fonts\*" />

<!-- Raw Assets (also remove the "Resources\Raw" prefix) -->
<MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\APIs\Tealium.Common\Tealium.Common.csproj">
<ReferenceSourceTarget>
</ReferenceSourceTarget>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Integrations\Firebase\Tealium.RemoteCommands.Firebase.Common\Tealium.RemoteCommands.Firebase.Common.csproj" />
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.Contains('-ios')) != false ">
<ProjectReference Include="..\APIs\Tealium.iOS\Tealium.iOS.csproj" />
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.Contains('-ios')) != false ">
<ProjectReference Include="..\APIs\Tealium.Platform.iOS\Tealium.Platform.iOS.csproj" />
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.Contains('-ios')) != false ">
<ProjectReference Include="..\Integrations\Firebase\Tealium.RemoteCommands.Firebase.iOS\Tealium.RemoteCommands.Firebase.iOS.csproj" />
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.Contains('-android')) != false ">
<ProjectReference Include="..\APIs\Tealium.Platform.Droid\Tealium.Platform.Droid.csproj">
<ReferenceSourceTarget>
</ReferenceSourceTarget>
</ProjectReference>
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.Contains('-android')) != false ">
<ProjectReference Include="..\APIs\Tealium.Droid\Tealium.Droid.csproj">
<ReferenceSourceTarget>
</ReferenceSourceTarget>
</ProjectReference>
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.Contains('-android')) != false ">
<ProjectReference Include="..\Integrations\Firebase\Tealium.RemoteCommands.Firebase.Droid\Tealium.RemoteCommands.Firebase.Droid.csproj">
<ReferenceSourceTarget>
</ReferenceSourceTarget>
</ProjectReference>
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0-android'">
<PackageReference Include="Xamarin.Firebase.Analytics" Version="121.2.0.1" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0-ios'">
<BundleResource Include="Platforms\iOS\GoogleService-Info.plist" />
</ItemGroup>
<ItemGroup>
<None Remove="Platforms\iOS\firebase.json" />
<None Remove="Platforms\Android\firebase.json" />
<None Remove="Platforms\Android\EmptyJSONFile.json" />
</ItemGroup>
<ItemGroup>
<BundleResource Include="Platforms\iOS\firebase.json" />
<BundleResource Include="Platforms\Android\google-services.json" />
</ItemGroup>
<ItemGroup>
<AndroidAsset Include="Platforms\Android\firebase.json" />
</ItemGroup>

<!--Workaround for running with xcode 15.3 and iOS simulator 17.4-->
<PropertyGroup>
<_LibXamarinLinkMode>static</_LibXamarinLinkMode>
<_LibMonoLinkMode>static</_LibMonoLinkMode>
<InvariantGlobalization>true</InvariantGlobalization>
</PropertyGroup>
<Target Name="_FixMonoLinkMode" AfterTargets="_MonoReadAvailableComponentsManifest">
<ItemGroup>
<_MonoRuntimeComponentLinking Remove="dynamic" />
<_MonoRuntimeComponentLinking Include="static" RuntimeIdentifier="iossimulator-arm64" />
<_MonoRuntimeComponentLinking Include="static" RuntimeIdentifier="iossimulator-x64" />
</ItemGroup>
</Target>
</Project>

0 comments on commit e3518de

Please sign in to comment.