droid-cli 1.7.2 → 1.7.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"android-project.d.ts","sourceRoot":"","sources":["../../src/core/android-project.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACxC,gBAAgB,EAAE,OAAO,CAAC;IAC1B,iBAAiB,EAAE,MAAM,CAAC;CAC3B;AAED,qBAAa,cAAc;IACzB,OAAO,CAAC,WAAW,CAAmC;WAEzC,MAAM,CAAC,SAAS,GAAE,MAAsB,GAAG,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC;YAmBxE,eAAe;IAoC7B,OAAO,CAAC,kBAAkB;IAM1B,OAAO,CAAC,+BAA+B;
|
|
1
|
+
{"version":3,"file":"android-project.d.ts","sourceRoot":"","sources":["../../src/core/android-project.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACxC,gBAAgB,EAAE,OAAO,CAAC;IAC1B,iBAAiB,EAAE,MAAM,CAAC;CAC3B;AAED,qBAAa,cAAc;IACzB,OAAO,CAAC,WAAW,CAAmC;WAEzC,MAAM,CAAC,SAAS,GAAE,MAAsB,GAAG,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC;YAmBxE,eAAe;IAoC7B,OAAO,CAAC,kBAAkB;IAM1B,OAAO,CAAC,+BAA+B;IAiEvC,OAAO,IAAI,kBAAkB,GAAG,IAAI;IAIpC,WAAW,IAAI,MAAM;IAIrB,UAAU,IAAI,MAAM;IAIpB,cAAc,IAAI,MAAM;IAIxB,wBAAwB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM;IAejD,gBAAgB,IAAI,MAAM,EAAE;IAI5B,gBAAgB,IAAI,OAAO;IAI3B,oBAAoB,IAAI,MAAM;IAI9B,gBAAgB,IAAI,MAAM;IAOpB,UAAU,CAAC,OAAO,GAAE,MAAgB,GAAG,OAAO,CAAC,MAAM,CAAC;CAe7D"}
|
|
@@ -112,8 +112,9 @@ class AndroidProject {
|
|
|
112
112
|
// Save previous variant if exists
|
|
113
113
|
if (currentVariant && currentContent) {
|
|
114
114
|
variants.push(currentVariant);
|
|
115
|
-
//
|
|
116
|
-
const
|
|
115
|
+
// Strip single-line comments before matching (handles "// applicationIdSuffix")
|
|
116
|
+
const contentWithoutComments = currentContent.replace(/\/\/.*$/gm, '');
|
|
117
|
+
const suffixMatch = contentWithoutComments.match(/applicationIdSuffix\s+['"](.*?)['"]/);
|
|
117
118
|
if (suffixMatch) {
|
|
118
119
|
suffixes[currentVariant] = suffixMatch[1];
|
|
119
120
|
}
|
|
@@ -130,7 +131,8 @@ class AndroidProject {
|
|
|
130
131
|
// Don't forget the last variant
|
|
131
132
|
if (currentVariant && currentContent) {
|
|
132
133
|
variants.push(currentVariant);
|
|
133
|
-
const
|
|
134
|
+
const contentWithoutComments = currentContent.replace(/\/\/.*$/gm, '');
|
|
135
|
+
const suffixMatch = contentWithoutComments.match(/applicationIdSuffix\s+['"](.*?)['"]/);
|
|
134
136
|
if (suffixMatch) {
|
|
135
137
|
suffixes[currentVariant] = suffixMatch[1];
|
|
136
138
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"android-project.js","sourceRoot":"","sources":["../../src/core/android-project.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAA+B;AAC/B,2CAA6B;AAC7B,yCAAsC;AACtC,oDAAiD;AAYjD,MAAa,cAAc;IAA3B;QACU,gBAAW,GAA8B,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"android-project.js","sourceRoot":"","sources":["../../src/core/android-project.ts"],"names":[],"mappings":"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"}
|