Skip to content

Commit 216a83d

Browse files
committed
chore: fix git rebase error
1 parent 4040bf4 commit 216a83d

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

lib/services/android-project-service.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -660,7 +660,7 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
660660
private validatePackageName(packageName: string): void {
661661
//Make the package conform to Java package types
662662
//Enforce underscore limitation
663-
if (!/^[a - zA - Z] + (\.[a - zA - Z0 - 9][a - zA - Z0 - 9_]*)+$ /.test(packageName)) {
663+
if (!/^[a-zA-Z]+(\.[a-zA-Z0-9][a-zA-Z0-9_]*)+$/.test(packageName)) {
664664
this.$errors.fail("Package name must look like: com.company.Name");
665665
}
666666

@@ -676,7 +676,7 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
676676
}
677677

678678
//Classes in Java don't begin with numbers
679-
if (/^[0 - 9] /.test(projectName)) {
679+
if (/^[0-9]/.test(projectName)) {
680680
this.$errors.fail("Project name must not begin with a number");
681681
}
682682
}
@@ -780,8 +780,9 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
780780
const valuesDirRegExp = /^values/;
781781
if (this.$fs.exists(resourcesDirPath)) {
782782
const resourcesDirs = this.$fs.readDirectory(resourcesDirPath).filter(resDir => !resDir.match(valuesDirRegExp));
783+
const appResourcesDestinationDirectoryPath = this.getAppResourcesDestinationDirectoryPath(projectData);
783784
_.each(resourcesDirs, resourceDir => {
784-
this.$fs.deleteDirectory(path.join(this.getAppResourcesDestinationDirectoryPath(projectData), resourceDir));
785+
this.$fs.deleteDirectory(path.join(appResourcesDestinationDirectoryPath, resourceDir));
785786
});
786787
}
787788
}

0 commit comments

Comments
 (0)