Skip to content
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

feat: extract android applicationId #1951

Merged
merged 8 commits into from
Aug 19, 2023
Merged

feat: extract android applicationId #1951

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ddb3884
feat: extract android applicationId
adamTrz Jun 2, 2023
34e98f4
(fix) tests
adamTrz Jun 15, 2023
485f79f
Merge remote-tracking branch 'CLI/main' into feat/android-applicationId
adamTrz Jun 15, 2023
3bb017d
fix: e2e snapshot
adamTrz Jun 15, 2023
7b43fb5
fix: update snapshot
adamTrz Jun 16, 2023
52bae25
fix: update snap
adamTrz Jun 16, 2023
26f3901
update variable name
TMisiukiewicz Jun 21, 2023
c57f6b1
Merge remote-tracking branch 'CLI/main' into feat/android-applicationId
adamTrz Aug 19, 2023
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
2 changes: 1 addition & 1 deletion packages/cli-platform-android/src/config/__fixtures__/files/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apply package: "com.android.application"
apply package: "com.facebook.react"

android {
namespace 'com.some.example'
namespace "com.some.example"
defaultConfig {
applicationId "com.example"
}
Expand Down
2 changes: 2 additions & 0 deletions ...ges/cli-platform-android/src/config/__tests__/__snapshots__/getProjectConfig.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
exports[`android::getProjectConfig returns an object with android project configuration for flat structure 1`] = `
Object {
"appName": "",
"applicationId": "com.some.example",
"dependencyConfiguration": undefined,
"packageName": "com.some.example",
"sourceDir": "/flat/android",
Expand All @@ -14,6 +15,7 @@ Object {
exports[`android::getProjectConfig returns an object with android project configuration for multiple 1`] = `
Object {
"appName": "",
"applicationId": "com.some.example",
"dependencyConfiguration": undefined,
"packageName": "com.some.example",
"sourceDir": "/multiple/android",
Expand Down
3 changes: 3 additions & 0 deletions packages/cli-platform-android/src/config/getAndroidProject.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,9 @@ export function validatePackageName(packageName: string) {

// Search for applicationId at defaultConfig object
export function parseApplicationIdFromBuildGradleFile(buildGradlePath: string) {
if (!buildGradlePath) {
return null;
}
const buildGradle = fs.readFileSync(buildGradlePath, 'utf8');

const matchArray = buildGradle.match(/defaultConfig\s*{([\s\S]*?)}/);
Expand Down
9 changes: 5 additions & 4 deletions packages/cli-platform-android/src/config/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,9 @@ export function projectConfig(
);
}

const applicationId =
getApplicationId(buildGradlePath as string) || packageName;
const applicationId = buildGradlePath
? getApplicationId(buildGradlePath, packageName)
: packageName;

return {
sourceDir,
Expand All @@ -77,8 +78,8 @@ export function projectConfig(
};
}

function getApplicationId(buildGradlePath: string) {
let appId = '';
function getApplicationId(buildGradlePath: string, packageName: string) {
let appId = packageName;

const applicationId = parseApplicationIdFromBuildGradleFile(buildGradlePath);
if (applicationId) {
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ const pkgJson = require('../package.json');
const program = new CommanderCommand()
.usage('[command] [options]')
.version(pkgJson.version, '-v', 'Output the current version')
.option('--verbose', 'Increase logging verbosity')
.enablePositionalOptions();
.option('--verbose', 'Increase logging verbosity');
// .enablePositionalOptions();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

did you intend to remove this line?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nah. That should be reverted 👌


const handleError = (err: Error) => {
logger.enable();
Expand Down