Fix case when Libraries group is missing or custom provided does not …

…exist
terebentina · Feb 28, 2016 · 5964386 · 5964386
1 parent 1ff232c
commit 5964386
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/ios/registerNativeModule.js b/src/ios/registerNativeModule.js
@@ -6,6 +6,7 @@ const addToHeaderSearchPaths = require('./addToHeaderSearchPaths');
 const getHeadersInFolder = require('./getHeadersInFolder');
 const getHeaderSearchPath = require('./getHeaderSearchPath');
 const getProducts = require('./getProducts');
+const createGroup = require('./createGroup');
 const hasLibraryImported = require('./hasLibraryImported');
 const addFileToProject = require('./addFileToProject');
 const addProjectToLibraries = require('./addProjectToLibraries');
@@ -23,10 +24,19 @@ module.exports = function registerNativeModuleIOS(dependencyConfig, projectConfi
   const dependencyProject = xcode.project(dependencyConfig.pbxprojPath).parseSync();
 
   const libraries = project.pbxGroupByName(projectConfig.libraryFolder);
-  if (hasLibraryImported(libraries, dependencyConfig.projectName)) {
+  if (libraries && hasLibraryImported(libraries, dependencyConfig.projectName)) {
     return false;
   }
 
+  if (!libraries) {
+    createGroup(project, projectConfig.libraryFolder);
+
+    log.warn(
+      'ERRGROUP',
+      `Group ${projectConfig.libraryFolder} does not exist in your XCode project. We have created it automatically for you.`
+    );
+  }
+
   const file = addFileToProject(
     project,
     path.relative(projectConfig.sourceDir, dependencyConfig.projectPath)

diff --git a/src/ios/unregisterNativeModule.js b/src/ios/unregisterNativeModule.js
@@ -22,7 +22,7 @@ module.exports = function unregisterNativeModule(dependencyConfig, projectConfig
   const dependencyProject = xcode.project(dependencyConfig.pbxprojPath).parseSync();
 
   const libraries = project.pbxGroupByName(projectConfig.libraryFolder);
-  if (!hasLibraryImported(libraries, dependencyConfig.projectName)) {
+  if (!libraries || !hasLibraryImported(libraries, dependencyConfig.projectName)) {
     return false;
   }