cordova-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stevengill <...@git.apache.org>
Subject [GitHub] cordova-ios pull request #234: CB-9825 cocoapod integration for plugins
Date Thu, 28 Jul 2016 19:11:04 GMT
Github user stevengill commented on a diff in the pull request:

    https://github.com/apache/cordova-ios/pull/234#discussion_r72683673
  
    --- Diff: bin/templates/scripts/cordova/lib/plugman/pluginHandlers.js ---
    @@ -91,18 +94,31 @@ var handlers = {
                 }
             },
             uninstall:function(obj, plugin, project, options) {
    +            var podsJSON = require(path.join(project.projectDir, 'pods.json'));
                 var src = obj.src;
     
                 if (!obj.custom) {
                     var keepFrameworks = keep_these_frameworks;
    -
                     if (keepFrameworks.indexOf(src) < 0) {
    -                    project.frameworks[src] -= (project.frameworks[src] || 1) - 1;
    -                    if (project.frameworks[src] < 1) {
    -                        // Only remove non-custom framework from xcode project
    -                        // if there is no references remains
    -                        project.xcode.removeFramework(src);
    -                        delete project.frameworks[src];
    +                    if (obj.type === 'podspec') {
    +                        if(podsJSON[src]) {
    +                            if(podsJSON[src].count > 1) {
    +                                podsJSON[src].count = podsJSON[src].count - 1;
    +                            } else {
    +                                delete podsJSON[src];
    +                            }
    +                        }
    +                    } else {
    +                        //this should be refactored 
    +                        project.frameworks[src] = project.frameworks[src] || 1;
    +                        project.frameworks[src]--;
    +                        if (project.frameworks[src] < 1) {
    +                            // Only remove non-custom framework from xcode project
    +                            // if there is no references remains
    +                            project.xcode.removeFramework(src);
    +                            console.log('removing ' + src);
    --- End diff --
    
    This console.log needs to be removed


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@cordova.apache.org
For additional commands, e-mail: dev-help@cordova.apache.org


Mime
View raw message