Skip to content

fix(android): hardcoded appName when finding build.gradle #2652

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

Merged
merged 5 commits into from
Apr 17, 2025
Merged

fix(android): hardcoded appName when finding build.gradle #2652

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b780971
fix(android): hardcoded appName when finding build.gradle
thymikee Apr 15, 2025
483caeb
add extra tests
thymikee Apr 16, 2025
1250fc8
update snapshot
thymikee Apr 17, 2025
c45afea
update expectation to reflect error change
thymikee Apr 17, 2025
e0b814b
Revert "update expectation to reflect error change"
thymikee Apr 17, 2025
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: 4 additions & 4 deletions packages/cli-config-android/src/config/__tests__/findBuildGradle.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ describe('findBuildGradle for apps', () => {
});

it('returns the app gradle path if file exists in the folder', () => {
expect(findBuildGradle('/flat/android', false)).toBe(
expect(findBuildGradle('/flat/android', 'app')).toBe(
'/flat/android/app/build.gradle',
);
});

it('returns `null` if there is no gradle in the app folder', () => {
expect(findBuildGradle('/empty', false)).toBeNull();
expect(findBuildGradle('/empty', 'app')).toBeNull();
});
});

Expand All @@ -46,12 +46,12 @@ describe('findBuildGradle for libraries', () => {
});

it('returns the app gradle path if file exists in the folder', () => {
expect(findBuildGradle('/flat/android', true)).toBe(
expect(findBuildGradle('/flat/android', '')).toBe(
'/flat/android/build.gradle',
);
});

it('returns `null` if there is no gradle in the app folder', () => {
expect(findBuildGradle('/empty', true)).toBeNull();
expect(findBuildGradle('/empty', '')).toBeNull();
});
});
11 changes: 8 additions & 3 deletions packages/cli-config-android/src/config/findBuildGradle.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,19 @@
import fs from 'fs';
import path from 'path';

export function findBuildGradle(sourceDir: string, isLibrary: boolean) {
/**
* Find the build.gradle file for the given app name.
* This helper is used to find build.gradle file in both apps and libraries.
* For libraries, the appName is empty string.
*/
export function findBuildGradle(sourceDir: string, appName: string) {
const buildGradlePath = path.join(
sourceDir,
isLibrary ? 'build.gradle' : 'app/build.gradle',
path.join(appName, 'build.gradle'),
);
const buildGradleKtsPath = path.join(
sourceDir,
isLibrary ? 'build.gradle.kts' : 'app/build.gradle.kts',
path.join(appName, 'build.gradle.kts'),
);

if (fs.existsSync(buildGradlePath)) {
Expand Down
4 changes: 2 additions & 2 deletions packages/cli-config-android/src/config/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ export function projectConfig(
const manifestPath = userConfig.manifestPath
? path.join(sourceDir, userConfig.manifestPath)
: findManifest(path.join(sourceDir, appName));
const buildGradlePath = findBuildGradle(sourceDir, false);
const buildGradlePath = findBuildGradle(sourceDir, appName);

if (!manifestPath && !buildGradlePath) {
return null;
Expand Down Expand Up @@ -125,7 +125,7 @@ export function dependencyConfig(
const manifestPath = userConfig.manifestPath
? path.join(sourceDir, userConfig.manifestPath)
: findManifest(sourceDir);
const buildGradlePath = findBuildGradle(sourceDir, true);
const buildGradlePath = findBuildGradle(sourceDir, '');
const isPureCxxDependency =
userConfig.cxxModuleCMakeListsModuleName != null &&
userConfig.cxxModuleCMakeListsPath != null &&
Expand Down
Loading