From f641f1828c04e56868022a5f86df8c3f5d96f2f9 Mon Sep 17 00:00:00 2001 From: huyufei Date: Thu, 30 May 2024 10:56:14 +0800 Subject: [PATCH] =?UTF-8?q?update=EF=BC=9A=20=E5=8D=87=E7=BA=A7=20GuruCons?= =?UTF-8?q?ent=20iOS=20=E7=89=88=E6=9C=AC=20->=201.4.6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --story=1020278 --user=yufei.hu 【中台】【发行】【iOS】 将 GuruConsent 库升级到最新的版本， 将线上的 Pods 依赖改为 UPM 内部文件依赖 https://www.tapd.cn/33527076/s/1147539 Signed-off-by: huyufei --- .../IOSPostProcessBuild_PrivacyInfo.cs | 2 + Runtime/GuruConsent/Bridge.meta | 3 ++ Runtime/GuruConsent/Bridge/Plugins.meta | 3 ++ Runtime/GuruConsent/Bridge/Plugins/iOS.meta | 3 ++ .../{ => Bridge}/Plugins/iOS/U3DConsent.mm | 0 .../Plugins/iOS/U3DConsent.mm.meta | 0 Runtime/GuruConsent/Editor/Dependencies.xml | 6 +-- .../Plugins/iOS/GuruConsent.podspec | 40 +++++++++++++++++++ .../Plugins/iOS/GuruConsent.podspec.meta | 3 ++ Runtime/GuruConsent/Plugins/iOS/LICENSE | 1 + Runtime/GuruConsent/Plugins/iOS/LICENSE.meta | 7 ++++ Runtime/GuruConsent/Plugins/iOS/README.md | 1 + .../GuruConsent/Plugins/iOS/README.md.meta | 7 ++++ Runtime/GuruConsent/Plugins/iOS/Resources | 1 + .../GuruConsent/Plugins/iOS/Resources.meta | 8 ++++ Runtime/GuruConsent/Plugins/iOS/Sources | 1 + Runtime/GuruConsent/Plugins/iOS/Sources.meta | 8 ++++ Runtime/GuruConsent/README.md | 6 +++ 18 files changed, 95 insertions(+), 5 deletions(-) create mode 100644 Runtime/GuruConsent/Bridge.meta create mode 100644 Runtime/GuruConsent/Bridge/Plugins.meta create mode 100644 Runtime/GuruConsent/Bridge/Plugins/iOS.meta rename Runtime/GuruConsent/{ => Bridge}/Plugins/iOS/U3DConsent.mm (100%) rename Runtime/GuruConsent/{ => Bridge}/Plugins/iOS/U3DConsent.mm.meta (100%) create mode 100644 Runtime/GuruConsent/Plugins/iOS/GuruConsent.podspec create mode 100644 Runtime/GuruConsent/Plugins/iOS/GuruConsent.podspec.meta create mode 120000 Runtime/GuruConsent/Plugins/iOS/LICENSE create mode 100644 Runtime/GuruConsent/Plugins/iOS/LICENSE.meta create mode 120000 Runtime/GuruConsent/Plugins/iOS/README.md create mode 100644 Runtime/GuruConsent/Plugins/iOS/README.md.meta create mode 120000 Runtime/GuruConsent/Plugins/iOS/Resources create mode 100644 Runtime/GuruConsent/Plugins/iOS/Resources.meta create mode 120000 Runtime/GuruConsent/Plugins/iOS/Sources create mode 100644 Runtime/GuruConsent/Plugins/iOS/Sources.meta diff --git a/Editor/GuruBuildSuit/IOS_POST_PRIVACYINFO/IOSPostProcessBuild_PrivacyInfo.cs b/Editor/GuruBuildSuit/IOS_POST_PRIVACYINFO/IOSPostProcessBuild_PrivacyInfo.cs index e717315..058e45b 100644 --- a/Editor/GuruBuildSuit/IOS_POST_PRIVACYINFO/IOSPostProcessBuild_PrivacyInfo.cs +++ b/Editor/GuruBuildSuit/IOS_POST_PRIVACYINFO/IOSPostProcessBuild_PrivacyInfo.cs @@ -77,6 +77,8 @@ namespace Guru.Editor var workdir = GetWorkdir(); var source = $"{workdir}/{SourceFileName}"; + var toDir = Directory.GetParent(IosPrivacyInfoPath); + if (!toDir.Exists) toDir.Create(); if (File.Exists(source)) { FileUtil.ReplaceFile(source, IosPrivacyInfoPath); diff --git a/Runtime/GuruConsent/Bridge.meta b/Runtime/GuruConsent/Bridge.meta new file mode 100644 index 0000000..bc56537 --- /dev/null +++ b/Runtime/GuruConsent/Bridge.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: b88f29431cdd47f9bc1945ddd590c4df +timeCreated: 1717035321 \ No newline at end of file diff --git a/Runtime/GuruConsent/Bridge/Plugins.meta b/Runtime/GuruConsent/Bridge/Plugins.meta new file mode 100644 index 0000000..0ab4f91 --- /dev/null +++ b/Runtime/GuruConsent/Bridge/Plugins.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: c1d92ec4f77c4f179f05f8a7be17de86 +timeCreated: 1717035338 \ No newline at end of file diff --git a/Runtime/GuruConsent/Bridge/Plugins/iOS.meta b/Runtime/GuruConsent/Bridge/Plugins/iOS.meta new file mode 100644 index 0000000..11b1c1c --- /dev/null +++ b/Runtime/GuruConsent/Bridge/Plugins/iOS.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 4e5722a54ec94d72a304d981db2426f7 +timeCreated: 1717035343 \ No newline at end of file diff --git a/Runtime/GuruConsent/Plugins/iOS/U3DConsent.mm b/Runtime/GuruConsent/Bridge/Plugins/iOS/U3DConsent.mm similarity index 100% rename from Runtime/GuruConsent/Plugins/iOS/U3DConsent.mm rename to Runtime/GuruConsent/Bridge/Plugins/iOS/U3DConsent.mm diff --git a/Runtime/GuruConsent/Plugins/iOS/U3DConsent.mm.meta b/Runtime/GuruConsent/Bridge/Plugins/iOS/U3DConsent.mm.meta similarity index 100% rename from Runtime/GuruConsent/Plugins/iOS/U3DConsent.mm.meta rename to Runtime/GuruConsent/Bridge/Plugins/iOS/U3DConsent.mm.meta diff --git a/Runtime/GuruConsent/Editor/Dependencies.xml b/Runtime/GuruConsent/Editor/Dependencies.xml index 112bccc..a256a85 100644 --- a/Runtime/GuruConsent/Editor/Dependencies.xml +++ b/Runtime/GuruConsent/Editor/Dependencies.xml @@ -10,10 +10,6 @@ Sample Dependencies.xml: - - - git@github.com:castbox/GuruSpecs.git - - > + diff --git a/Runtime/GuruConsent/Plugins/iOS/GuruConsent.podspec b/Runtime/GuruConsent/Plugins/iOS/GuruConsent.podspec new file mode 100644 index 0000000..d5dd05d --- /dev/null +++ b/Runtime/GuruConsent/Plugins/iOS/GuruConsent.podspec @@ -0,0 +1,40 @@ +# +# Be sure to run `pod lib lint CastboxNetwork.podspec' to ensure this is a +# valid spec before submitting. +# +# Any lines starting with a # are optional, but their use is encouraged +# To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html +# + +Pod::Spec.new do |s| + s.name = 'GuruConsent' + s.version = '1.4.6' + s.summary = 'Google GDPR' + s.description = 'Google GDPR' + + s.homepage = 'https://github.com/castbox/GuruConsent-iOS' + s.license = { :type => 'MIT', :file => 'LICENSE' } + s.author = { 'LEE' => 'xiang.li@castbox.fm' } + # s.source = { :git => 'git@github.com:castbox/GuruConsent-iOS.git', :tag => s.version } + s.source = { :tag => s.version } + + s.frameworks = 'UIKit', 'AppTrackingTransparency' + s.swift_version = '5.0' + s.ios.deployment_target = '12.0' + + s.source_files = "Sources/**/*.swift" + + s.requires_arc = true + + s.static_framework = true + + s.default_subspec = 'Privacy' + + s.dependency 'GoogleUserMessagingPlatform', '2.3.0' + + s.subspec 'Privacy' do |ss| + ss.resource_bundles = { + s.name => 'Resources/PrivacyInfo.xcprivacy' + } + end +end diff --git a/Runtime/GuruConsent/Plugins/iOS/GuruConsent.podspec.meta b/Runtime/GuruConsent/Plugins/iOS/GuruConsent.podspec.meta new file mode 100644 index 0000000..872dd9c --- /dev/null +++ b/Runtime/GuruConsent/Plugins/iOS/GuruConsent.podspec.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 4d451434a71243edb55e61e8fd0040a0 +timeCreated: 1717035350 \ No newline at end of file diff --git a/Runtime/GuruConsent/Plugins/iOS/LICENSE b/Runtime/GuruConsent/Plugins/iOS/LICENSE new file mode 120000 index 0000000..b012b3a --- /dev/null +++ b/Runtime/GuruConsent/Plugins/iOS/LICENSE @@ -0,0 +1 @@ +/Users/huyfuei/Workspace/Castbox/SDK/Native/GuruConsent-iOS/LICENSE \ No newline at end of file diff --git a/Runtime/GuruConsent/Plugins/iOS/LICENSE.meta b/Runtime/GuruConsent/Plugins/iOS/LICENSE.meta new file mode 100644 index 0000000..6df4085 --- /dev/null +++ b/Runtime/GuruConsent/Plugins/iOS/LICENSE.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 0819b6a57c25e4ef0bd2f83c97a353fd +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Runtime/GuruConsent/Plugins/iOS/README.md b/Runtime/GuruConsent/Plugins/iOS/README.md new file mode 120000 index 0000000..a167ee3 --- /dev/null +++ b/Runtime/GuruConsent/Plugins/iOS/README.md @@ -0,0 +1 @@ +/Users/huyfuei/Workspace/Castbox/SDK/Native/GuruConsent-iOS/README.md \ No newline at end of file diff --git a/Runtime/GuruConsent/Plugins/iOS/README.md.meta b/Runtime/GuruConsent/Plugins/iOS/README.md.meta new file mode 100644 index 0000000..19359d8 --- /dev/null +++ b/Runtime/GuruConsent/Plugins/iOS/README.md.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 2591a1ab95ce94235adc38c94f28f029 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Runtime/GuruConsent/Plugins/iOS/Resources b/Runtime/GuruConsent/Plugins/iOS/Resources new file mode 120000 index 0000000..9464a8b --- /dev/null +++ b/Runtime/GuruConsent/Plugins/iOS/Resources @@ -0,0 +1 @@ +/Users/huyfuei/Workspace/Castbox/SDK/Native/GuruConsent-iOS/Resources \ No newline at end of file diff --git a/Runtime/GuruConsent/Plugins/iOS/Resources.meta b/Runtime/GuruConsent/Plugins/iOS/Resources.meta new file mode 100644 index 0000000..0c3268d --- /dev/null +++ b/Runtime/GuruConsent/Plugins/iOS/Resources.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 30771cebf05b44ad19739c67642b61ce +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Runtime/GuruConsent/Plugins/iOS/Sources b/Runtime/GuruConsent/Plugins/iOS/Sources new file mode 120000 index 0000000..ea570b1 --- /dev/null +++ b/Runtime/GuruConsent/Plugins/iOS/Sources @@ -0,0 +1 @@ +/Users/huyfuei/Workspace/Castbox/SDK/Native/GuruConsent-iOS/Sources \ No newline at end of file diff --git a/Runtime/GuruConsent/Plugins/iOS/Sources.meta b/Runtime/GuruConsent/Plugins/iOS/Sources.meta new file mode 100644 index 0000000..f183db6 --- /dev/null +++ b/Runtime/GuruConsent/Plugins/iOS/Sources.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9c2ff42f8bf73454290c2c13d6de943d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Runtime/GuruConsent/README.md b/Runtime/GuruConsent/README.md index 2ab12b3..151741a 100644 --- a/Runtime/GuruConsent/README.md +++ b/Runtime/GuruConsent/README.md @@ -1,5 +1,11 @@ # Guru Unity Consent +## Version 1.0.8 +* 更新 GuruConsent 的 iOS 库版本至 `1.4.6` +* 更新 iOS 库添加 Privacy Policy 的配置项 +* 更新 iOS 依赖的 cocospods 库地址 + + ## Version 1.0.7 * 更新 Consent 针对 Json 参数的回调和解析逻辑.