Detect the Android app module by basename in apps:init

CHANGELOG.md

@@ -0,0 +1 @@
+- Fixed `apps:init` writing `google-services.json` to an `app/app` path when the Android module has no `src` directory, by detecting the module from the directory basename instead of the first path segment (#10863).

src/management/apps.spec.ts

@@ -2,6 +2,7 @@
 import { expect } from "chai";
 import * as sinon from "sinon";
 import * as fs from "fs";
+import * as path from "path";
 import nock from "../test/helpers/nock";
 
 import * as api from "../api";
@@ -138,7 +139,7 @@
     it("should return the detected platform when only one is found", async () => {
       getPlatformsFromFolderStub.resolves([appUtils.Platform.ANDROID]);
 
       const platform = await getPlatform("any-dir", {} as any);
 
       expect(platform).to.equal(AppPlatform.ANDROID);
       expect(getPlatformsFromFolderStub.calledOnceWith("any-dir")).to.be.true;
@@ -148,7 +149,7 @@
       getPlatformsFromFolderStub.resolves([appUtils.Platform.ANDROID, appUtils.Platform.IOS]);
       promptSelectStub.resolves("IOS");
 
       const platform = await getPlatform("any-dir", {} as any);
 
       expect(platform).to.equal(AppPlatform.IOS);
       expect(promptSelectStub.calledOnce).to.be.true;
@@ -160,7 +161,7 @@
       getPlatformsFromFolderStub.withArgs("android-dir").resolves([appUtils.Platform.ANDROID]);
       promptForDirectoryStub.resolves("android-dir");
 
       const platform = await getPlatform("initial-dir", {} as any);
 
       expect(platform).to.equal(AppPlatform.ANDROID);
       expect(promptForDirectoryStub.calledOnce).to.be.true;
@@ -171,9 +172,9 @@
 
       let err;
       try {
         await getPlatform("any-dir", {} as any);
       } catch (e: any) {
         err = e;
       }
 
       expect(err).to.be.an.instanceOf(FirebaseError);
@@ -741,19 +742,25 @@
         desc: "Root of Android project",
         folderName: "android/",
         folderItems: { app: {} },
-        output: "android/app",
+        output: path.join("android", "app"),
       },
       {
         desc: "Inside app folder",
         folderName: "android/app",
         folderItems: { src: {} },
         output: "android/app",
       },
+      {
+        desc: "Inside app folder without a src directory",
+        folderName: "android/app",
+        folderItems: { libs: {}, "build.gradle": "" },
+        output: "android/app",
+      },
       {
         desc: "Folder with many modules",
         folderName: "android/",
         folderItems: { module1: {}, module2: {}, module3: {} },
-        output: "android/app",
+        output: path.join("android", "app"),
       },
     ];
     for (const c of cases) {
@@ -782,7 +789,7 @@
         desc: "Root of ios project with xcodeproj files",
         folderName: "ios/",
         folderItems: { "abc.xcodeproj": "Contents", abc: {} },
-        output: "ios/abc",
+        output: path.join("ios", "abc"),
       },
       {
         desc: "Folder with Info.plist",

src/management/apps.ts

@@ -792,9 +792,8 @@ export async function findIntelligentPathForAndroid(appDir: string, options: App
    * android/build.gradle // if it's this, choose app
    * android/app/build.gradle // if it's this, choose current dir.
    */
-  const paths = appDir.split("/");
   // For when app/build.gradle is found
-  if (paths[0] === "app") {
+  if (path.basename(appDir) === "app") {
     return appDir;
   } else {
     const currentFiles: fs.Dirent[] = await fs.readdir(appDir, { withFileTypes: true });