Permalink
Browse files

Further RNPM integration

Summary:
This commit removes `rnpm` folder that we left during initial merge to keep the diff cleaner. The `core`, `link` and `install` have now the same directory structure as any other command to make development more natural for all of us.

From most notable differences:
1) the `src` folder is now gone. The new structure should make it easier for people to work with the stuff and also move us closer to 100% rnpm integration,
2) There's also no `package.json` present in any of the `rnpm` packages, since they are no longer standalone modules,
3) There's no `bugs.url` in link.js since main package.json of React doesn't specify it. Decided to hardcode it to facebook/react-native since it's really unlikely to change. If one would prefer to use pkg.bugs.url as before, a separate PR modifying package.json should be sent.
Closes #9509

Differential Revision: D3751115

fbshipit-source-id: 74ae8330f7634df0887ad676808f47eee4b8de85
  • Loading branch information...
1 parent 25f2a26 commit 0af640bfaeb4ef07c3d9eeaa57486d2cf1132f66 @grabbou grabbou committed with Facebook Github Bot 3 Aug 22, 2016
Showing with 101 additions and 226 deletions.
  1. +5 −5 local-cli/commands.js
  2. 0 local-cli/{rnpm → }/core/__fixtures__/android.js
  3. 0 local-cli/{rnpm → }/core/__fixtures__/commands.js
  4. 0 local-cli/{rnpm → }/core/__fixtures__/dependencies.js
  5. 0 local-cli/{rnpm → }/core/__fixtures__/files/AndroidManifest.xml
  6. 0 local-cli/{rnpm → }/core/__fixtures__/files/Main.java
  7. 0 local-cli/{rnpm → }/core/__fixtures__/files/ReactPackage.java
  8. 0 local-cli/{rnpm → }/core/__fixtures__/files/package.json
  9. 0 local-cli/{rnpm → }/core/__fixtures__/files/project.pbxproj
  10. 0 local-cli/{rnpm → }/core/__fixtures__/ios.js
  11. 0 local-cli/{rnpm → }/core/__fixtures__/projects.js
  12. +1 −1 local-cli/{rnpm → }/core/__tests__/android/findAndroidAppFolder.spec.js
  13. +1 −1 local-cli/{rnpm → }/core/__tests__/android/findManifest.spec.js
  14. +1 −1 local-cli/{rnpm → }/core/__tests__/android/findPackageClassName.spec.js
  15. +1 −1 local-cli/{rnpm → }/core/__tests__/android/getDependencyConfig.spec.js
  16. +1 −1 local-cli/{rnpm → }/core/__tests__/android/getProjectConfig.spec.js
  17. +2 −2 local-cli/{rnpm → }/core/__tests__/android/readManifest.spec.js
  18. +1 −1 local-cli/{rnpm → }/core/__tests__/findAssets.spec.js
  19. +1 −1 local-cli/{rnpm → }/core/__tests__/findPlugins.spec.js
  20. +1 −1 local-cli/{rnpm → }/core/__tests__/ios/findProject.spec.js
  21. +1 −1 local-cli/{rnpm → }/core/__tests__/ios/getProjectConfig.spec.js
  22. +2 −2 local-cli/{rnpm → }/core/__tests__/makeCommand.spec.js
  23. 0 local-cli/{rnpm/core/src → core}/config/android/findAndroidAppFolder.js
  24. 0 local-cli/{rnpm/core/src → core}/config/android/findManifest.js
  25. 0 local-cli/{rnpm/core/src → core}/config/android/findPackageClassName.js
  26. 0 local-cli/{rnpm/core/src → core}/config/android/index.js
  27. 0 local-cli/{rnpm/core/src → core}/config/android/readManifest.js
  28. 0 local-cli/{rnpm/core/src → core}/config/findAssets.js
  29. 0 local-cli/{rnpm/core/src → core}/config/index.js
  30. 0 local-cli/{rnpm/core/src → core}/config/ios/findProject.js
  31. 0 local-cli/{rnpm/core/src → core}/config/ios/index.js
  32. 0 local-cli/{rnpm/core/src → core}/config/wrapCommands.js
  33. 0 local-cli/{rnpm/core/src → core}/findPlugins.js
  34. 0 local-cli/{rnpm/core/src → core}/getCommands.js
  35. 0 local-cli/{rnpm/core/src → core}/makeCommand.js
  36. +1 −1 local-cli/default.config.js
  37. +7 −1 local-cli/{rnpm/install/src → install}/install.js
  38. +7 −1 local-cli/{rnpm/install/src → install}/uninstall.js
  39. 0 local-cli/{rnpm → }/link/__fixtures__/android/0.17/MainActivity.java
  40. 0 local-cli/{rnpm → }/link/__fixtures__/android/0.17/patchedMainActivity.java
  41. 0 local-cli/{rnpm → }/link/__fixtures__/android/0.18/MainActivity.java
  42. 0 local-cli/{rnpm → }/link/__fixtures__/android/0.18/patchedMainActivity.java
  43. 0 local-cli/{rnpm → }/link/__fixtures__/android/0.20/MainActivity.java
  44. 0 local-cli/{rnpm → }/link/__fixtures__/android/build.gradle
  45. 0 local-cli/{rnpm → }/link/__fixtures__/android/patchedBuild.gradle
  46. 0 local-cli/{rnpm → }/link/__fixtures__/android/patchedSettings.gradle
  47. 0 local-cli/{rnpm → }/link/__fixtures__/android/settings.gradle
  48. 0 local-cli/{rnpm → }/link/__fixtures__/linearGradient.pbxproj
  49. 0 local-cli/{rnpm → }/link/__fixtures__/project.pbxproj
  50. +1 −1 local-cli/{rnpm → }/link/__tests__/android/applyPatch.spec.js
  51. +1 −1 local-cli/{rnpm → }/link/__tests__/android/isInstalled.spec.js
  52. +1 −1 local-cli/{rnpm → }/link/__tests__/android/makeBuildPatch.spec.js
  53. +1 −1 local-cli/{rnpm → }/link/__tests__/android/makeImportPatch.spec.js
  54. +2 −2 local-cli/{rnpm → }/link/__tests__/android/makePackagePatch.spec.js
  55. +1 −1 local-cli/{rnpm → }/link/__tests__/android/makeSettingsPatch.spec.js
  56. +1 −1 local-cli/{rnpm → }/link/__tests__/getDependencyConfig.spec.js
  57. +1 −1 local-cli/{rnpm → }/link/__tests__/getProjectDependencies.spec.js
  58. +1 −1 local-cli/{rnpm → }/link/__tests__/groupFilesByType.spec.js
  59. +1 −1 local-cli/{rnpm → }/link/__tests__/ios/addFileToProject.spec.js
  60. +1 −1 local-cli/{rnpm → }/link/__tests__/ios/addProjectToLibraries.spec.js
  61. +2 −2 local-cli/{rnpm → }/link/__tests__/ios/addSharedLibraries.spec.js
  62. +2 −2 local-cli/{rnpm → }/link/__tests__/ios/createGroup.spec.js
  63. +1 −1 local-cli/{rnpm → }/link/__tests__/ios/getBuildProperty.spec.js
  64. +1 −1 local-cli/{rnpm → }/link/__tests__/ios/getGroup.spec.js
  65. +1 −1 local-cli/{rnpm → }/link/__tests__/ios/getHeaderSearchPath.spec.js
  66. +1 −1 local-cli/{rnpm → }/link/__tests__/ios/getHeadersInFolder.spec.js
  67. +1 −1 local-cli/{rnpm → }/link/__tests__/ios/getPlist.spec.js
  68. +1 −1 local-cli/{rnpm → }/link/__tests__/ios/getPlistPath.spec.js
  69. +1 −1 local-cli/{rnpm → }/link/__tests__/ios/getProducts.spec.js
  70. +1 −1 local-cli/{rnpm → }/link/__tests__/ios/hasLibraryImported.spec.js
  71. +1 −1 local-cli/{rnpm → }/link/__tests__/ios/isInstalled.spec.js
  72. +1 −1 local-cli/{rnpm → }/link/__tests__/ios/mapHeaderSearchPaths.spec.js
  73. +2 −2 local-cli/{rnpm → }/link/__tests__/ios/removeProjectFromLibraries.js
  74. +2 −2 local-cli/{rnpm → }/link/__tests__/ios/removeProjectFromProject.spec.js
  75. +3 −3 local-cli/{rnpm → }/link/__tests__/ios/removeSharedLibrary.spec.js
  76. +19 −19 local-cli/{rnpm → }/link/__tests__/link.spec.js
  77. +1 −1 local-cli/{rnpm → }/link/__tests__/promiseWaterfall.spec.js
  78. 0 local-cli/{rnpm/link/src → link}/android/copyAssets.js
  79. 0 local-cli/{rnpm/link/src → link}/android/fs.js
  80. 0 local-cli/{rnpm/link/src → link}/android/isInstalled.js
  81. 0 local-cli/{rnpm/link/src → link}/android/patches/applyParams.js
  82. 0 local-cli/{rnpm/link/src → link}/android/patches/applyPatch.js
  83. 0 local-cli/{rnpm/link/src → link}/android/patches/makeBuildPatch.js
  84. 0 local-cli/{rnpm/link/src → link}/android/patches/makeImportPatch.js
  85. 0 local-cli/{rnpm/link/src → link}/android/patches/makePackagePatch.js
  86. 0 local-cli/{rnpm/link/src → link}/android/patches/makeSettingsPatch.js
  87. 0 local-cli/{rnpm/link/src → link}/android/patches/makeStringsPatch.js
  88. 0 local-cli/{rnpm/link/src → link}/android/patches/revokePatch.js
  89. 0 local-cli/{rnpm/link/src → link}/android/registerNativeModule.js
  90. 0 local-cli/{rnpm/link/src → link}/android/unlinkAssets.js
  91. 0 local-cli/{rnpm/link/src → link}/android/unregisterNativeModule.js
  92. 0 local-cli/{rnpm/link/src → link}/getDependencyConfig.js
  93. 0 local-cli/{rnpm/link/src → link}/getProjectDependencies.js
  94. 0 local-cli/{rnpm/link/src → link}/groupFilesByType.js
  95. 0 local-cli/{rnpm/link/src → link}/ios/addFileToProject.js
  96. 0 local-cli/{rnpm/link/src → link}/ios/addProjectToLibraries.js
  97. 0 local-cli/{rnpm/link/src → link}/ios/addSharedLibraries.js
  98. 0 local-cli/{rnpm/link/src → link}/ios/addToHeaderSearchPaths.js
  99. 0 local-cli/{rnpm/link/src → link}/ios/copyAssets.js
  100. 0 local-cli/{rnpm/link/src → link}/ios/createGroup.js
  101. 0 local-cli/{rnpm/link/src → link}/ios/createGroupWithMessage.js
  102. 0 local-cli/{rnpm/link/src → link}/ios/getBuildProperty.js
  103. 0 local-cli/{rnpm/link/src → link}/ios/getGroup.js
  104. 0 local-cli/{rnpm/link/src → link}/ios/getHeaderSearchPath.js
  105. 0 local-cli/{rnpm/link/src → link}/ios/getHeadersInFolder.js
  106. 0 local-cli/{rnpm/link/src → link}/ios/getPlist.js
  107. 0 local-cli/{rnpm/link/src → link}/ios/getPlistPath.js
  108. 0 local-cli/{rnpm/link/src → link}/ios/getProducts.js
  109. 0 local-cli/{rnpm/link/src → link}/ios/hasLibraryImported.js
  110. 0 local-cli/{rnpm/link/src → link}/ios/isInstalled.js
  111. 0 local-cli/{rnpm/link/src → link}/ios/mapHeaderSearchPaths.js
  112. 0 local-cli/{rnpm/link/src → link}/ios/registerNativeModule.js
  113. 0 local-cli/{rnpm/link/src → link}/ios/removeFromHeaderSearchPaths.js
  114. 0 local-cli/{rnpm/link/src → link}/ios/removeFromPbxItemContainerProxySection.js
  115. 0 local-cli/{rnpm/link/src → link}/ios/removeFromPbxReferenceProxySection.js
  116. 0 local-cli/{rnpm/link/src → link}/ios/removeFromProjectReferences.js
  117. 0 local-cli/{rnpm/link/src → link}/ios/removeFromStaticLibraries.js
  118. 0 local-cli/{rnpm/link/src → link}/ios/removeProductGroup.js
  119. 0 local-cli/{rnpm/link/src → link}/ios/removeProjectFromLibraries.js
  120. 0 local-cli/{rnpm/link/src → link}/ios/removeProjectFromProject.js
  121. 0 local-cli/{rnpm/link/src → link}/ios/removeSharedLibraries.js
  122. 0 local-cli/{rnpm/link/src → link}/ios/unlinkAssets.js
  123. 0 local-cli/{rnpm/link/src → link}/ios/unregisterNativeModule.js
  124. +8 −3 local-cli/{rnpm/link/src → link}/link.js
  125. 0 local-cli/{rnpm/link/src → link}/pollParams.js
  126. 0 local-cli/{rnpm/link/src → link}/promiseWaterfall.js
  127. +7 −1 local-cli/{rnpm/link/src → link}/unlink.js
  128. +0 −50 local-cli/rnpm/core/package.json
  129. +0 −5 local-cli/rnpm/install/install.js
  130. +0 −26 local-cli/rnpm/install/package.json
  131. +0 −5 local-cli/rnpm/install/uninstall.js
  132. +0 −5 local-cli/rnpm/link/link.js
  133. +0 −52 local-cli/rnpm/link/package.json
  134. +0 −5 local-cli/rnpm/link/unlink.js
View
@@ -11,7 +11,7 @@
'use strict';
const Config = require('./util/Config');
-const getUserCommands = require('./rnpm/core/src/getCommands');
+const getUserCommands = require('./core/getCommands');
export type Command = {
name: string,
@@ -37,10 +37,10 @@ const documentedCommands = [
require('./library/library'),
require('./bundle/bundle'),
require('./bundle/unbundle'),
- require('./rnpm/link/link'),
- require('./rnpm/link/unlink'),
- require('./rnpm/install/install'),
- require('./rnpm/install/uninstall'),
+ require('./link/link'),
+ require('./link/unlink'),
+ require('./install/install'),
+ require('./install/uninstall'),
require('./upgrade/upgrade'),
require('./logAndroid/logAndroid'),
require('./logIOS/logIOS'),
@@ -1,6 +1,6 @@
jest.autoMockOff();
-const findAndroidAppFolder = require('../../src/config/android/findAndroidAppFolder');
+const findAndroidAppFolder = require('../../config/android/findAndroidAppFolder');
const mockFs = require('mock-fs');
const mocks = require('../../__fixtures__/android');
@@ -1,6 +1,6 @@
jest.autoMockOff();
-const findManifest = require('../../src/config/android/findManifest');
+const findManifest = require('../../config/android/findManifest');
const mockFs = require('mock-fs');
const mocks = require('../../__fixtures__/android');
@@ -1,6 +1,6 @@
jest.autoMockOff();
-const findPackageClassName = require('../../src/config/android/findPackageClassName');
+const findPackageClassName = require('../../config/android/findPackageClassName');
const mockFs = require('mock-fs');
const mocks = require('../../__fixtures__/android');
@@ -1,6 +1,6 @@
jest.autoMockOff();
-const getDependencyConfig = require('../../src/config/android').dependencyConfig;
+const getDependencyConfig = require('../../config/android').dependencyConfig;
const mockFs = require('mock-fs');
const mocks = require('../../__fixtures__/android');
const userConfig = {};
@@ -1,6 +1,6 @@
jest.autoMockOff();
-const getProjectConfig = require('../../src/config/android').projectConfig;
+const getProjectConfig = require('../../config/android').projectConfig;
const mockFs = require('mock-fs');
const mocks = require('../../__fixtures__/android');
@@ -1,7 +1,7 @@
jest.autoMockOff();
-const findManifest = require('../../src/config/android/findManifest');
-const readManifest = require('../../src/config/android/readManifest');
+const findManifest = require('../../config/android/findManifest');
+const readManifest = require('../../config/android/readManifest');
const mockFs = require('mock-fs');
const mocks = require('../../__fixtures__/android');
@@ -1,6 +1,6 @@
jest.autoMockOff();
-const findAssets = require('../src/config/findAssets');
+const findAssets = require('../config/findAssets');
const mockFs = require('mock-fs');
const dependencies = require('../__fixtures__/dependencies');
const isArray = (arg) =>
@@ -1,7 +1,7 @@
jest.autoMockOff();
const path = require('path');
-const findPlugins = require('../src/findPlugins');
+const findPlugins = require('../findPlugins');
const pjsonPath = path.join(process.cwd(), 'package.json');
const isArray = (arg) =>
@@ -1,6 +1,6 @@
jest.autoMockOff();
-const findProject = require('../../src/config/ios/findProject');
+const findProject = require('../../config/ios/findProject');
const mockFs = require('mock-fs');
const projects = require('../../__fixtures__/projects');
const ios = require('../../__fixtures__/ios');
@@ -1,6 +1,6 @@
jest.autoMockOff();
-const getProjectConfig = require('../../src/config/ios').projectConfig;
+const getProjectConfig = require('../../config/ios').projectConfig;
const mockFs = require('mock-fs');
const projects = require('../../__fixtures__/projects');
@@ -5,9 +5,9 @@ jest.setMock('child_process', {
on: (ev, cb) => cb(spawnError),
}),
});
-jest.dontMock('../src/makeCommand');
+jest.dontMock('../makeCommand');
-const makeCommand = require('../src/makeCommand');
+const makeCommand = require('../makeCommand');
describe('makeCommand', () => {
const command = makeCommand('echo');
@@ -2,7 +2,7 @@
var blacklist = require('../packager/blacklist');
var path = require('path');
-var rnpmConfig = require('./rnpm/core/src/config');
+var rnpmConfig = require('./core/config');
/**
* Default configuration for the CLI.
@@ -7,7 +7,7 @@ const spawnOpts = {
log.heading = 'rnpm-install';
-module.exports = function install(args, config) {
+function install(args, config) {
const name = args[0];
var res = spawnSync('npm', ['install', name, '--save'], spawnOpts);
@@ -24,3 +24,9 @@ module.exports = function install(args, config) {
log.info(`Module ${name} has been successfully installed & linked`);
};
+
+module.exports = {
+ func: install,
+ description: 'install and link native dependencies',
+ name: 'install <packageName>',
+};
@@ -7,7 +7,7 @@ const spawnOpts = {
log.heading = 'rnpm-install';
-module.exports = function install(args, config) {
+function uninstall(args, config) {
const name = args[0];
var res = spawnSync('rnpm', ['unlink', name], spawnOpts);
@@ -24,3 +24,9 @@ module.exports = function install(args, config) {
log.info(`Module ${name} has been successfully uninstalled & unlinked`);
};
+
+module.exports = {
+ func: uninstall,
+ description: 'uninstall and unlink native dependencies',
+ name: 'uninstall <packageName>',
+};
@@ -11,7 +11,7 @@
jest.autoMockOff();
-const applyParams = require('../../src/android/patches/applyParams');
+const applyParams = require('../../android/patches/applyParams');
describe('applyParams', () => {
it('apply params to the string', () => {
@@ -3,7 +3,7 @@
jest.autoMockOff();
const path = require('path');
-const isInstalled = require('../../src/android/isInstalled');
+const isInstalled = require('../../android/isInstalled');
const projectConfig = {
buildGradlePath: path.join(__dirname, '../../__fixtures__/android/patchedBuild.gradle'),
@@ -2,7 +2,7 @@
jest.autoMockOff();
-const makeBuildPatch = require('../../src/android/patches/makeBuildPatch');
+const makeBuildPatch = require('../../android/patches/makeBuildPatch');
const name = 'test';
describe('makeBuildPatch', () => {
@@ -2,7 +2,7 @@
jest.autoMockOff();
-const makeImportPatch = require('../../src/android/patches/makeImportPatch');
+const makeImportPatch = require('../../android/patches/makeImportPatch');
const packageImportPath = 'import some.example.project';
@@ -2,8 +2,8 @@
jest.autoMockOff();
-const makePackagePatch = require('../../src/android/patches/makePackagePatch');
-const applyParams = require('../../src/android/patches/applyParams');
+const makePackagePatch = require('../../android/patches/makePackagePatch');
+const applyParams = require('../../android/patches/applyParams');
const packageInstance = 'new SomeLibrary(${foo}, ${bar}, \'something\')';
const name = 'some-library';
@@ -3,7 +3,7 @@
jest.autoMockOff();
const path = require('path');
-const makeSettingsPatch = require('../../src/android/patches/makeSettingsPatch');
+const makeSettingsPatch = require('../../android/patches/makeSettingsPatch');
const name = 'test';
const projectConfig = {
@@ -2,7 +2,7 @@
jest.autoMockOff();
-const getDependencyConfig = require('../src/getDependencyConfig');
+const getDependencyConfig = require('../getDependencyConfig');
const sinon = require('sinon');
describe('getDependencyConfig', () => {
@@ -2,7 +2,7 @@
jest.autoMockOff();
-const getProjectDependencies = require('../src/getProjectDependencies');
+const getProjectDependencies = require('../getProjectDependencies');
const path = require('path');
describe('getProjectDependencies', () => {
@@ -2,7 +2,7 @@
jest.autoMockOff();
-const groupFilesByType = require('../src/groupFilesByType');
+const groupFilesByType = require('../groupFilesByType');
describe('groupFilesByType', () => {
@@ -4,7 +4,7 @@ jest.autoMockOff();
const xcode = require('xcode');
const path = require('path');
-const addFileToProject = require('../../src/ios/addFileToProject');
+const addFileToProject = require('../../ios/addFileToProject');
const _ = require('lodash');
const project = xcode.project(
@@ -5,7 +5,7 @@ jest.autoMockOff();
const xcode = require('xcode');
const path = require('path');
const PbxFile = require('xcode/lib/pbxFile');
-const addProjectToLibraries = require('../../src/ios/addProjectToLibraries');
+const addProjectToLibraries = require('../../ios/addProjectToLibraries');
const last = require('lodash').last;
const project = xcode.project(
@@ -4,8 +4,8 @@ jest.autoMockOff();
const xcode = require('xcode');
const path = require('path');
-const addSharedLibraries = require('../../src/ios/addSharedLibraries');
-const getGroup = require('../../src/ios/getGroup');
+const addSharedLibraries = require('../../ios/addSharedLibraries');
+const getGroup = require('../../ios/getGroup');
const project = xcode.project(
path.join(__dirname, '../../__fixtures__/project.pbxproj')
@@ -4,8 +4,8 @@ jest.autoMockOff();
const xcode = require('xcode');
const path = require('path');
-const createGroup = require('../../src/ios/createGroup');
-const getGroup = require('../../src/ios/getGroup');
+const createGroup = require('../../ios/createGroup');
+const getGroup = require('../../ios/getGroup');
const last = require('lodash').last;
const project = xcode.project(
@@ -4,7 +4,7 @@ jest.autoMockOff();
const xcode = require('xcode');
const path = require('path');
-const getBuildProperty = require('../../src/ios/getBuildProperty');
+const getBuildProperty = require('../../ios/getBuildProperty');
const project = xcode.project(
path.join(__dirname, '../../__fixtures__/project.pbxproj')
@@ -3,7 +3,7 @@
jest.autoMockOff();
const xcode = require('xcode');
-const getGroup = require('../../src/ios/getGroup');
+const getGroup = require('../../ios/getGroup');
const path = require('path');
const project = xcode.project(
@@ -2,7 +2,7 @@
jest.autoMockOff();
-const getHeaderSearchPath = require('../../src/ios/getHeaderSearchPath');
+const getHeaderSearchPath = require('../../ios/getHeaderSearchPath');
const path = require('path');
const SRC_DIR = path.join('react-native-project', 'ios');
@@ -2,7 +2,7 @@
jest.autoMockOff();
-const getHeadersInFolder = require('../../src/ios/getHeadersInFolder');
+const getHeadersInFolder = require('../../ios/getHeadersInFolder');
describe('ios::getHeadersInFolder', () => {
xit('should return an array of all headers in given folder', () => {
@@ -3,7 +3,7 @@
jest.autoMockOff();
const xcode = require('xcode');
-const getPlist = require('../../src/ios/getPlist');
+const getPlist = require('../../ios/getPlist');
const path = require('path');
const project = xcode.project(
@@ -3,7 +3,7 @@
jest.autoMockOff();
const xcode = require('xcode');
-const getPlistPath = require('../../src/ios/getPlistPath');
+const getPlistPath = require('../../ios/getPlistPath');
const path = require('path');
const project = xcode.project(
@@ -3,7 +3,7 @@
jest.autoMockOff();
const xcode = require('xcode');
-const getProducts = require('../../src/ios/getProducts');
+const getProducts = require('../../ios/getProducts');
const path = require('path');
const project = xcode.project(
@@ -3,7 +3,7 @@
jest.autoMockOff();
const xcode = require('xcode');
-const hasLibraryImported = require('../../src/ios/hasLibraryImported');
+const hasLibraryImported = require('../../ios/hasLibraryImported');
const path = require('path');
const project = xcode.project(
@@ -3,7 +3,7 @@
jest.autoMockOff();
const path = require('path');
-const isInstalled = require('../../src/ios/isInstalled');
+const isInstalled = require('../../ios/isInstalled');
const baseProjectConfig = {
pbxprojPath: path.join(__dirname, '../../__fixtures__/project.pbxproj'),
@@ -3,7 +3,7 @@
jest.autoMockOff();
const xcode = require('xcode');
-const mapHeaderSearchPaths = require('../../src/ios/mapHeaderSearchPaths');
+const mapHeaderSearchPaths = require('../../ios/mapHeaderSearchPaths');
const path = require('path');
const project = xcode.project(
@@ -4,8 +4,8 @@ jest.autoMockOff();
const xcode = require('xcode');
const PbxFile = require('xcode/lib/pbxFile');
-const addProjectToLibraries = require('../../src/ios/addProjectToLibraries');
-const removeProjectFromLibraries = require('../../src/ios/removeProjectFromLibraries');
+const addProjectToLibraries = require('../../ios/addProjectToLibraries');
+const removeProjectFromLibraries = require('../../ios/removeProjectFromLibraries');
const last = require('lodash').last;
const path = require('path');
Oops, something went wrong.

0 comments on commit 0af640b

Please sign in to comment.