Skip to content

Commit fb663ee

Browse files
author
Stewart Miles
committed
Fixed incremental iOS builds broken by f759cd3
Improved Podfile parsing when performing incremental builds. This is still not really correct Podfile parsing as it doesn't handle escaped characters within each property value of a "pod" line. This also adds support for all currently supported Podfile pod declaration properties when adding Cocoapod references via XML and fixes warnings when adding identical pod references when appending to builds with an existing Podfile. Bug: 122456935 Issue googlesamples#176 Change-Id: If502bc118c4d531484a81e4ec4e888874ded91be
1 parent 614450d commit fb663ee

File tree

2 files changed

+192
-73
lines changed

2 files changed

+192
-73
lines changed

sample/Assets/PlayServicesResolver/Editor/SampleDependencies.xml

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,28 @@
4141
Name of the Cocoapod.
4242
* "path" (optional)
4343
Path to the local Cocoapod.
44+
NOTE: This is expanded to a local path when the Podfile is generated.
45+
For example, if a Unity project has the root path "/my/game" and the
46+
pod the path is "foo/bar", this will be will be expanded to
47+
"/my/game/foo/bar" when the Podfile is generated.
4448
* "version" (optional)
4549
Cocoapod version specification for the named pod.
4650
If this is not specified the latest version is used.
51+
NOTE: This can't be used when "path" is set.
4752
* "bitcodeEnabled" (optional)
4853
Whether this Cocoapod requires bitcode to be enabled in Unity's
4954
generated Xcode project. This is "true" by default.
5055
* "minTargetSdk" (optional)
51-
The minimum iOS SDK required by this Cocoapod. -->
56+
The minimum iOS SDK required by this Cocoapod.
57+
* "configurations" (optional)
58+
Podfile formatted list of configurations to include this pod in.
59+
* "modular_headers" (optional)
60+
Set to true to enable modular headers, false to disable.
61+
* "source" (optional)
62+
Source repo to fetch the pod from.
63+
* "subspecs" (optional)
64+
Subspecs to include for the pod.
65+
-->
5266
<iosPod name="Google-Mobile-Ads-SDK" path="../google-mobile-ads-sdk" version="~> 7.0" bitcodeEnabled="true"
5367
minTargetSdk="6.0">
5468
<!-- Set of source URIs to search for this Cocoapod spec.

0 commit comments

Comments
 (0)