Skip to content

Commit dadf841

Browse files
committed
Remove GPR
Change-Id: I6e295a5e26a3316d4a3c125cfaf38efe89730dab
1 parent db7b053 commit dadf841

File tree

10 files changed

+5
-92
lines changed

10 files changed

+5
-92
lines changed

build.gradle

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1419,10 +1419,6 @@ Task copyPluginTemplateToStagingArea = createCopyFilesTask(
14191419
"Copy the template project into the Unity plugin packaging dir.",
14201420
[new File("Assets", "ExternalDependencyManager.meta"),
14211421
new File(new File("Assets", "ExternalDependencyManager"), "Editor.meta"),
1422-
new File(new File(new File("Assets", "ExternalDependencyManager"), "Editor"),
1423-
"GoogleRegistries.xml"),
1424-
new File(new File(new File("Assets", "ExternalDependencyManager"), "Editor"),
1425-
"GoogleRegistries.xml.meta"),
14261422
new File(new File(new File("Assets", "ExternalDependencyManager"), "Editor"),
14271423
"CHANGELOG.md.meta"),
14281424
new File(new File(new File("Assets", "ExternalDependencyManager"), "Editor"),

exploded/Assets/ExternalDependencyManager/Editor/GoogleRegistries.xml

Lines changed: 0 additions & 11 deletions
This file was deleted.

exploded/Assets/ExternalDependencyManager/Editor/GoogleRegistries.xml.meta

Lines changed: 0 additions & 13 deletions
This file was deleted.

exploded/Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.161_manifest.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,5 @@ Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll
99
Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll.mdb
1010
Assets/ExternalDependencyManager/Editor/Google.VersionHandlerImpl_v1.2.161.dll
1111
Assets/ExternalDependencyManager/Editor/Google.VersionHandlerImpl_v1.2.161.dll.mdb
12-
Assets/ExternalDependencyManager/Editor/GoogleRegistries.xml
1312
Assets/ExternalDependencyManager/Editor/LICENSE
1413
Assets/ExternalDependencyManager/Editor/README.md

export_unity_package_config.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
{
4343
"importer": "DefaultImporter",
4444
"paths": [
45-
"ExternalDependencyManager/Editor/GoogleRegistries.xml",
4645
"ExternalDependencyManager/Editor/external-dependency-manager*_manifest.txt"
4746
]
4847
},

plugin/Assets/ExternalDependencyManager/Editor/GoogleRegistries.xml

Lines changed: 0 additions & 11 deletions
This file was deleted.

plugin/Assets/ExternalDependencyManager/Editor/GoogleRegistries.xml.meta

Lines changed: 0 additions & 13 deletions
This file was deleted.

source/ImportUnityPackage/test_data/external-dependency-manager-1.2.144.unitypackage.contents.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ Assets/ExternalDependencyManager/Editor/Google.VersionHandlerImpl_v1.2.144.dll
2222
Assets/ExternalDependencyManager/Editor/Google.VersionHandlerImpl_v1.2.144.dll.mdb
2323
Assets/ExternalDependencyManager/Editor/Google.VersionHandlerImpl_v1.2.144.dll.mdb.meta
2424
Assets/ExternalDependencyManager/Editor/Google.VersionHandlerImpl_v1.2.144.dll.meta
25-
Assets/ExternalDependencyManager/Editor/GoogleRegistries.xml
26-
Assets/ExternalDependencyManager/Editor/GoogleRegistries.xml.meta
2725
Assets/ExternalDependencyManager/Editor/LICENSE
2826
Assets/ExternalDependencyManager/Editor/LICENSE.meta
2927
Assets/ExternalDependencyManager/Editor/README.md

source/ImportUnityPackage/test_data/external-dependency-manager-1.2.153.unitypackage.contents.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ Assets/ExternalDependencyManager/Editor/Google.VersionHandlerImpl_v1.2.153.dll
2020
Assets/ExternalDependencyManager/Editor/Google.VersionHandlerImpl_v1.2.153.dll.mdb
2121
Assets/ExternalDependencyManager/Editor/Google.VersionHandlerImpl_v1.2.153.dll.mdb.meta
2222
Assets/ExternalDependencyManager/Editor/Google.VersionHandlerImpl_v1.2.153.dll.meta
23-
Assets/ExternalDependencyManager/Editor/GoogleRegistries.xml
24-
Assets/ExternalDependencyManager/Editor/GoogleRegistries.xml.meta
2523
Assets/ExternalDependencyManager/Editor/LICENSE
2624
Assets/ExternalDependencyManager/Editor/LICENSE.meta
2725
Assets/ExternalDependencyManager/Editor/README.md

source/PackageManagerResolver/src/PackageManagerResolver.cs

Lines changed: 5 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,6 @@ internal enum ManifestModificationMode {
7676
"'Assets > External Dependency Manager > Package Manager Resolver > " +
7777
"Modify Registries'.";
7878

79-
/// <summary>
80-
/// Registry scopes provided by the Game Package Registry by Google.
81-
/// </summary>
82-
private static readonly string[] googleScopes = new [] { "com.google" };
83-
8479
/// <summary>
8580
/// Scroll location of the manifest view on the left in the registry selection window.
8681
/// </summary>
@@ -100,7 +95,6 @@ static PackageManagerResolver() {
10095
RunOnMainThread.Run(() => {
10196
// Load log preferences.
10297
VerboseLoggingEnabled = VerboseLoggingEnabled;
103-
CheckRegistries();
10498
}, runNow: false);
10599
}
106100

@@ -126,14 +120,6 @@ public static void ShowSettings() {
126120
window.Show();
127121
}
128122

129-
/// <summary>
130-
/// Alias for the settings dialog.
131-
/// </summary>
132-
[MenuItem("Window/Google/Game Package Registry/Settings")]
133-
public static void ShowSettingsAlias() {
134-
ShowSettings();
135-
}
136-
137123
/// <summary>
138124
/// Check registry status based on current settings.
139125
/// </summary>
@@ -208,26 +194,6 @@ public static void ModifyRegistries() {
208194
showDisableButton: false);
209195
}
210196

211-
/// <summary>
212-
/// Alias that simplifies adding the Game Package Registry by Google to the project.
213-
/// manifest.
214-
/// </summary>
215-
[MenuItem("Window/Google/Game Package Registry/Add To Project")]
216-
public static void AddGamePackageManagerRegistries() {
217-
UpdateManifest(ManifestModificationMode.Add, promptBeforeAction: true,
218-
showDisableButton: false, scopePrefixFilter: googleScopes);
219-
}
220-
221-
/// <summary>
222-
/// Alias that simplifies removing the Game Package Registry by Google to the project.
223-
/// manifest.
224-
/// </summary>
225-
[MenuItem("Window/Google/Game Package Registry/Remove From Project")]
226-
public static void RemoveGamePackageManagerRegistries() {
227-
UpdateManifest(ManifestModificationMode.Remove, promptBeforeAction: false,
228-
showDisableButton: false, scopePrefixFilter: googleScopes);
229-
}
230-
231197
/// <summary>
232198
/// Read registries from XML configuration files.
233199
/// </summary>
@@ -398,6 +364,11 @@ internal static void UpdateManifest(ManifestModificationMode mode,
398364
}
399365

400366
var xmlRegistries = ReadRegistriesFromXml();
367+
368+
if (xmlRegistries.Count == 0) {
369+
logger.Log("No registry found from any Registries.xml files", level: LogLevel.Warning);
370+
}
371+
401372
// Filter registries using the scope prefixes.
402373
if (scopePrefixFilter != null) {
403374
foreach (var registry in new List<PackageManagerRegistry>(xmlRegistries.Values)) {

0 commit comments

Comments
 (0)