Skip to content

Consider app/src/main/kotlin in preference to app/src/main/java #7535

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 2 commits into from
Aug 7, 2024
Merged

Consider app/src/main/kotlin in preference to app/src/main/java #7535

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f3395f5
Consider app/src/main/kotlin in preference to app/src/main/java
dconeybe Aug 7, 2024
c85056e
Merge branch 'master' into dconeybe/AppSrcMainKotlin
joehan Aug 7, 2024
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
15 changes: 10 additions & 5 deletions src/init/features/dataconnect/sdk.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,11 +147,16 @@ async function askQuestions(setup: Setup, config: Config): Promise<SDKInfo> {
}

if (targetPlatform === Platform.ANDROID) {
// app/src/main/java is a common practice for Andorid, but not explicitly required.
// If it is present, we'll use it. Otherwise, we fall back to the app directory.
const baseDir = fs.existsSync(path.join(appDir, "app/src/main/java"))
? path.join(appDir, "app/src/main/java")
: path.join(appDir, "generated");
// app/src/main/kotlin and app/src/main/java are conventional for Android,
// but not required or enforced. If one of them is present (preferring the
// "kotlin" directory), use it. Otherwise, fall back to the app directory.
let baseDir = path.join(appDir, "generated");
for (const candidateSubdir of ["app/src/main/java", "app/src/main/kotlin"]) {
const candidateDir = path.join(appDir, candidateSubdir);
if (fs.existsSync(candidateDir)) {
baseDir = candidateDir;
}
}

const outputDir =
newConnectorYaml.generate.kotlinSdk?.outputDir ||
Expand Down