Skip to content

Commit 214a41d

Browse files
GantMangrabbou
authored andcommitted
changes link file on Android to MainApplication.java for 0.29 update
Summary: rnpm aka `react-native link` is broken with Android 0.29 - #8603 This gets it back to working again by checking for new MyApplication.java file, and curtailing the path when needed. Closes #8612 Differential Revision: D3533960 fbshipit-source-id: 95d799eaebb26ba1d876c88107ccd2af72427f55
1 parent 4d70b85 commit 214a41d

File tree

1 file changed

+3
-3
lines changed
  • local-cli/rnpm/core/src/config/android

1 file changed

+3
-3
lines changed

local-cli/rnpm/core/src/config/android/index.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ exports.projectConfig = function projectConfigAndroid(folder, userConfig) {
3333
const packageFolder = userConfig.packageFolder ||
3434
packageName.replace(/\./g, path.sep);
3535

36-
const mainActivityPath = path.join(
36+
const mainFilePath = path.join(
3737
sourceDir,
38-
userConfig.mainActivityPath || `src/main/java/${packageFolder}/MainActivity.java`
38+
userConfig.mainFilePath || `src/main/java/${packageFolder}/MainApplication.java`
3939
);
4040

4141
const stringsPath = path.join(
@@ -68,7 +68,7 @@ exports.projectConfig = function projectConfigAndroid(folder, userConfig) {
6868
buildGradlePath,
6969
settingsGradlePath,
7070
assetsPath,
71-
mainActivityPath,
71+
mainFilePath,
7272
};
7373
};
7474

0 commit comments

Comments
 (0)