From 3c8a2eed92587ef3a79352b71073e4cfccb2a7df Mon Sep 17 00:00:00 2001 From: Kureev Alexey Date: Sat, 16 Jul 2016 10:52:38 -0700 Subject: [PATCH] Fix native modules linking in 0.29.1 Summary: Attempt to fix https://github.com/facebook/react-native/pull/8612 We re-named `mainActivityPath` by `mainFilePath` in the `link` code, but we forgot to rename config parameters. Currently, link is broken. - [x] `react-native link` should work for react-native 0.29+ Closes https://github.com/facebook/react-native/pull/8807 Differential Revision: D3576176 fbshipit-source-id: 60ecbd660563923696bbef1ed3b0900a7d58469f --- .../rnpm/link/src/android/patches/0.20/makeImportPatch.js | 2 +- local-cli/rnpm/link/src/android/registerNativeModule.js | 4 ++-- local-cli/rnpm/link/src/android/unregisterNativeModule.js | 4 ++-- .../rnpm/link/test/android/patches/0.17/makeImportPatch.js | 2 +- .../rnpm/link/test/android/patches/0.17/makePackagePatch.js | 2 +- .../rnpm/link/test/android/patches/0.18/makeImportPatch.js | 2 +- .../rnpm/link/test/android/patches/0.18/makePackagePatch.js | 2 +- .../rnpm/link/test/android/patches/0.20/makeImportPatch.js | 2 +- .../rnpm/link/test/android/patches/0.20/makePackagePatch.js | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/local-cli/rnpm/link/src/android/patches/0.20/makeImportPatch.js b/local-cli/rnpm/link/src/android/patches/0.20/makeImportPatch.js index 687d61bd4fd..deee6dfec6b 100644 --- a/local-cli/rnpm/link/src/android/patches/0.20/makeImportPatch.js +++ b/local-cli/rnpm/link/src/android/patches/0.20/makeImportPatch.js @@ -1,6 +1,6 @@ module.exports = function makeImportPatch(packageImportPath) { return { - pattern: 'import com.facebook.react.ReactActivity;', + pattern: 'import com.facebook.react.ReactApplication;', patch: '\n' + packageImportPath, }; }; diff --git a/local-cli/rnpm/link/src/android/registerNativeModule.js b/local-cli/rnpm/link/src/android/registerNativeModule.js index fa01c2081bd..a5fee0dc002 100644 --- a/local-cli/rnpm/link/src/android/registerNativeModule.js +++ b/local-cli/rnpm/link/src/android/registerNativeModule.js @@ -27,12 +27,12 @@ module.exports = function registerNativeAndroidModule( applyPatch(projectConfig.stringsPath, makeStringsPatch(params, name)); applyPatch( - projectConfig.mainActivityPath, + projectConfig.mainFilePath, makePackagePatch(androidConfig.packageInstance, params, name) ); applyPatch( - projectConfig.mainActivityPath, + projectConfig.mainFilePath, makeImportPatch(androidConfig.packageImportPath) ); }; diff --git a/local-cli/rnpm/link/src/android/unregisterNativeModule.js b/local-cli/rnpm/link/src/android/unregisterNativeModule.js index 1c5eaa2bf4a..9b88628330c 100644 --- a/local-cli/rnpm/link/src/android/unregisterNativeModule.js +++ b/local-cli/rnpm/link/src/android/unregisterNativeModule.js @@ -36,12 +36,12 @@ module.exports = function unregisterNativeAndroidModule( revokePatch(projectConfig.stringsPath, makeStringsPatch(params, name)); revokePatch( - projectConfig.mainActivityPath, + projectConfig.mainFilePath, makePackagePatch(androidConfig.packageInstance, params, name) ); revokePatch( - projectConfig.mainActivityPath, + projectConfig.mainFilePath, makeImportPatch(androidConfig.packageImportPath) ); }; diff --git a/local-cli/rnpm/link/test/android/patches/0.17/makeImportPatch.js b/local-cli/rnpm/link/test/android/patches/0.17/makeImportPatch.js index d2a5f43c728..ed729defc2f 100644 --- a/local-cli/rnpm/link/test/android/patches/0.17/makeImportPatch.js +++ b/local-cli/rnpm/link/test/android/patches/0.17/makeImportPatch.js @@ -7,7 +7,7 @@ const makeImportPatch = require('../../../../src/android/patches/0.17/makeImport const applyPatch = require('../../../../src/android/patches/applyPatch'); const projectConfig = { - mainActivityPath: 'MainActivity.java', + mainFilePath: 'MainActivity.java', }; const packageImportPath = 'import some.example.project'; diff --git a/local-cli/rnpm/link/test/android/patches/0.17/makePackagePatch.js b/local-cli/rnpm/link/test/android/patches/0.17/makePackagePatch.js index 99857a5713d..cbbb3f517c9 100644 --- a/local-cli/rnpm/link/test/android/patches/0.17/makePackagePatch.js +++ b/local-cli/rnpm/link/test/android/patches/0.17/makePackagePatch.js @@ -7,7 +7,7 @@ const makePackagePatch = require('../../../../src/android/patches/0.17/makePacka const applyPatch = require('../../../../src/android/patches/applyPatch'); const projectConfig = { - mainActivityPath: 'MainActivity.java', + mainFilePath: 'MainActivity.java', }; const packageInstance = 'new SomeLibrary(${foo}, ${bar}, \'something\')'; diff --git a/local-cli/rnpm/link/test/android/patches/0.18/makeImportPatch.js b/local-cli/rnpm/link/test/android/patches/0.18/makeImportPatch.js index ffff9f045f6..0dd15c74890 100644 --- a/local-cli/rnpm/link/test/android/patches/0.18/makeImportPatch.js +++ b/local-cli/rnpm/link/test/android/patches/0.18/makeImportPatch.js @@ -7,7 +7,7 @@ const makeImportPatch = require('../../../../src/android/patches/0.18/makeImport const applyPatch = require('../../../../src/android/patches/applyPatch'); const projectConfig = { - mainActivityPath: 'MainActivity.java', + mainFilePath: 'MainActivity.java', }; const packageImportPath = 'import some.example.project'; diff --git a/local-cli/rnpm/link/test/android/patches/0.18/makePackagePatch.js b/local-cli/rnpm/link/test/android/patches/0.18/makePackagePatch.js index a2d4802f4e4..b3f46bf5fe8 100644 --- a/local-cli/rnpm/link/test/android/patches/0.18/makePackagePatch.js +++ b/local-cli/rnpm/link/test/android/patches/0.18/makePackagePatch.js @@ -7,7 +7,7 @@ const makePackagePatch = require('../../../../src/android/patches/0.18/makePacka const applyPatch = require('../../../../src/android/patches/applyPatch'); const projectConfig = { - mainActivityPath: 'MainActivity.java', + mainFilePath: 'MainActivity.java', }; const packageInstance = 'new SomeLibrary(${foo}, ${bar}, \'something\')'; diff --git a/local-cli/rnpm/link/test/android/patches/0.20/makeImportPatch.js b/local-cli/rnpm/link/test/android/patches/0.20/makeImportPatch.js index b80fc9a577d..31b32826115 100644 --- a/local-cli/rnpm/link/test/android/patches/0.20/makeImportPatch.js +++ b/local-cli/rnpm/link/test/android/patches/0.20/makeImportPatch.js @@ -7,7 +7,7 @@ const makeImportPatch = require('../../../../src/android/patches/0.20/makeImport const applyPatch = require('../../../../src/android/patches/applyPatch'); const projectConfig = { - mainActivityPath: 'MainActivity.java', + mainFilePath: 'MainActivity.java', }; const packageImportPath = 'import some.example.project'; diff --git a/local-cli/rnpm/link/test/android/patches/0.20/makePackagePatch.js b/local-cli/rnpm/link/test/android/patches/0.20/makePackagePatch.js index 87f807636e1..fe8086ce8b3 100644 --- a/local-cli/rnpm/link/test/android/patches/0.20/makePackagePatch.js +++ b/local-cli/rnpm/link/test/android/patches/0.20/makePackagePatch.js @@ -7,7 +7,7 @@ const makePackagePatch = require('../../../../src/android/patches/0.20/makePacka const applyPatch = require('../../../../src/android/patches/applyPatch'); const projectConfig = { - mainActivityPath: 'MainActivity.java', + mainFilePath: 'MainActivity.java', }; const packageInstance = 'new SomeLibrary(${foo}, ${bar}, \'something\')';