fix: added support for cordova 7.0.0

BranchMetrics · May 9, 2017 · 862f14e · 862f14e
1 parent de7cc9d
commit 862f14e
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 7 deletions.
diff --git a/src/scripts/ios/enableEntitlements.js b/src/scripts/ios/enableEntitlements.js
@@ -15,11 +15,10 @@
   // updates the xcode preferences to allow associated domains
   function enableAssociatedDomains (preferences) {
     var entitlementsFile = path.join(preferences.projectRoot, 'platforms', 'ios', preferences.projectName, 'Resources', preferences.projectName + '.entitlements')
-    var projectFile = preferences.iosProjectModule.parseProjectFile(path.join(preferences.projectRoot, 'platforms', 'ios'))
 
-    activateAssociativeDomains(projectFile.xcode, entitlementsFile)
-    addPbxReference(projectFile.xcode, entitlementsFile)
-    projectFile.write()
+    activateAssociativeDomains(preferences.iosProjectModule.xcode, entitlementsFile)
+    addPbxReference(preferences.iosProjectModule.xcode, entitlementsFile)
+    preferences.iosProjectModule.write()
   }
 
   // adds entitlement files to the xcode project

diff --git a/src/scripts/npm/processConfigXml.js b/src/scripts/npm/processConfigXml.js
@@ -105,14 +105,58 @@
 
   // read iOS project module from cordova context
   function getProjectModule (context) {
-    // try pre-5.0 cordova structure
+    var projectRoot = getProjectRoot(context)
+    var projectPath = path.join(projectRoot, 'platforms', 'ios')
+
+    // try pre 5.0 cordova structure
     try {
-      return context.requireCordovaModule('cordova-lib/src/plugman/platforms').ios
+      return context.requireCordovaModule('cordova-lib/src/plugman/platforms').ios.parseProjectFile(projectPath)
     } catch (e) {
-      return context.requireCordovaModule('cordova-lib/src/plugman/platforms/ios')
+      // try pre 7.0 cordova structure
+      try {
+        return context.requireCordovaModule('cordova-lib/src/plugman/platforms/ios').parseProjectFile(projectPath)
+      } catch (e) {
+        return getProjectModulePlugman(context)
+      }
     }
   }
 
+  function getProjectModulePlugman (context) {
+    var projectRoot = getProjectRoot(context)
+    var projectPath = path.join(projectRoot, 'platforms', 'ios')
+    var projectFiles = context.requireCordovaModule('glob').sync(path.join(projectPath, '*.xcodeproj', 'project.pbxproj'))
+
+    if (projectFiles.length === 0) {
+      throw new Error('BRANCH SDK: Unable to locate the Xcode project file.')
+    }
+
+    var pbxPath = projectFiles[0]
+    var xcodeproj = context.requireCordovaModule('xcode').project(pbxPath)
+    xcodeproj.parseSync()
+
+    var xCodeProjectFile = {
+      'xcode': xcodeproj,
+      'write': function () {
+        var fs = context.requireCordovaModule('fs')
+        var frameworksFile = path.join(projectPath, 'frameworks.json')
+        var frameworks = {}
+        try {
+          frameworks = context.requireCordovaModule(frameworksFile)
+        } catch (e) {}
+
+        fs.writeFileSync(pbxPath, xcodeproj.writeSync())
+        if (Object.keys(frameworks).length === 0) {
+          // If there is no framework references remain in the project, just remove this file
+          context.requireCordovaModule('shelljs').rm('-rf', frameworksFile)
+          return
+        }
+        fs.writeFileSync(frameworksFile, JSON.stringify(this.frameworks, null, 4))
+      }
+    }
+
+    return xCodeProjectFile
+  }
+
   // validate <branch-config> properties within config.xml
   function validateBranchPreferences (preferences) {
     if (preferences.projectRoot === null) {

diff --git a/testbed/init.sh b/testbed/init.sh
@@ -62,6 +62,7 @@ main() {
     npm uninstall mkpath node-version-compare plist xml2js
   fi
   rm -rf ../.installed
+  rm -rf ./node_modules
   rm -rf ./plugins
   rm -rf ./platforms
   rm -rf ./build.json