@pi-r/android 0.7.0 → 0.7.2

package/extensions/app/manifest/index.js

@@ -77,35 +77,33 @@ module.exports = function finalize(instance) {
                             }
                         }
                     }
-                    if (activity) {
-                        for (const name in activity) {
-                            const { layout: attribs } = activity[name];
-                            if (attribs) {
-                                let element = domutils.findOne(elem => elem.attribs['android:name'] === name, activities);
-                                if (!element) {
-                                    domutils.appendChild(target, element = new domhandler.Element('activity', { 'android:name': name }));
-                                    domutils.append(element, new domhandler.Text('\n'));
-                                }
-                                let layout = domutils.findOne(elem => elem.tagName === 'layout', [element]), found = true;
-                                if (!layout) {
-                                    domutils.appendChild(element, layout = new domhandler.Element('layout', {}));
-                                    domutils.append(layout, new domhandler.Text('\n'));
-                                    found = false;
-                                }
-                                for (const attr in attribs) {
-                                    switch (attr) {
-                                        case 'defaultHeight':
-                                        case 'defaultWidth':
-                                        case 'minHeight':
-                                        case 'minWidth':
-                                        case 'gravity': {
-                                            const value = attribs[attr];
-                                            if (!found || layout.attribs['android:' + attr] !== value) {
-                                                layout.attribs['android:' + attr] = value;
-                                                modified = true;
-                                            }
-                                            break;
+                    for (const name in activity) {
+                        const { layout: attribs } = activity[name];
+                        if (attribs) {
+                            let element = domutils.findOne(elem => elem.attribs['android:name'] === name, activities);
+                            if (!element) {
+                                domutils.appendChild(target, element = new domhandler.Element('activity', { 'android:name': name }));
+                                domutils.append(element, new domhandler.Text('\n'));
+                            }
+                            let layout = domutils.findOne(elem => elem.tagName === 'layout', [element]), found = true;
+                            if (!layout) {
+                                domutils.appendChild(element, layout = new domhandler.Element('layout', {}));
+                                domutils.append(layout, new domhandler.Text('\n'));
+                                found = false;
+                            }
+                            for (const attr in attribs) {
+                                switch (attr) {
+                                    case 'defaultHeight':
+                                    case 'defaultWidth':
+                                    case 'minHeight':
+                                    case 'minWidth':
+                                    case 'gravity': {
+                                        const value = attribs[attr];
+                                        if (!found || layout.attribs['android:' + attr] !== value) {
+                                            layout.attribs['android:' + attr] = value;
+                                            modified = true;
                                         }
+                                        break;
                                     }
                                 }
                             }

package/extensions/gradle/dependencies/index.js

@@ -28,15 +28,14 @@ function isUpgrade(version, pending) {
     return false;
 }
 module.exports = function finalize(instance) {
-    const config = instance.config;
-    const { profileable, dependencies, dataBinding, versionName, versionCode, namespace, applicationId } = config;
+    const { profileable, dependencies, dataBinding, versionName, versionCode, namespace, applicationId, mainParentDir } = instance.config;
     if (!profileable && !dependencies && !dataBinding && !versionName && !versionCode && !namespace && !applicationId) {
         return;
     }
-    const detect = this.incremental !== 'staging';
-    let { localUri, source, existing, kotlin } = instance.findTemplate(path.join(this.baseDirectory, config.mainParentDir), "build.gradle", { detect, languageOf: 'gradle' });
+    const options = { detect: this.incremental !== 'staging', languageOf: 'gradle' };
+    let { localUri, source, existing, kotlin } = instance.findTemplate(path.join(this.baseDirectory, mainParentDir), "build.gradle", options);
     if (localUri && source && instance.canWrite(localUri, { ownPermissionOnly: true })) {
-        const { javaVersion, dependencyScopes } = config;
+        const { javaVersion, dependencyScopes } = instance.config;
         let jvmTarget, modified;
         const upgrade = javaVersion > 0;
         const setModified = (output) => {
@@ -264,9 +263,9 @@ module.exports = function finalize(instance) {
                     output = Document.updateGradle(output, ['android', 'buildFeatures'], 'compose = true');
                 }
                 else {
-                    output = Document.updateGradle(output, ['plugins'], "id 'org.jetbrains.kotlin.android'", { upgrade: true, multiple: true, addendum: `version '${instance.findVersion('org.jetbrains.kotlin:kotlin-stdlib', "1.9.23")}'` });
+                    output = Document.updateGradle(output, ['plugins'], "id 'org.jetbrains.kotlin.android'", { upgrade: true, multiple: true, addendum: `version '${instance.findVersion('org.jetbrains.kotlin:kotlin-stdlib', "1.9.24")}'` });
                     output = Document.updateGradle(output, ['android', 'buildFeatures'], "compose true");
-                    output = Document.updateGradle(output, ['android', 'composeOptions'], `kotlinCompilerExtensionVersion '${instance.findVersion('kotlinCompilerExtensionVersion', "1.5.12")}'`, true);
+                    output = Document.updateGradle(output, ['android', 'composeOptions'], `kotlinCompilerExtensionVersion '${instance.findVersion('kotlinCompilerExtensionVersion', "1.5.14")}'`, true);
                     if (upgrade) {
                         output = Document.updateGradle(output, ['android', 'kotlinOptions'], `jvmTarget = '${javaVersion}'`, true);
                     }
@@ -373,7 +372,7 @@ module.exports = function finalize(instance) {
         }
     }
     if (!existing) {
-        ({ localUri, source, existing, kotlin } = instance.findTemplate(this.baseDirectory, "build.gradle", { detect, languageOf: 'gradle', subDir: 'static' }));
+        ({ localUri, source, existing, kotlin } = instance.findTemplate(this.baseDirectory, "build.gradle", { ...options, subDir: 'static' }));
         if (localUri && source && instance.canWrite(localUri, { ownPermissionOnly: true })) {
             try {
                 if (instance.writeFile(localUri, source, { encoding: 'utf-8', ownPermissionOnly: true, throwsPermission: true })) {

package/extensions/task/index.js

@@ -20,7 +20,7 @@ module.exports = async function finalize(instance) {
             taskArgs = [commands];
         }
         else {
-            taskArgs = commands.map(value => typeof value === 'string' ? [value] : value);
+            taskArgs = commands.map(value => Array.isArray(value) ? value : [value]);
         }
     }
     else {
@@ -81,7 +81,7 @@ module.exports = async function finalize(instance) {
     }
     for (const args of taskArgs) {
         if (instance.aborted) {
-            return Promise.reject((0, types_1.createAbortError)());
+            return (0, types_1.createAbortError)(true);
         }
         const startTime = process.hrtime();
         const task = args.join(' ');

package/index.js

@@ -6,7 +6,7 @@ const Document = require('@e-mc/document');
 class AndroidDocument extends Document {
     static async finalize(instance) {
         if (instance.aborted) {
-            return Promise.reject((0, types_1.createAbortError)());
+            return (0, types_1.createAbortError)(true);
         }
         if (instance.extensions.length) {
             const config = instance.config;
@@ -131,7 +131,7 @@ class AndroidDocument extends Document {
     }
     async using(data) {
         if (this.aborted) {
-            return Promise.reject((0, types_1.createAbortError)());
+            return (0, types_1.createAbortError)(true);
         }
         const { host, file } = data;
         const localUri = file.localUri;
@@ -177,8 +177,16 @@ class AndroidDocument extends Document {
         let kotlin, language;
         if (languageOf) {
             kotlin = (language = this.settings.language?.[languageOf]) === 'kotlin';
-            const isKts = this.detectKts(baseDir, filename);
-            detect = isKts !== null && (kotlin && isKts || !kotlin && !isKts);
+            if (detect !== false) {
+                const isKts = this.detectKts(baseDir, filename);
+                if (isKts && language === 'java') {
+                    kotlin = true;
+                    detect = true;
+                }
+                else {
+                    detect = typeof isKts === 'boolean' && (kotlin && isKts || !kotlin && !isKts);
+                }
+            }
             if (kotlin) {
                 filename += '.kts';
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/android",
-  "version": "0.7.0",
+  "version": "0.7.2",
   "description": "Android document constructor for E-mc.",
   "main": "index.js",
   "publishConfig": {
@@ -20,8 +20,8 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@e-mc/document": "^0.9.0",
-    "@e-mc/types": "^0.9.0",
+    "@e-mc/document": "^0.9.4",
+    "@e-mc/types": "^0.9.4",
     "htmlparser2": "^9.1.0",
     "which": "^2.0.2"
   }

package/template/java/static/build.gradle

@@ -1,4 +1,4 @@
 plugins {
-    id 'com.android.application' version '8.3.2' apply false
-    id 'com.android.library' version '8.3.2' apply false
+    id 'com.android.application' version '8.4.0' apply false
+    id 'com.android.library' version '8.4.0' apply false
 }

package/template/java+kotlin/build.gradle

@@ -37,7 +37,7 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.core:core-ktx:1.13.0'
+    implementation 'androidx.core:core-ktx:1.13.1'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'

package/template/java+kotlin/static/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'com.android.application' version '8.3.2' apply false
-    id 'com.android.library' version '8.3.2' apply false
-    id 'org.jetbrains.kotlin.android' version '1.9.23' apply false
+    id 'com.android.application' version '8.4.0' apply false
+    id 'com.android.library' version '8.4.0' apply false
+    id 'org.jetbrains.kotlin.android' version '1.9.24' apply false
 }

package/template/kotlin/build.gradle.kts

@@ -38,8 +38,8 @@ java {
 }
 
 dependencies {
-    implementation("org.jetbrains.kotlin:kotlin-stdlib:1.9.23")
-    implementation("androidx.core:core-ktx:1.13.0")
+    implementation("org.jetbrains.kotlin:kotlin-stdlib:1.9.24")
+    implementation("androidx.core:core-ktx:1.13.1")
     testImplementation("junit:junit:4.13.2")
     androidTestImplementation("androidx.test.ext:junit:1.1.5")
     androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")

package/template/kotlin/static/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("com.android.application") version "8.3.2" apply false
-    id("com.android.library") version "8.3.2" apply false
-    id("org.jetbrains.kotlin.android") version "1.9.23" apply false
+    id("com.android.application") version "8.4.0" apply false
+    id("com.android.library") version "8.4.0" apply false
+    id("org.jetbrains.kotlin.android") version "1.9.24" apply false
 }