Remove embedded EDM4U from TopOn package

CHANGELOG.md

@@ -1,3 +1,22 @@
+# [1.4.13]
+
+### 修复
+
+* 移除包内嵌的 EDM4U 1.2.177，避免消费项目启动导入阶段重复初始化 Google Version Handler 并写入 `ProjectSettings/GvhProjectSettings.xml`。
+* 保留 `Dependencies.xml` 依赖声明，由宿主项目统一安装和管理 EDM4U 版本。
+
+# [1.4.12]
+
+### 修复
+
+* Android 构建后处理在 launcher `application` 已存在 `android:appComponentFactory` 时，同步合并 `tools:replace="android:appComponentFactory"`，避免 TapTap AndroidX manifest merger 冲突。
+
+# [1.4.11]
+
+### 修复
+
+* Android 构建后处理合并 `tools:replace` 声明，避免覆盖宿主项目已有的 `android:appComponentFactory` 冲突处理。
+
 # [1.4.10]
 
 ### 更新

ExternalDependencyManager.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 90c597385ff9346a89d38256315fb735
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

ExternalDependencyManager/Editor.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 773d3f2446f5440bb892ec25e114d547
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

ExternalDependencyManager/Editor/1.2.177.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 9ee3e98fba8c1468bbdf8cfa0803a7d8
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

ExternalDependencyManager/Editor/1.2.177/Google.IOSResolver.dll.meta

@@ -1,36 +0,0 @@
-fileFormatVersion: 2
-guid: 5552c54c11d94016bcfe740f27df44a6
-labels:
-- gvh
-- gvh_version-1.2.177
-- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.177/Google.IOSResolver.dll
-- gvhp_targets-editor
-timeCreated: 1480838400
-PluginImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  iconMap: {}
-  executionOrder: {}
-  isPreloaded: 0
-  isOverridable: 0
-  platformData:
-  - first:
-      Any:
-    second:
-      enabled: 0
-      settings: {}
-  - first:
-      Editor: Editor
-    second:
-      enabled: 1
-      settings:
-        DefaultValueInitialized: true
-  - first:
-      Windows Store Apps: WindowsStoreApps
-    second:
-      enabled: 0
-      settings:
-        CPU: AnyCPU
-  userData:
-  assetBundleName:
-  assetBundleVariant:

ExternalDependencyManager/Editor/1.2.177/Google.JarResolver.dll.meta

@@ -1,36 +0,0 @@
-fileFormatVersion: 2
-guid: 1f4f113972f04c3695341dfb3ba48d3b
-labels:
-- gvh
-- gvh_version-1.2.177
-- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.177/Google.JarResolver.dll
-- gvhp_targets-editor
-timeCreated: 1480838400
-PluginImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  iconMap: {}
-  executionOrder: {}
-  isPreloaded: 0
-  isOverridable: 0
-  platformData:
-  - first:
-      Any:
-    second:
-      enabled: 0
-      settings: {}
-  - first:
-      Editor: Editor
-    second:
-      enabled: 1
-      settings:
-        DefaultValueInitialized: true
-  - first:
-      Windows Store Apps: WindowsStoreApps
-    second:
-      enabled: 0
-      settings:
-        CPU: AnyCPU
-  userData:
-  assetBundleName:
-  assetBundleVariant:

ExternalDependencyManager/Editor/1.2.177/Google.PackageManagerResolver.dll.meta

@@ -1,36 +0,0 @@
-fileFormatVersion: 2
-guid: 413ed4abd14645c38ebbd8c5ff26e9de
-labels:
-- gvh
-- gvh_version-1.2.177
-- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.177/Google.PackageManagerResolver.dll
-- gvhp_targets-editor
-timeCreated: 1480838400
-PluginImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  iconMap: {}
-  executionOrder: {}
-  isPreloaded: 0
-  isOverridable: 0
-  platformData:
-  - first:
-      Any:
-    second:
-      enabled: 0
-      settings: {}
-  - first:
-      Editor: Editor
-    second:
-      enabled: 1
-      settings:
-        DefaultValueInitialized: true
-  - first:
-      Windows Store Apps: WindowsStoreApps
-    second:
-      enabled: 0
-      settings:
-        CPU: AnyCPU
-  userData:
-  assetBundleName:
-  assetBundleVariant:

ExternalDependencyManager/Editor/1.2.177/Google.VersionHandlerImpl.dll.meta

@@ -1,36 +0,0 @@
-fileFormatVersion: 2
-guid: 38d0b40a7b2d44c6a6a2362599bfc41e
-labels:
-- gvh
-- gvh_version-1.2.177
-- gvhp_exportpath-ExternalDependencyManager/Editor/1.2.177/Google.VersionHandlerImpl.dll
-- gvhp_targets-editor
-timeCreated: 1480838400
-PluginImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  iconMap: {}
-  executionOrder: {}
-  isPreloaded: 0
-  isOverridable: 0
-  platformData:
-  - first:
-      Any:
-    second:
-      enabled: 0
-      settings: {}
-  - first:
-      Editor: Editor
-    second:
-      enabled: 1
-      settings:
-        DefaultValueInitialized: true
-  - first:
-      Windows Store Apps: WindowsStoreApps
-    second:
-      enabled: 0
-      settings:
-        CPU: AnyCPU
-  userData:
-  assetBundleName:
-  assetBundleVariant:

ExternalDependencyManager/Editor/Google.VersionHandler.dll.meta

@@ -1,36 +0,0 @@
-fileFormatVersion: 2
-guid: 86460262ea60447dbb6a62d21167790f
-labels:
-- gvh
-- gvh_version-1.2.177
-- gvhp_exportpath-ExternalDependencyManager/Editor/Google.VersionHandler.dll
-- gvhp_targets-editor
-timeCreated: 1480838400
-PluginImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  iconMap: {}
-  executionOrder: {}
-  isPreloaded: 0
-  isOverridable: 0
-  platformData:
-  - first:
-      Any:
-    second:
-      enabled: 0
-      settings: {}
-  - first:
-      Editor: Editor
-    second:
-      enabled: 1
-      settings:
-        DefaultValueInitialized: true
-  - first:
-      Windows Store Apps: WindowsStoreApps
-    second:
-      enabled: 0
-      settings:
-        CPU: AnyCPU
-  userData:
-  assetBundleName:
-  assetBundleVariant:

ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.177_manifest.txt

@@ -1,13 +0,0 @@
-Assets/ExternalDependencyManager/Editor/1.2.177/Google.IOSResolver.dll
-Assets/ExternalDependencyManager/Editor/1.2.177/Google.IOSResolver.dll.mdb
-Assets/ExternalDependencyManager/Editor/1.2.177/Google.JarResolver.dll
-Assets/ExternalDependencyManager/Editor/1.2.177/Google.JarResolver.dll.mdb
-Assets/ExternalDependencyManager/Editor/1.2.177/Google.PackageManagerResolver.dll
-Assets/ExternalDependencyManager/Editor/1.2.177/Google.PackageManagerResolver.dll.mdb
-Assets/ExternalDependencyManager/Editor/1.2.177/Google.VersionHandlerImpl.dll
-Assets/ExternalDependencyManager/Editor/1.2.177/Google.VersionHandlerImpl.dll.mdb
-Assets/ExternalDependencyManager/Editor/CHANGELOG.md
-Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll
-Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll.mdb
-Assets/ExternalDependencyManager/Editor/LICENSE
-Assets/ExternalDependencyManager/Editor/README.md

ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.177_manifest.txt.meta

@@ -1,15 +0,0 @@
-fileFormatVersion: 2
-guid: 2764c5ea3b354f3cb7ca80028fd08da2
-labels:
-- gvh
-- gvh_manifest
-- gvh_version-1.2.177
-- gvhp_exportpath-ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.177_manifest.txt
-- gvhp_manifestname-0External Dependency Manager
-- gvhp_manifestname-play-services-resolver
-timeCreated: 1474401009
-licenseType: Pro
-TextScriptImporter:
-  userData:
-  assetBundleName:
-  assetBundleVariant:

Topon_Adapter/Editor/AD_BuildAndroidProcess.cs

@@ -121,7 +121,7 @@ namespace Topon_Adapter.Editor
 
             elementlauncherApplication.Add (CreateCSJGromore ());
             SetOrAddAttribute (elementlauncherApplication, AndroidNamespace + "allowBackup", "false");
-            SetOrAddAttribute (elementlauncherApplication, ToolsNamespace + "replace", "android:allowBackup");
+            MergeToolsReplaceAttribute (elementlauncherApplication, GetLauncherApplicationReplaceValues (elementlauncherApplication));
             
             var elementMainManifest    = manifest.Element ("manifest");
             var elementMainApplication = elementMainManifest.Element ("application");
@@ -263,6 +263,41 @@ namespace Topon_Adapter.Editor
             attribute.SetValue (value);
         }
 
+        private static string[] GetLauncherApplicationReplaceValues (XElement element)
+        {
+            List<string> replaceValues = new List<string> { "android:allowBackup" };
+            if (element.Attribute (AndroidNamespace + "appComponentFactory") != null)
+            {
+                replaceValues.Add ("android:appComponentFactory");
+            }
+
+            return replaceValues.ToArray ();
+        }
+
+        private static void MergeToolsReplaceAttribute (XElement element, params string[] replaceValues)
+        {
+            XName replaceAttributeName = ToolsNamespace + "replace";
+            List<string> mergedValues = new List<string> ();
+
+            var currentValue = element.Attribute (replaceAttributeName)?.Value;
+            if (string.IsNullOrWhiteSpace (currentValue) == false)
+            {
+                mergedValues.AddRange (currentValue.Split (',')
+                    .Select (value => value.Trim ())
+                    .Where (value => string.IsNullOrWhiteSpace (value) == false));
+            }
+
+            foreach (var replaceValue in replaceValues)
+            {
+                if (mergedValues.Contains (replaceValue) == false)
+                {
+                    mergedValues.Add (replaceValue);
+                }
+            }
+
+            element.SetAttributeValue (replaceAttributeName, string.Join (",", mergedValues));
+        }
+
         public int callbackOrder { get; }
     }
 }

package.json

@@ -2,7 +2,7 @@
   "name": "com.commercialization.topon",
   "displayName": "Commercialization.topon",
   "description": "基于topon的广告sdk封装，依赖基础商业化模块",
-  "version": "1.4.10",
+  "version": "1.4.13",
   "unity": "2021.1",
   "license": "MIT",
   "repository": {