Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions components.cake
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Artifact GOOGLE_UMP_ARTIFACT = new Artifact ("Google.UserM
Artifact GOOGLE_PLACES_ARTIFACT = new Artifact ("Google.Places", "7.4.0.2", "15.0", ComponentGroup.Google, csprojName: "Places");
Artifact GOOGLE_APP_CHECK_CORE_ARTIFACT = new Artifact ("Google.AppCheckCore", "11.2.0.0", "15.0", ComponentGroup.Google, csprojName: "AppCheckCore");
Artifact GOOGLE_SIGN_IN_ARTIFACT = new Artifact ("Google.SignIn", "9.0.0.0", "15.0", ComponentGroup.Google, csprojName: "SignIn");
Artifact GOOGLE_TAG_MANAGER_ARTIFACT = new Artifact ("Google.TagManager", "7.4.0.2", "15.0", ComponentGroup.Google, csprojName: "TagManager");
Artifact GOOGLE_TAG_MANAGER_ARTIFACT = new Artifact ("Google.TagManager", "9.2.0.0", "15.0", ComponentGroup.Google, csprojName: "TagManager");

Artifact GOOGLE_GOOGLE_APP_MEASUREMENT_ARTIFACT = new Artifact ("Google.AppMeasurement", "12.10.0", "15.0", ComponentGroup.Google, csprojName: "GoogleAppMeasurement");
Artifact GOOGLE_PROMISES_OBJC_ARTIFACT = new Artifact ("Google.PromisesObjC", "2.4.0.5", "15.0", ComponentGroup.Google, csprojName: "PromisesObjC");
Expand Down Expand Up @@ -237,7 +237,7 @@ void SetArtifactsPodSpecs ()
PodSpec.Create ("AppCheckCore", "11.2.0", frameworkSource: FrameworkSource.Pods),
};
GOOGLE_TAG_MANAGER_ARTIFACT.PodSpecs = new [] {
PodSpec.Create ("GoogleTagManager", "7.4.0")
PodSpec.Create ("GoogleTagManager", "9.2.0")
};
GOOGLE_GOOGLE_APP_MEASUREMENT_ARTIFACT.PodSpecs = new [] {
PodSpec.Create ("GoogleAppMeasurement", "12.10.0")
Expand Down
1 change: 0 additions & 1 deletion source/Google/TagManager/Loader.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ static Loader ()
Firebase.Core.Loader.ForceLoad ();
Firebase.Installations.Loader.ForceLoad ();
Firebase.Analytics.Loader.ForceLoad ();
Google.Analytics.Loader.ForceLoad ();
}

public static void ForceLoad ()
Expand Down
7 changes: 3 additions & 4 deletions source/Google/TagManager/TagManager.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net9.0-ios</TargetFramework>
<TargetFrameworks>net9.0-ios;net10.0-ios</TargetFrameworks>
<Nullable>enable</Nullable>
<ImplicitUsings>true</ImplicitUsings>
<IsBindingProject>true</IsBindingProject>
Expand All @@ -9,7 +9,7 @@
<RootNamespace>Google.TagManager</RootNamespace>
<AssemblyName>Google.TagManager</AssemblyName>
<AssemblyVersion>1.0.0.0</AssemblyVersion>
<FileVersion>7.4.0.2</FileVersion>
<FileVersion>9.2.0.0</FileVersion>
<IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
Expand All @@ -25,7 +25,7 @@
<PackageProjectUrl>https://github.com/AdamEssenmacher/GoogleApisForiOSComponents</PackageProjectUrl>
<PackageLicenseFile>License.md</PackageLicenseFile>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<PackageVersion>7.4.0.2</PackageVersion>
<PackageVersion>9.2.0.0</PackageVersion>
</PropertyGroup>
<ItemGroup>
<Compile Include="..\..\AssemblyInfo.cs" />
Expand All @@ -52,6 +52,5 @@
<ProjectReference Include="..\..\Firebase\Core\Core.csproj" PrivateAssets="None" />
<ProjectReference Include="..\..\Firebase\Installations\Installations.csproj" PrivateAssets="None" />
<ProjectReference Include="..\..\Firebase\Analytics\Analytics.csproj" PrivateAssets="None" />
<ProjectReference Include="..\Analytics\Analytics.csproj" PrivateAssets="None" />
</ItemGroup>
</Project>
19 changes: 4 additions & 15 deletions source/Google/TagManager/TagManager.targets
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<Project>
<Project>
<PropertyGroup>
<_GoogleTagManagerAssemblyName>Google.TagManager, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</_GoogleTagManagerAssemblyName>
<_GoogleTagManagerItemsFolder>GTagM-7.4.0</_GoogleTagManagerItemsFolder>
<_GoogleTagManagerItemsFolder>GTagM-9.2.0</_GoogleTagManagerItemsFolder>
<_GoogleTagManagerSDKBaseFolder>$(XamarinBuildDownloadDir)$(_GoogleTagManagerItemsFolder)\</_GoogleTagManagerSDKBaseFolder>
<_GoogleTagManageFrameworksBaseFolder>$(_GoogleTagManagerSDKBaseFolder)GoogleTagManager-7.4.0\Frameworks\</_GoogleTagManageFrameworksBaseFolder>
<_GoogleTagManageFrameworksBaseFolder>$(_GoogleTagManagerSDKBaseFolder)GoogleTagManager-9.2.0\Frameworks\</_GoogleTagManageFrameworksBaseFolder>
</PropertyGroup>
<!-- Framework names to strip bitcode -->
<ItemGroup Condition="('$(OutputType)'!='Library' OR '$(IsAppExtension)'=='True')">
<_FrameworkNamesToStripBitcode Include="GoogleTagManager" />
</ItemGroup>
<ItemGroup Condition="('$(OutputType)'!='Library' OR '$(IsAppExtension)'=='True')">
<XamarinBuildDownload Include="$(_GoogleTagManagerItemsFolder)">
<Url>https://dl.google.com/firebase/ios/tagmanager/405c0e6ab8f653b7/GoogleTagManager-7.4.0.tar.gz</Url>
<Url>https://dl.google.com/firebase/ios/tagmanager/17aa166d14dad8ed/GoogleTagManager-9.2.0.tar.gz</Url>
<Kind>Tgz</Kind>
</XamarinBuildDownload>
<NativeReference Include="$(_GoogleTagManageFrameworksBaseFolder)GoogleTagManager.xcframework">
Expand All @@ -21,16 +21,5 @@
<LinkerFlags>-ObjC -lsqlite3 -lz</LinkerFlags>
<Frameworks>AdSupport CoreTelephony JavaScriptCore SystemConfiguration UIKit</Frameworks>
</NativeReference>
<XamarinBuildRestoreResources Include="_GTagMDownloadedItems" />
</ItemGroup>
<Target Name="_GTagMDownloadedItems">
<ItemGroup>
<BundleResource Include="$(_GoogleTagManageFrameworksBaseFolder)GoogleTagManager.xcframework\Resources\TagManagerResources.bundle\Info.plist" Visible="False">
<LogicalName>TagManagerResources.bundle\Info.plist</LogicalName>
</BundleResource>
<BundleResource Include="$(_GoogleTagManageFrameworksBaseFolder)GoogleTagManager.xcframework\Resources\TagManagerResources.bundle\TAGRuntime.js.dat" Visible="False">
<LogicalName>TagManagerResources.bundle\TAGRuntime.js.dat</LogicalName>
</BundleResource>
</ItemGroup>
</Target>
</Project>
Loading