Skip to content

Commit 8e756e1

Browse files
committed
Change method getting version from package.json
1 parent 77ac9aa commit 8e756e1

File tree

5 files changed

+51
-8
lines changed

5 files changed

+51
-8
lines changed

.idea/android-cli.iml

+12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

+16
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/modules.xml

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/watcherTasks.xml

+4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app.ts

+11-8
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,22 @@ import {GenerateController} from "./scripts/controllers/GenerateController";
66
import {MANIFAST_PATH} from "./scripts/constants/ManifestPath";
77
import {DependencyController} from "./scripts/controllers/DependencyController";
88
import {PackageManager} from "./scripts/utils/PackageManager";
9+
// import * as pkg from "./scripts/constants/Package";
10+
911

1012
const chalk = require('chalk'),
1113
figlet = require('figlet'),
12-
commander = require('commander');
14+
commander = require('commander'),
15+
pkg = require('./package.json');
1316

1417
commander.arguments('<name>')
15-
.version('0.0.1')
18+
.version(pkg.version)
1619
.option('-g, --generate [name]', 'component (e.g activity, fragment etc..)')
1720
.option('-p, --permission <permission>', 'add uses-permission to manifest file(e.g INTERNET)')
1821
.option('-d, --dependency <dependency>', 'add dependency to build.gradle and sync gradle')
1922
.action((name: string) => {
2023
if (commander.generate) {
21-
const generateManager: GenerateController = new GenerateController();
24+
const generateController: GenerateController = new GenerateController();
2225
console.log(chalk.yellow(`${changeCase.pascalCase(commander.generate)} will generated by Android CLI`));
2326
PackageManager.getApplicationPackage(packageName => {
2427
PackageManager.getPackages(packageName, packageList => {
@@ -29,7 +32,7 @@ commander.arguments('<name>')
2932
choices: packageList,
3033
}];
3134
inquirer.prompt(questions).then(answers => {
32-
generateManager.generateRenderedOutFile(commander.generate, name, answers.package);
35+
generateController.generateRenderedOutFile(commander.generate, name, answers.package);
3336
});
3437
})
3538
})
@@ -39,8 +42,8 @@ commander.arguments('<name>')
3942
presentInitialMessage();
4043

4144
if (commander.permission) {
42-
const permissionManager: PermissionController = new PermissionController();
43-
permissionManager.addPermissionToManifest(commander.permission, xml => {
45+
const permissionController: PermissionController = new PermissionController();
46+
permissionController.addPermissionToManifest(commander.permission, xml => {
4447
try {
4548
fs.writeFileSync(MANIFAST_PATH, xml);
4649
console.log(chalk.green(`Successful adding permission`));
@@ -50,8 +53,8 @@ if (commander.permission) {
5053
}
5154
});
5255
} else if (commander.dependency) {
53-
const dependencyManager: DependencyController = new DependencyController();
54-
dependencyManager.addDependency(commander.dependency, (code, stdout, stderr) => {
56+
const dependencyController: DependencyController = new DependencyController();
57+
dependencyController.addDependency(commander.dependency, (code, stdout, stderr) => {
5558
if (stderr) {
5659
console.log(chalk.red(`Complete with some error. Please check gradle sync result.`));
5760
} else {

0 commit comments

Comments
 (0)