Merge pull request #8 from NikolayLezhnev/androidx

androidx support
meslubi2021 · Aug 15, 2024 · d2b0df8 · d2b0df8
2 parents 4746dd0 + 5ea74e1
commit d2b0df8
Showing 1 changed file with 6 additions and 24 deletions.
diff --git a/Facebook.Unity.Editor/android/AndroidSupportLibraryResolver.cs b/Facebook.Unity.Editor/android/AndroidSupportLibraryResolver.cs
@@ -75,41 +75,23 @@ private static void setupDependencies()
                     "ProjectSettings"
                 });
 
-            // com.android.support:support-v4
-            Google.VersionHandler.InvokeInstanceMethod(
-                svcSupport,
-                "DependOn",
-                new object[] {
-                    "com.android.support",
-                    "support-v4",
-                       "25.3.1"
-                },
-                namedArgs: new Dictionary<string, object>() {
-                    {
-                        "packageIds",
-                        new string[] {
-                            "extra-android-m2repository"
-                        }
-                    }
-                });
-
-            AndroidSupportLibraryResolver.addSupportLibraryDependency(svcSupport, "support-v4", "25.3.1");
-            AndroidSupportLibraryResolver.addSupportLibraryDependency(svcSupport, "appcompat-v7", "25.3.1");
-            AndroidSupportLibraryResolver.addSupportLibraryDependency(svcSupport, "cardview-v7", "25.3.1");
-            AndroidSupportLibraryResolver.addSupportLibraryDependency(svcSupport, "customtabs", "25.3.1");
-
+            AndroidSupportLibraryResolver.addSupportLibraryDependency(svcSupport, "androidx.legacy", "legacy-support-v4", "1.0.0");
+            AndroidSupportLibraryResolver.addSupportLibraryDependency(svcSupport, "androidx.appcompat", "appcompat", "1.0.0");
+            AndroidSupportLibraryResolver.addSupportLibraryDependency(svcSupport, "androidx.cardview", "cardview", "1.0.0");
+            AndroidSupportLibraryResolver.addSupportLibraryDependency(svcSupport, "androidx.browser", "browser", "1.0.0");
         }
 
         public static void addSupportLibraryDependency(
             object svcSupport,
+            string packagePrefix,
             String packageName,
             String version)
         {
             Google.VersionHandler.InvokeInstanceMethod(
                 svcSupport,
                 "DependOn",
                 new object[] {
-                    "com.android.support",
+                    packagePrefix,
                     packageName,
                        version
                 },