fix: merge android manifest replace entries

AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/Editor/Dependencies.xml

@@ -3,7 +3,7 @@
         <repositories>
             <repository>https://jfrog.takuad.com/artifactory/china_sdk</repository>
         </repositories>
-        <androidPackage spec="com.anythink.sdk:core-taku:6.5.52"/>
+        <androidPackage spec="com.anythink.sdk:core-taku:6.5.73.1"/>
         <androidPackage spec="com.android.support:appcompat-v7:28.0.0"/>
     </androidPackages>
 </dependencies>

AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/anythink_base/sdm/Editor/Dependencies.xml

@@ -1,6 +1,6 @@
 <dependencies>
     <androidPackages>
-        <androidPackage spec="com.anythink.sdk:adapter-taku-sdm:6.5.54.1.0"/>
-        <androidPackage spec="com.smartdigimkttech.sdk:sdm-sdk-cn:6.5.54"/>
+        <androidPackage spec="com.anythink.sdk:adapter-taku-sdm:6.5.66.1.0"/>
+        <androidPackage spec="com.smartdigimkttech.sdk:sdm-sdk-cn:6.5.66"/>
     </androidPackages>
 </dependencies>

AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/baidu/Editor/Dependencies.xml

@@ -1,6 +1,6 @@
 <dependencies>
     <androidPackages>
-        <androidPackage spec="com.anythink.sdk:adapter-taku-baidu:9.432.1.0"/>
-        <androidPackage spec="mobi.baidu.sdk:mobads:9.432"/>
+        <androidPackage spec="com.anythink.sdk:adapter-taku-baidu:9.450.1.0"/>
+        <androidPackage spec="mobi.baidu.sdk:mobads:9.450"/>
     </androidPackages>
 </dependencies>

AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/baidu/network_data.json

@@ -1 +1 @@
-{"name":"baidu","version":"9.432","country":1,"path":"Assets/AnyThinkPlugin/AnyThinkAds\\Plugins/Android/China/mediation/baidu"}
+{"name":"baidu","version":"9.450","country":1,"path":"Assets/AnyThinkPlugin/Script/IntegrationManager/Editor/../../..//AnyThinkAds\\Plugins/Android/China/mediation/baidu"}

AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/csj/network_data.json

@@ -1 +1 @@
-{"name":"csj","version":"7.5.1.0","country":1,"path":"Assets/AnyThinkPlugin/AnyThinkAds\\Plugins/Android/China/mediation/csj"}
+{"name":"csj","version":"7.6.1.1","country":1,"path":"Assets/AnyThinkPlugin/AnyThinkAds\\Plugins/Android/China/mediation/csj"}

AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/gdt/Editor/Dependencies.xml

@@ -1,6 +1,6 @@
 <dependencies>
     <androidPackages>
-        <androidPackage spec="com.anythink.sdk:adapter-taku-gdt:4.671.1541.1.0"/>
-        <androidPackage spec="com.qq.e.union:union:4.671.1541"/>
+        <androidPackage spec="com.anythink.sdk:adapter-taku-gdt:4.680.1550.1.0"/>
+        <androidPackage spec="com.qq.e.union:union:4.680.1550"/>
     </androidPackages>
 </dependencies>

AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/gdt/network_data.json

@@ -1 +1 @@
-{"name":"gdt","version":"4.671.1541","country":1,"path":"Assets/AnyThinkPlugin/AnyThinkAds\\Plugins/Android/China/mediation/gdt"}
+{"name":"gdt","version":"4.680.1550","country":1,"path":"Assets/AnyThinkPlugin/Script/IntegrationManager/Editor/../../..//AnyThinkAds\\Plugins/Android/China/mediation/gdt"}

AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/gtm/Editor/Dependencies.xml

@@ -3,7 +3,7 @@
         <repositories>
             <repository>https://dl-maven-android.mintegral.com/repository/mbridge_android_sdk_support</repository>
         </repositories>
-        <androidPackage spec="com.anythink.sdk:adapter-taku-mintegral-china:16.3.67.1.0"/>
+        <androidPackage spec="com.anythink.sdk:adapter-taku-mintegral-china:16.3.67.1.1"/>
         <androidPackage spec="com.mbridge.msdk.support:reward:16.3.67"/>
         <androidPackage spec="com.mbridge.msdk.support:newinterstitial:16.3.67"/>
         <androidPackage spec="com.mbridge.msdk.support:mbnative:16.3.67"/>

AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/gtm/network_data.json

@@ -1 +1 @@
-{"name":"gtm","version":"16.3.67","country":1,"path":"Assets/AnyThinkPlugin/AnyThinkAds\\Plugins/Android/China/mediation/gtm"}
+{"name":"gtm","version":"16.3.67","country":1,"path":"Assets/AnyThinkPlugin/Script/IntegrationManager/Editor/../../..//AnyThinkAds\\Plugins/Android/China/mediation/gtm"}

AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/kuaishou/Editor/Dependencies.xml

@@ -1,6 +1,6 @@
 <dependencies>
     <androidPackages>
-        <androidPackage spec="com.anythink.sdk:adapter-taku-kuaishou:4.12.20.1.1.0"/>
+        <androidPackage spec="com.anythink.sdk:adapter-taku-kuaishou:4.12.20.1.1.2"/>
         <androidPackage spec="com.anythink.sdk:sdk-ads-kuaishou:4.12.20.1"/>
         <androidPackage spec="com.android.support:design:28.0.0"/>
     </androidPackages>

AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/kuaishou/network_data.json

@@ -1 +1 @@
-{"name":"kuaishou","version":"4.12.20.1","country":1,"path":"Assets/AnyThinkPlugin/AnyThinkAds\\Plugins/Android/China/mediation/kuaishou"}
+{"name":"kuaishou","version":"4.12.20.1","country":1,"path":"Assets/AnyThinkPlugin/Script/IntegrationManager/Editor/../../..//AnyThinkAds\\Plugins/Android/China/mediation/kuaishou"}

AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/tap/Editor/Dependencies.xml

@@ -1,7 +1,7 @@
 <dependencies>
     <androidPackages>
-        <androidPackage spec="com.anythink.sdk:adapter-taku-tap:4.1.2.7.1.1"/>
-        <androidPackage spec="com.anythink.sdk:sdk-ads-tap:4.1.2.7"/>
+        <androidPackage spec="com.anythink.sdk:adapter-taku-tap:4.2.1.1.1.1"/>
+        <androidPackage spec="com.anythink.sdk:sdk-ads-tap:4.2.1.1"/>
         <androidPackage spec="com.squareup.okhttp3:okhttp:3.12.1"/>
         <androidPackage spec="com.github.bumptech.glide:glide:4.9.0"/>
         <androidPackage spec="com.android.support:appcompat-v7:28.0.0"/>

AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/tap/network_data.json

@@ -1 +1 @@
-{"name":"tap","version":"4.1.2.7","country":1,"path":"Assets/AnyThinkPlugin/AnyThinkAds\\Plugins/Android/China/mediation/tap"}
+{"name":"tap","version":"4.2.1.1","country":1,"path":"Assets/AnyThinkPlugin/Script/IntegrationManager/Editor/../../..//AnyThinkAds\\Plugins/Android/China/mediation/tap"}

AnyThinkPlugin/Resources/json/2.1.7/plugin_setting_data.json

@@ -1 +1 @@
-{"curCountry":1,"china":{"android_version":"6.5.52","ios_version":"","androidXSetting":1,"country":1,"android_admob_app_id":"","ios_admob_app_id":""},"nonchina":{"android_version":"","ios_version":"","androidXSetting":0,"country":2,"android_admob_app_id":"","ios_admob_app_id":""}}
+{"curCountry":1,"china":{"android_version":"6.5.73","ios_version":"","androidXSetting":1,"country":1,"android_admob_app_id":"","ios_admob_app_id":""},"nonchina":{"android_version":"","ios_version":"","androidXSetting":0,"country":2,"android_admob_app_id":"","ios_admob_app_id":""}}

CHANGELOG.md

@@ -1,3 +1,16 @@
+# [1.4.11]
+
+### 修复
+
+* Android 构建后处理合并 `tools:replace` 声明，避免覆盖宿主项目已有的 `android:appComponentFactory` 冲突处理。
+
+# [1.4.10]
+
+### 更新
+
+* 升级 Taku Android 依赖到 `6.5.73` 系列，并同步更新国内广告网络依赖版本。
+* 更新 CSJ/GroMore 本地整合包到 `7.6.1.1` 系列，保留此前本地 AAR 接入方式。
+
 # [1.4.9]
 
 ### 新增

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, "android:allowBackup");
             
             var elementMainManifest    = manifest.Element ("manifest");
             var elementMainApplication = elementMainManifest.Element ("application");
@@ -263,6 +263,30 @@ namespace Topon_Adapter.Editor
             attribute.SetValue (value);
         }
 
+        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.9",
+  "version": "1.4.11",
   "unity": "2021.1",
   "license": "MIT",
   "repository": {