Skip to content

Commit aaa9dbb

Browse files
fix googlesamples#412 iOS resolver reference when iOS module not installed
- updated export_unity_package_config.json and split the ExternalDependencyManager/Editor/*/Google.IOSResolver.* into its own definition, adding defineConstraints UNITY_EDITOR and UNITY_IOS
1 parent 3e97c8d commit aaa9dbb

File tree

1 file changed

+59
-21
lines changed

1 file changed

+59
-21
lines changed

export_unity_package_config.json

+59-21
Original file line numberDiff line numberDiff line change
@@ -5,37 +5,71 @@
55
"imports": [
66
{
77
"importer": "PluginImporter",
8-
"platforms": ["Editor"],
8+
"platforms": [
9+
"Editor"
10+
],
911
"paths": [
1012
"ExternalDependencyManager/Editor/Google.VersionHandler.*"
1113
]
1214
},
1315
{
1416
"importer": "PluginImporter",
1517
"platforms": [],
16-
"labels": ["gvhp_targets-editor"],
18+
"labels": [
19+
"gvhp_targets-editor"
20+
],
1721
"paths": [
18-
"ExternalDependencyManager/Editor/*/Google.IOSResolver.*",
1922
"ExternalDependencyManager/Editor/*/Google.JarResolver.*",
2023
"ExternalDependencyManager/Editor/*/Google.VersionHandlerImpl.*",
2124
"ExternalDependencyManager/Editor/*/Google.PackageManagerResolver.*"
2225
],
2326
"override_metadata_upm": {
2427
"PluginImporter": {
25-
"platformData": [ {
26-
"first" : {
27-
"Editor": "Editor"
28+
"defineConstraints": [
29+
"UNITY_EDITOR",
30+
"UNITY_IOS"
31+
],
32+
"platformData": [
33+
{
34+
"first": {
35+
"Editor": "Editor"
36+
},
37+
"second": {
38+
"enabled": 1
39+
}
40+
}
41+
]
42+
}
43+
}
44+
},
45+
{
46+
"importer": "PluginImporter",
47+
"platforms": [],
48+
"labels": [
49+
"gvhp_targets-editor"
50+
],
51+
"paths": [
52+
"ExternalDependencyManager/Editor/*/Google.IOSResolver.*",
53+
],
54+
"override_metadata_upm": {
55+
"PluginImporter": {
56+
"platformData": [
57+
{
58+
"first": {
59+
"Editor": "Editor"
2860
},
2961
"second": {
30-
"enabled": 1
62+
"enabled": 1
3163
}
3264
}
3365
]
3466
}
3567
}
3668
},
3769
{
38-
"sections": ["documentation"],
70+
"sections": [
71+
"documentation"
72+
],
3973
"importer": "DefaultImporter",
4074
"paths": [
4175
"ExternalDependencyManager/Editor/README.md",
@@ -50,21 +84,21 @@
5084
]
5185
},
5286
{
53-
"sections": ["unitypackage"],
87+
"sections": [
88+
"unitypackage"
89+
],
5490
"importer": "DefaultImporter",
5591
"paths": [
56-
"PlayServicesResolver/Editor/play-services-resolver_v1.2.137.0.txt"
92+
"PlayServicesResolver/Editor/play-services-resolver_v1.2.137.0.txt"
5793
]
5894
}
5995
],
6096
"manifest_path": "ExternalDependencyManager/Editor",
61-
6297
"readme": "ExternalDependencyManager/Editor/README.md",
6398
"license": "ExternalDependencyManager/Editor/LICENSE",
6499
"changelog": "ExternalDependencyManager/Editor/CHANGELOG.md",
65100
"documentation": "ExternalDependencyManager/Editor/README.md",
66-
67-
"common_manifest" : {
101+
"common_manifest": {
68102
"name": "com.google.external-dependency-manager",
69103
"display_name": "External Dependency Manager for Unity",
70104
"description": [
@@ -74,23 +108,27 @@
74108
"and/or management of Unity Package Manager registries."
75109
],
76110
"keywords": [
77-
"Google", "Android", "Gradle", "Cocoapods", "Dependency",
78-
"Unity Package Manager", "Unity",
111+
"Google",
112+
"Android",
113+
"Gradle",
114+
"Cocoapods",
115+
"Dependency",
116+
"Unity Package Manager",
117+
"Unity",
79118
"vh-name:play-services-resolver",
80119
"vh-name:unity-jar-resolver"
81120
],
82121
"author": {
83-
"name" : "Google LLC",
122+
"name": "Google LLC",
84123
"url": "https://github.com/googlesamples/unity-jar-resolver"
85124
}
86125
},
87-
88-
"export_upm" : 1,
89-
"upm_package_config" : {
90-
"manifest" : {
126+
"export_upm": 1,
127+
"upm_package_config": {
128+
"manifest": {
91129
"unity": "2019.1"
92130
}
93131
}
94132
}
95133
]
96-
}
134+
}

0 commit comments

Comments
 (0)