+ Add support to "podspec" parameter for #452 #453

camphongdinh · 2021-07-14T09:07:11Z

Add support to "podspec" parameter. If both "podspec" and "path" is present, it will prefer "podspec" over "path" for that specific pod.

google-cla · 2021-07-14T09:07:28Z

Thanks for your pull request. It looks like this may be your first contribution to a Google open source project (if not, look below for help). Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

📝 Please visit https://cla.developers.google.com/ to sign.

Once you've signed (or fixed any issues), please reply here with @googlebot I signed it! and we'll verify it.

What to do if you already signed the CLA

Individual signers

It's possible we don't have your GitHub username or you're using a different email address on your commit. Check your existing CLA data and verify that your email is set on your git commits.

Corporate signers

Your company has a Point of Contact who decides which employees are authorized to participate. Ask your POC to be added to the group of authorized contributors. If you don't know who your Point of Contact is, direct the Google project maintainer to go/cla#troubleshoot (Public version).
The email used to register you as an authorized contributor must be the email used for the Git commit. Check your existing CLA data and verify that your email is set on your git commits.
The email used to register you as an authorized contributor must also be attached to your GitHub account.

ℹ️ Googlers: Go here for more info.

camphongdinh · 2021-07-14T09:08:53Z

@googlebot I signed it!

chkuang-g

Thank you so much for contribute to this open-source repo!

I added a comment in your PR.

Please make sure this change works for your by building it first using

./gradlew buildplugin

And then install the local build to your project.

Shawn

chkuang-g · 2021-07-14T23:53:54Z

source/IOSResolver/src/IOSResolver.cs

        /// </summary>
        public string LocalPath {
            get {
                string path;
-                if (!propertiesByName.TryGetValue("path", out path)) return "";
+                if (!propertiesByName.TryGetValue("podspec", out path)){


It is better to use a different property for "podspec".

Also, do similar override in PodFilePodLine
camphongdinh@a97b71d#diff-4e150db5d98cbbe99ab461893cc478b33377658b810b34ebc72f7549670ef482R154-R157

Note that from the Cocoapod doc, :podspec can point to an "http" url. So perhaps only expand the path only if it does not start with "http".

chkuang-g · 2021-07-15T00:30:37Z

source/IOSResolver/src/IOSResolver.cs

@@ -295,6 +300,7 @@ private class IOSXmlDependencies : XmlDependencies {
        ///   <iosPods>
        ///     <iosPod name="name"
        ///             path="pathToLocal"
+        ///             podspec="pathToLocalPodSpecJSON"


I think you can specify a url here as well
https://guides.cocoapods.org/syntax/podfile.html#pod

Perhaps use

/// podspec="pathToPodSpec"

* Rename podspec parameter to podspecPath to avoid conflicts *Support http for podspecPath

- Update comments for podspecPath

camphongdinh · 2021-07-30T15:09:34Z

@chkuang-g Hi, I have updated the changes:

Rename "podspec" to "podspecPath" to avoid conflicts if any
Support http for "podspecPath"

I have built the plugin and tested. It is working fine locally with this format in Dependencies.xml:

<iosPods>
    <iosPod name="IronSourceFyberAdapter" podspecPath="Assets/Plugins/ThirdParties/IronSource/Editor/LocalPod/IronSourceFyberAdapter.podspec.json">
    </iosPod>
  </iosPods>

Still I haven't managed to compile the source into a .tgz for use in Unity Package Manager. I will try again later.

Please let me know if you need any other changes then.

Thanks
Phong

chkuang-g · 2021-08-06T20:30:04Z

@camphongdinh

Thanks for the update. I will take a look today.

chkuang-g

Also, could you also help to add the documentation here about the new properties?

https://github.com/googlesamples/unity-jar-resolver/blob/master/sample/Assets/ExternalDependencyManager/Editor/SampleDependencies.xml#L55

Thank you!

chkuang-g · 2021-08-06T20:41:38Z

source/IOSResolver/src/IOSResolver.cs

+                if (!propertiesByName.TryGetValue("podspecPath", out path)){
+                    if (!propertiesByName.TryGetValue("path", out path)) return "";
+                } 


As mentioned. It is better to have two different properties for path and podspecPath, and handle them separately later.

private string GetPathFromProperties(string name) { string path; if (!propertiesByName.TryGetValue(name, out path)) return ""; if (path.StartsWith("'") && path.EndsWith("'")) { path = path.Substring(1, path.Length - 2); } return path; } public string LocalPath { get { return GetPathFromProperties("path"); } } public string PodSpecPath { get { return GetPathFromProperties("podspec"); } }

See the next comment.

chkuang-g · 2021-08-06T20:55:07Z

source/IOSResolver/src/IOSResolver.cs

        private static string[] PODFILE_POD_PROPERTIES = new string[] {
            "configurations",
            "configuration",
            "modular_headers",
            "source",
            "subspecs",
-            "path"
+            "path",
+            "podspecPath"


I think it is better to be just podspec to reduce confusion, since podspec is a real podfile properties like the other.

chkuang-g · 2021-08-06T21:00:37Z

source/IOSResolver/src/IOSResolver.cs

+                    if(outputPropertiesByName.ContainsKey("podspecPath")) {
+                        // Check if it is a local folder or http://
+                        // If it is local folder add full path into OutputProperties
+                        // If it is URI, kept as-is
+                        if(Uri.IsWellFormedUriString(path, UriKind.Absolute)) {
+                            outputPropertiesByName.Add("podspec", String.Format("'{0}'", path));
+                        }
+                        else {
+                            outputPropertiesByName.Add("podspec", String.Format("'{0}'", Path.GetFullPath(path)));
+                        }                      
+                        // Remove "path" parameter and temporary "podspecPath" parameter
+                        outputPropertiesByName.Remove("path");  
+                        outputPropertiesByName.Remove("podspecPath");  
+                    }
+                    else {
+                        outputPropertiesByName["path"] = String.Format("'{0}'", Path.GetFullPath(path));
+                    }                    


Well, it is really nice to check redundancy here but I will leave that responsibility to the person who author Dependencies.xml, unless you are adding additional warning here when both properties exist.

I think it is much cleaner for you and your case now to just treat them as separate properties, like this

var podSpecPath = PodSpecPath; if (!String.IsNullOrEmpty(podSpecPath)) { if(Uri.IsWellFormedUriString(podSpecPath, UriKind.Absolute)) { outputPropertiesByName.Add("podspec", String.Format("'{0}'", podSpecPath)); } else { outputPropertiesByName.Add("podspec", String.Format("'{0}'", Path.GetFullPath(podSpecPath))); } } var localPath = LocalPath; if (!String.IsNullOrEmpty(localPath)) { outputPropertiesByName["path"] = String.Format("'{0}'", Path.GetFullPath(localPath)); }

+ Add support to "podspec" parameter for googlesamples#452

a97b71d

chkuang-g self-requested a review July 14, 2021 17:40

chkuang-g requested changes Jul 14, 2021

View reviewed changes

chkuang-g reviewed Jul 15, 2021

View reviewed changes

camphongdinh added 2 commits July 30, 2021 21:55

Update IOSResolver.cs

81167df

* Rename podspec parameter to podspecPath to avoid conflicts *Support http for podspecPath

Update IOSResolver.cs

62a0aa6

- Update comments for podspecPath

camphongdinh requested a review from chkuang-g August 6, 2021 18:17

chkuang-g reviewed Aug 6, 2021

View reviewed changes

chkuang-g force-pushed the master branch from 46ea826 to c599ab3 Compare April 6, 2022 21:17

chkuang-g force-pushed the master branch 2 times, most recently from 883eedd to 5c6f23b Compare October 7, 2022 03:35

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

+ Add support to "podspec" parameter for #452 #453

+ Add support to "podspec" parameter for #452 #453

+ Add support to "podspec" parameter for #452 #453

Are you sure you want to change the base?

+ Add support to "podspec" parameter for #452 #453

Conversation

What to do if you already signed the CLA

Individual signers

Corporate signers

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment