Skip to content

Fix gradle sync failure with scoped module name#17094

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
0x5e wants to merge 3 commits into from
Closed

Fix gradle sync failure with scoped module name #17094

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ef9a4d2
Fix gradle sync failure with scoped module name
0x5e Nov 30, 2017
528b7a4
Merge branch 'master' into gradle-sync-fix
0x5e Dec 6, 2017
a55fd49
typo
0x5e Dec 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions local-cli/link/android/patches/makeNamePatch.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
/*
* Fix gradle sync failure in Android Studio 3.0 when
* module name has a scope (e.g `@username/project-name`)
* https://github.com/facebook/react-native/issues/17029
*/
module.exports = function makeNamePatch(name) {
return name.replace(/\//g, ':');
};
3 changes: 3 additions & 0 deletions local-cli/link/android/registerNativeModule.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,13 +4,16 @@ const makeSettingsPatch = require('./patches/makeSettingsPatch');
const makeBuildPatch = require('./patches/makeBuildPatch');
const makeImportPatch = require('./patches/makeImportPatch');
const makePackagePatch = require('./patches/makePackagePatch');
const makeNamePatch = require('./patches/makeNamePatch');

module.exports = function registerNativeAndroidModule(
name,
androidConfig,
params,
projectConfig
) {
name = makeNamePatch(name);

const buildPatch = makeBuildPatch(name);

applyPatch(
Expand Down
3 changes: 3 additions & 0 deletions local-cli/link/android/unregisterNativeModule.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,12 +7,15 @@ const makeBuildPatch = require('./patches/makeBuildPatch');
const makeStringsPatch = require('./patches/makeStringsPatch');
const makeImportPatch = require('./patches/makeImportPatch');
const makePackagePatch = require('./patches/makePackagePatch');
const makeNamePatch = require('./patches/makeNamePatch');

module.exports = function unregisterNativeAndroidModule(
name,
androidConfig,
projectConfig
) {
name = makeNamePatch(name);

const buildPatch = makeBuildPatch(name);
const strings = fs.readFileSync(projectConfig.stringsPath, 'utf8');
var params = {};
Expand Down