Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MT-1693] Updates to latest SDKs #4

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

[MT-1693] Updates to latest SDKs #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f800c10
WIP: Updates to latest SDKs + Net9 support
tamayok Feb 27, 2025
6b3bc1d
Android binding: disable fullMode
tamayok Mar 12, 2025
08a6dd2
Update Android binding with latest kotlin modules
tamayok Mar 19, 2025
334cf70
Cleanup gradle
tamayok Mar 19, 2025
f8bff49
Update nuspecs
tamayok Mar 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion APIs/Tealium.Common/Constants.cs
View file
Open in desktop
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.2";
public const string pluginVersion = "1.1.0";
}

public static class DataLayerKeys
Expand Down
12 changes: 6 additions & 6 deletions APIs/Tealium.Common/Tealium.Common.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0;net8.0-ios</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041.0</TargetFrameworks>
<TargetFrameworks>net9.0;net9.0-ios</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net9.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> -->
<UseMaui>true</UseMaui>
Expand All @@ -11,18 +11,18 @@
<SingleProject>true</SingleProject>
<ImplicitUsings>enable</ImplicitUsings>

<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">14.2</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">14.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">15.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">15.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net8.0-ios|AnyCPU'">
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net9.0-ios|AnyCPU'">
<CreatePackage>false</CreatePackage>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net8.0-ios|AnyCPU'">
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net9.0-ios|AnyCPU'">
<CreatePackage>false</CreatePackage>
</PropertyGroup>
</Project>
6 changes: 3 additions & 3 deletions APIs/Tealium.Droid/Tealium.Droid.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0-android</TargetFramework>
<TargetFramework>net9.0-android</TargetFramework>
<SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
Expand All @@ -9,7 +9,7 @@
<ProjectReference Include="..\Tealium.Platform.Droid\Tealium.Platform.Droid.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Kotlin.StdLib" Version="1.9.22" />
<PackageReference Include="Xamarin.Kotlin.StdLib.Common" Version="1.9.22" />
<PackageReference Include="Xamarin.Kotlin.StdLib" Version="[2.0.21.2, 3.0.0)" />
<PackageReference Include="Xamarin.Kotlin.StdLib.Common" Version="[2.0.21.2, 3.0.0)" />
</ItemGroup>
</Project>
13 changes: 8 additions & 5 deletions APIs/Tealium.Platform.Droid/Tealium.Platform.Droid.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0-android</TargetFramework>
<TargetFramework>net9.0-android</TargetFramework>
<SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
<ImplicitUsings>enable</ImplicitUsings>
<IsBindingProject>true</IsBindingProject>
</PropertyGroup>
<ItemGroup>
<AndroidLibrary Include="bindings-release.aar" />
</ItemGroup>
<ItemGroup>
<None Include="Additions\AboutAdditions.txt" />
<None Include="Jars\AboutJars.txt" />
Expand All @@ -15,9 +18,9 @@
<TransformFile Include="Transforms\Metadata.xml" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Kotlin.StdLib" Version="1.8.10" />
<PackageReference Include="Xamarin.Kotlin.StdLib.Common" Version="1.8.10" />
<PackageReference Include="Xamarin.Jetbrains.Annotations" Version="24.0.1" />
<PackageReference Include="Xamarin.KotlinX.Coroutines.Android" Version="1.6.4.2" />
<PackageReference Include="Xamarin.Kotlin.StdLib" Version="[2.0.21.2, 3.0.0)" />
<PackageReference Include="Xamarin.Kotlin.StdLib.Common" Version="[2.0.21.2, 3.0.0)" />
<PackageReference Include="Xamarin.Jetbrains.Annotations" Version="26.0.1.2" />
<PackageReference Include="Xamarin.KotlinX.Coroutines.Android" Version="1.9.0.2" />
</ItemGroup>
</Project>
Binary file modified APIs/Tealium.Platform.Droid/bindings-release.aar
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion APIs/Tealium.Platform.iOS/ApiDefinition.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using WebKit;

#if !NET
using NativeHandle = System.IntPtr;
using NativeHandle=System.IntPtr;
#endif

namespace Tealium.Platform.iOS
Expand Down
2 changes: 1 addition & 1 deletion APIs/Tealium.Platform.iOS/Tealium.Platform.iOS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0-ios</TargetFramework>
<TargetFramework>net9.0-ios</TargetFramework>
<ImplicitUsings>true</ImplicitUsings>
<IsBindingProject>true</IsBindingProject>
<NoBindingEmbedding>true</NoBindingEmbedding>
Expand Down
4 changes: 4 additions & 0 deletions APIs/Tealium.Platform.iOS/XamarinApiDef/ApiDefinitions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
using UIKit;
using WebKit;

#if !NET
using NativeHandle=System.IntPtr;
#endif

namespace Tealium.Platform.iOS
{
// @interface ConsentManagerWrapper : NSObject
Expand Down
2 changes: 1 addition & 1 deletion APIs/Tealium.iOS/Tealium.iOS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0-ios</TargetFramework>
<TargetFramework>net9.0-ios</TargetFramework>
<ImplicitUsings>true</ImplicitUsings>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
Expand Down
2 changes: 1 addition & 1 deletion Bindings/android/.idea/compiler.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 3 additions & 4 deletions Bindings/android/.idea/gradle.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Bindings/android/.idea/kotlinc.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion Bindings/android/.idea/misc.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions Bindings/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ plugins {
}

android {
compileSdkVersion 33
buildToolsVersion "30.0.3"
namespace = "com.tealium.maui"
compileSdk = 34

defaultConfig {
applicationId "com.tealium.maui"
minSdkVersion 21
targetSdkVersion 33
targetSdkVersion 34
versionCode 1
versionName "1.0"

Expand Down
26 changes: 11 additions & 15 deletions Bindings/android/bindings/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ plugins {
}

android {
compileSdkVersion 33
buildToolsVersion "30.0.3"
namespace = "com.tealium.bindings"
compileSdk = 34

defaultConfig {
minSdkVersion 21
targetSdkVersion 33
targetSdkVersion 34
versionCode 1
versionName "1.0"

Expand All @@ -34,17 +34,13 @@ android {
}

dependencies {
implementation 'androidx.appcompat:appcompat:1.6.1'

implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
implementation 'androidx.core:core-ktx:1.5.0'
implementation 'androidx.appcompat:appcompat:1.3.0'
implementation 'com.google.android.material:material:1.3.0'

embed "com.tealium:remotecommands:1.0.2"
embed "com.tealium:kotlin-core:1.5.5"
embed "com.tealium:kotlin-collect-dispatcher:1.1.1"
embed "com.tealium:kotlin-lifecycle:1.2.0"
embed "com.tealium:kotlin-remotecommand-dispatcher:1.3.1"
embed "com.tealium:kotlin-tagmanagement-dispatcher:1.2.1"
embed "com.tealium:kotlin-visitor-service:1.2.0"
embed "com.tealium:remotecommands:1.0.3"
embed "com.tealium:kotlin-core:1.7.3"
embed "com.tealium:kotlin-collect-dispatcher:1.1.4"
embed "com.tealium:kotlin-lifecycle:1.2.3"
embed "com.tealium:kotlin-remotecommand-dispatcher:1.5.3"
embed "com.tealium:kotlin-tagmanagement-dispatcher:1.2.6"
embed "com.tealium:kotlin-visitor-service:1.2.4"
}
4 changes: 1 addition & 3 deletions Bindings/android/bindings/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.tealium.bindings">

<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>
15 changes: 11 additions & 4 deletions Bindings/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,25 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
ext.kotlin_version = "1.6.21"
ext.kotlin_version = "1.8.22"
repositories {
google()
mavenCentral()

maven {
setUrl("https://jitpack.io")
content {
includeGroup("com.github.aasitnikov")
}
}
}
dependencies {
classpath "com.android.tools.build:gradle:4.1.3"
classpath "com.android.tools.build:gradle:8.6.1"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files

classpath 'com.github.kezong:fat-aar:1.3.6'
classpath 'com.github.aasitnikov:fat-aar-android:1.4.1'
}
}

Expand All @@ -25,6 +32,6 @@ allprojects {
}
}

task clean(type: Delete) {
tasks.register('clean', Delete) {
delete rootProject.buildDir
}
2 changes: 1 addition & 1 deletion Bindings/android/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ android.useAndroidX=true
android.enableJetifier=true
# Kotlin code style for this project: "official" or "obsolete":
kotlin.code.style=official

android.enableR8.fullMode=false
android.disableResourceValidation=true
4 changes: 2 additions & 2 deletions Bindings/android/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Mon Aug 16 17:13:33 BST 2021
#Tue Feb 11 15:17:22 PST 2025
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
28 changes: 14 additions & 14 deletions Bindings/iOS/TealiumWrapperCocoapods/Example/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
PODS:
- tealium-swift/Collect (2.12.3):
- tealium-swift/Collect (2.16.0):
- tealium-swift/Core
- tealium-swift/Core (2.12.3)
- tealium-swift/Lifecycle (2.12.3):
- tealium-swift/Core (2.16.0)
- tealium-swift/Lifecycle (2.16.0):
- tealium-swift/Core
- tealium-swift/RemoteCommands (2.12.3):
- tealium-swift/RemoteCommands (2.16.0):
- tealium-swift/Core
- tealium-swift/TagManagement (2.12.3):
- tealium-swift/TagManagement (2.16.0):
- tealium-swift/Core
- tealium-swift/VisitorService (2.12.3):
- tealium-swift/VisitorService (2.16.0):
- tealium-swift/Core
- TealiumWrapperCocoapods (0.1.0):
- tealium-swift/Collect (~> 2.12)
- tealium-swift/Core (~> 2.12)
- tealium-swift/Lifecycle (~> 2.12)
- tealium-swift/RemoteCommands (~> 2.12)
- tealium-swift/TagManagement (~> 2.12)
- tealium-swift/VisitorService (~> 2.12)
- tealium-swift/Collect (~> 2.16)
- tealium-swift/Core (~> 2.16)
- tealium-swift/Lifecycle (~> 2.16)
- tealium-swift/RemoteCommands (~> 2.16)
- tealium-swift/TagManagement (~> 2.16)
- tealium-swift/VisitorService (~> 2.16)

DEPENDENCIES:
- TealiumWrapperCocoapods (from `../`)
Expand All @@ -30,8 +30,8 @@ EXTERNAL SOURCES:
:path: "../"

SPEC CHECKSUMS:
tealium-swift: 3979f3eadf84e5c9ec391f2cba01375e36d4b26c
TealiumWrapperCocoapods: 73d1ff3a41fceb4a6f8c96dd3a2dbe4d5fa08821
tealium-swift: b288efd08c4721cf0b70dcf1149f055fbaec977b
TealiumWrapperCocoapods: f38f008d6685745fef68bfccd5efe1e05e7bf2b1

PODFILE CHECKSUM: 4ba0d871bd1ff9d5ac6993cc0b797c597cd05a72

Expand Down
1 change: 0 additions & 1 deletion ...ngs/iOS/TealiumWrapperCocoapods/Example/TealiumWrapperCocoapods.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,6 @@
};
607FACE41AFB9204008FA782 = {
CreatedOnToolsVersion = 6.3.1;
DevelopmentTeam = XC939GDC9P;
LastSwiftMigration = 1250;
ProvisioningStyle = Automatic;
};
Expand Down
12 changes: 6 additions & 6 deletions Bindings/iOS/TealiumWrapperCocoapods/TealiumWrapperCocoapods.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@ TODO: Add long description of the pod here.

# s.public_header_files = 'Pod/Classes/**/*.h'
# s.frameworks = 'UIKit', 'MapKit'
s.dependency 'tealium-swift/Core', '~> 2.12'
s.dependency 'tealium-swift/TagManagement', '~> 2.12'
s.dependency 'tealium-swift/Lifecycle', '~> 2.12'
s.dependency 'tealium-swift/VisitorService', '~> 2.12'
s.dependency 'tealium-swift/RemoteCommands', '~> 2.12'
s.dependency 'tealium-swift/Collect', '~> 2.12'
s.dependency 'tealium-swift/Core', '~> 2.16'
s.dependency 'tealium-swift/TagManagement', '~> 2.16'
s.dependency 'tealium-swift/Lifecycle', '~> 2.16'
s.dependency 'tealium-swift/VisitorService', '~> 2.16'
s.dependency 'tealium-swift/RemoteCommands', '~> 2.16'
s.dependency 'tealium-swift/Collect', '~> 2.16'

end
2 changes: 1 addition & 1 deletion Integrations/Firebase/Tealium.RemoteCommands.Firebase.Common/FirebaseRemoteCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public FirebaseRemoteCommand(string commandId, string description)

public string Name => "maui-"+CommandId;

public string Version => "1.0.0";
public string Version => "1.1.0";

/// <summary>
/// Handles the Remote Command response - this contains all the logic
Expand Down
Loading