@react-native-community/cli-platform-android - npm Package Compare versions

Comparing version 12.0.0-alpha.11 to 12.0.0-alpha.12

build/commands/runAndroid/listAndroidTasks.js

@@ -53,3 +53,3 @@ "use strict";
   const cmd = process.platform.startsWith('win') ? 'gradlew.bat' : './gradlew';
-  const out = _execa().default.sync(cmd, ['tasks'], {
+  const out = _execa().default.sync(cmd, ['tasks', '--group', taskType], {
     cwd: sourceDir
@@ -56,0 +56,0 @@ }).stdout;

build/commands/runAndroid/tryLaunchAppOnDevice.js

@@ -37,9 +37,10 @@ "use strict";
     packageName,
-    mainActivity
+    mainActivity,
+    applicationId
   } = androidProject;
-  const packageNameWithSuffix = [appId || packageName, appIdSuffix].filter(Boolean).join('.');
+  const applicationIdWithSuffix = [appId || applicationId, appIdSuffix].filter(Boolean).join('.');
   const activityToLaunch = mainActivity.includes('.') ? mainActivity : [packageName, mainActivity].filter(Boolean).join('.');
   try {
     // Here we're using the same flags as Android Studio to launch the app
-    const adbArgs = ['shell', 'am', 'start', '-n', `${packageNameWithSuffix}/${activityToLaunch}`, '-a', 'android.intent.action.MAIN', '-c', 'android.intent.category.LAUNCHER'];
+    const adbArgs = ['shell', 'am', 'start', '-n', `${applicationIdWithSuffix}/${activityToLaunch}`, '-a', 'android.intent.action.MAIN', '-c', 'android.intent.category.LAUNCHER'];
     if (device) {
@@ -46,0 +47,0 @@ adbArgs.unshift('-s', device);

build/config/getAndroidProject.d.ts

@@ -12,2 +12,3 @@ import { Config } from '@react-native-community/cli-types';
 export declare function validatePackageName(packageName: string): boolean;
+export declare function parseApplicationIdFromBuildGradleFile(buildGradlePath: string): string | null;
 //# sourceMappingURL=getAndroidProject.d.ts.map

build/config/getAndroidProject.js

@@ -8,2 +8,3 @@ "use strict";
 exports.getPackageName = getPackageName;
+exports.parseApplicationIdFromBuildGradleFile = parseApplicationIdFromBuildGradleFile;
 exports.parseNamespaceFromBuildGradleFile = parseNamespaceFromBuildGradleFile;
@@ -111,2 +112,17 @@ exports.parsePackageNameFromAndroidManifestFile = parsePackageNameFromAndroidManifestFile;
 
+// Search for applicationId at defaultConfig object
+function parseApplicationIdFromBuildGradleFile(buildGradlePath) {
+  if (!buildGradlePath) {
+    return null;
+  }
+  const buildGradle = _fs().default.readFileSync(buildGradlePath, 'utf8');
+  const matchArray = buildGradle.match(/defaultConfig\s*{([\s\S]*?)}/);
+  if (matchArray && matchArray.length > 0) {
+    const appIdMatchArray = matchArray[1].match(/applicationId\s*[=]*\s*["'](.+?)["']/);
+    return (appIdMatchArray === null || appIdMatchArray === void 0 ? void 0 : appIdMatchArray[1]) ?? '';
+  } else {
+    return null;
+  }
+}
+
 //# sourceMappingURL=getAndroidProject.ts.map

build/config/index.js

@@ -66,2 +66,3 @@ "use strict";
   }
+  const applicationId = buildGradlePath ? getApplicationId(buildGradlePath, packageName) : packageName;
   const mainActivity = (0, _getMainActivity.default)(manifestPath || '');
@@ -75,2 +76,3 @@ if (!mainActivity) {
     packageName,
+    applicationId,
     mainActivity,
@@ -82,2 +84,10 @@ dependencyConfiguration: userConfig.dependencyConfiguration,
 }
+function getApplicationId(buildGradlePath, packageName) {
+  let appId = packageName;
+  const applicationId = (0, _getAndroidProject.parseApplicationIdFromBuildGradleFile)(buildGradlePath);
+  if (applicationId) {
+    appId = applicationId;
+  }
+  return appId;
+}
 function getAppName(sourceDir, userConfigAppName) {
@@ -84,0 +94,0 @@ let appName = '';

package.json

 {
   "name": "@react-native-community/cli-platform-android",
-  "version": "12.0.0-alpha.11",
+  "version": "12.0.0-alpha.12",
   "license": "MIT",
@@ -10,3 +10,3 @@ "main": "build/index.js",
   "dependencies": {
-    "@react-native-community/cli-tools": "12.0.0-alpha.11",
+    "@react-native-community/cli-tools": "12.0.0-alpha.12",
     "chalk": "^4.1.2",
@@ -25,3 +25,3 @@ "execa": "^5.0.0",
   "devDependencies": {
-    "@react-native-community/cli-types": "12.0.0-alpha.11",
+    "@react-native-community/cli-types": "12.0.0-alpha.12",
     "@types/fs-extra": "^8.1.0",
@@ -36,3 +36,3 @@ "@types/glob": "^7.1.1"
   },
-  "gitHead": "079150994170816bb332293d3dd118e997651541"
+  "gitHead": "0c6372c631cea02e7fc5e12a9141e8cea4bb90ba"
 }

README.md

@@ -18,3 +18,3 @@ # @react-native-community/cli-platform-android
 ```sh
-react-native run-android [options]
+npx react-native run-android [options]
 ```
@@ -82,3 +82,3 @@
 ```sh
-react-native build-android [options]
+npx react-native build-android [options]
 ```
@@ -102,3 +102,3 @@
 ```sh
-react-native build-android --extra-params "-x lint -x test"
+npx react-native build-android --extra-params "-x lint -x test"
 ```
@@ -119,5 +119,5 @@
 ```sh
-react-native log-android
+npx react-native log-android
 ```
 
 Starts [`logkitty`](https://github.com/zamotany/logkitty) displaying pretty Android logs.

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

233005

increased by1.42%

Lines of code

2427

increased by1.13%

Dependency changes

• + Added@react-native-community/cli-tools@12.0.0-alpha.12(transitive)

• - Removed@react-native-community/cli-tools@12.0.0-alpha.11(transitive)

• Updated@react-native-community/cli-tools@12.0.0-alpha.12