@produtype/core 0.29.1 → 0.29.2

package/dist/analyzer/detectMobile.js

@@ -37,7 +37,21 @@ const textSearch_1 = require("../utils/textSearch");
  */
 /** Files that say which platform this is, without reading their contents. */
 const IOS_MARKERS = [/(^|\/)Info\.plist$/i, /(^|\/)Podfile$/, /\.xcodeproj\//, /(^|\/)Package\.swift$/];
-const ANDROID_MARKERS = [/(^|\/)AndroidManifest\.xml$/i, /(^|\/)build\.gradle(\.kts)?$/];
+/**
+ * `AndroidManifest.xml` says Android. `build.gradle` says the JVM.
+ *
+ * Gradle builds Android applications, Spring services, Kotlin libraries and most of the
+ * Java world. Treating its presence as a platform made spring-petclinic — the canonical
+ * Spring web application — a mobile app at high confidence, and it would do the same to
+ * every JVM server ever written.
+ *
+ * A Gradle file earns the label by applying the Android plugin, which is the line that
+ * makes a build an Android build. That has to be read rather than matched on a path,
+ * which is why the two lists are separate.
+ */
+const ANDROID_MARKERS = [/(^|\/)AndroidManifest\.xml$/i];
+const GRADLE_FILES = /(^|\/)build\.gradle(\.kts)?$/;
+const ANDROID_GRADLE_PLUGIN = /com\.android\.(application|library)|(^|\s)android\s*\{/m;
 /** Gradle coordinates that put a secret in the Android keystore rather than in a file. */
 const SECURE_STORAGE_GRADLE = ['androidx.security:security-crypto', 'com.scottyab:secure-preferences'];
 /**
@@ -110,9 +124,18 @@ function matchesAny(files, patterns) {
         .filter((file) => !GENERATED_OR_VENDORED.test(file))
         .filter((file) => patterns.some((pattern) => pattern.test(file)));
 }
+async function androidGradleFiles(ctx) {
+    const found = [];
+    for (const file of ctx.files.all.filter((candidate) => GRADLE_FILES.test(candidate))) {
+        const text = await (0, readTextFileSafe_1.readTextFileSafe)(ctx.root, file);
+        if (text && ANDROID_GRADLE_PLUGIN.test(text))
+            found.push(file);
+    }
+    return found;
+}
 async function detectMobile(ctx) {
     const iosFiles = matchesAny(ctx.files.all, IOS_MARKERS);
-    const androidFiles = matchesAny(ctx.files.all, ANDROID_MARKERS);
+    const androidFiles = [...matchesAny(ctx.files.all, ANDROID_MARKERS), ...(await androidGradleFiles(ctx))];
     const flutterDeps = (0, detectContext_1.hasAnyDartDep)(ctx, ['flutter']);
     const reactNativeDeps = (0, detectContext_1.hasAnyDep)(ctx, ['react-native', 'expo']);
     const platforms = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@produtype/core",
-  "version": "0.29.1",
+  "version": "0.29.2",
   "description": "Deterministic CLI and library that analyzes a web application repository and reports how far it is from production-ready for the kind of product it is meant to be.",
   "license": "MIT",
   "bin": {