@pi-r/android 0.6.5 → 0.6.6

package/extensions/app/manifest/index.js

@@ -8,7 +8,7 @@ const util_1 = require("@e-mc/document/util");
 const types_1 = require("@e-mc/types");
 const Parser = htmlparser2.Parser;
 const DomHandler = domhandler.DomHandler;
-function finalize(instance) {
+module.exports = function finalize(instance) {
     const config = instance.config;
     if (!config.manifest) {
         return;
@@ -176,6 +176,4 @@ function finalize(instance) {
             }
         }
     }
-}
-
-module.exports = finalize;
+};

package/extensions/gradle/dependencies/index.js

@@ -27,16 +27,17 @@ function isUpgrade(version, pending) {
     }
     return false;
 }
-function finalize(instance) {
+module.exports = function finalize(instance) {
     const config = instance.config;
-    const { profileable, dependencies, dataBinding, versionName, versionCode } = config;
-    if (!profileable && !dependencies && !dataBinding && !versionName && !versionCode && !config.namespace) {
+    const { profileable, dependencies, dataBinding, versionName, versionCode, namespace } = config;
+    if (!profileable && !dependencies && !dataBinding && !versionName && !versionCode && !namespace) {
         return;
     }
     const detect = this.incremental !== 'staging';
     let { localUri, source, existing, kotlin } = instance.findTemplate(path.join(this.baseDirectory, config.mainParentDir), "build.gradle", { detect, languageOf: 'gradle' });
     if (localUri && source && instance.canWrite(localUri, { ownPermissionOnly: true })) {
-        let { namespace, javaVersion, dependencyScopes } = config, jvmTarget, modified;
+        const { javaVersion, dependencyScopes } = config;
+        let jvmTarget, modified;
         const upgrade = javaVersion > 0;
         const setModified = (output) => {
             if (output !== source) {
@@ -263,9 +264,9 @@ 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.22")}'` });
+                    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, ['android', 'buildFeatures'], "compose true");
-                    output = Document.updateGradle(output, ['android', 'composeOptions'], `kotlinCompilerExtensionVersion '${instance.findVersion('kotlinCompilerExtensionVersion', "1.5.9")}'`, true);
+                    output = Document.updateGradle(output, ['android', 'composeOptions'], `kotlinCompilerExtensionVersion '${instance.findVersion('kotlinCompilerExtensionVersion', "1.5.11")}'`, true);
                     if (upgrade) {
                         output = Document.updateGradle(output, ['android', 'kotlinOptions'], `jvmTarget = '${javaVersion}'`, true);
                     }
@@ -316,8 +317,9 @@ function finalize(instance) {
                     output = Document.updateGradle(output, ['android'], kotlin ? `buildToolsVersion = "${version}"` : `buildToolsVersion "${version}"`, true);
                 }
             }
-            if (namespace || (namespace = config.manifest?.package)) {
-                output = Document.updateGradle(output, ['android', 'defaultConfig'], (kotlin ? 'applicationId = ' : 'applicationId ') + `"${namespace}"`, true);
+            const applicationId = config.manifest?.package;
+            if (applicationId) {
+                output = Document.updateGradle(output, ['android', 'defaultConfig'], (kotlin ? 'applicationId = ' : 'applicationId ') + `"${applicationId}"`, true);
             }
             setModified(output);
         }
@@ -380,6 +382,4 @@ function finalize(instance) {
             }
         }
     }
-}
-
-module.exports = finalize;
+};

package/extensions/gradle/settings/index.js

@@ -2,14 +2,15 @@
 const path = require("path");
 const util_1 = require("@e-mc/document/util");
 const parse_1 = require("@e-mc/document/parse");
-function finalize(instance) {
-    const { dependencies, projectName, manifest, mainParentDir } = instance.config;
+module.exports = function finalize(instance) {
+    const { dependencies, projectName, mainParentDir } = instance.config;
     if (!dependencies && !projectName) {
         return;
     }
     let { localUri, source, existing, kotlin } = instance.findTemplate(this.baseDirectory, "settings.gradle", { detect: this.incremental !== 'staging', languageOf: 'gradle' });
     if (localUri && source && instance.canWrite(localUri, { ownPermissionOnly: true })) {
-        let targetName = projectName?.replace(/"/g, '\\"'), modified;
+        const targetName = projectName?.replace(/"/g, '\\"');
+        let modified;
         if (existing) {
             let match;
             if (dependencies) {
@@ -49,10 +50,6 @@ function finalize(instance) {
             }
         }
         else {
-            if (!targetName && (targetName = manifest?.package)) {
-                const index = targetName.lastIndexOf('.');
-                targetName = index !== -1 ? targetName.substring(index + 1) : '';
-            }
             source = (0, util_1.replaceAll)(source, (name) => {
                 switch (name) {
                     case 'projectName':
@@ -63,6 +60,9 @@ function finalize(instance) {
                         return '';
                 }
             });
+            if (!targetName) {
+                source = source.replace(/rootProject\.name = ["']{2}[\r\n]*/, '');
+            }
         }
         if (modified || !existing) {
             try {
@@ -75,6 +75,4 @@ function finalize(instance) {
             }
         }
     }
-}
-
-module.exports = finalize;
+};

package/extensions/task/index.js

@@ -6,7 +6,7 @@ const which = require("which");
 const types_1 = require("@e-mc/types");
 const Document = require("@e-mc/document");
 const checkWin32 = (value) => value === "gradlew" && process.platform === 'win32' ? value + '.bat' : value;
-async function finalize(instance) {
+module.exports = async function finalize(instance) {
     const commands = instance.config.commands;
     if (!commands || this.incremental === 'staging') {
         return;
@@ -119,6 +119,4 @@ async function finalize(instance) {
         })
             .catch(err => instance.writeFail(["Unable to perform task", command + ' ' + task], err, { type: 4, startTime }));
     }
-}
-
-module.exports = finalize;
+};

package/index.js

@@ -231,5 +231,4 @@ class AndroidDocument extends Document {
         return (_a = this.module).settings || (_a.settings = {});
     }
 }
-
 module.exports = AndroidDocument;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/android",
-  "version": "0.6.5",
+  "version": "0.6.6",
   "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.8.6",
-    "@e-mc/types": "^0.8.6",
+    "@e-mc/document": "^0.8.7",
+    "@e-mc/types": "^0.8.7",
     "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.2.2' apply false
-    id 'com.android.library' version '8.2.2' apply false
+    id 'com.android.application' version '8.3.0' apply false
+    id 'com.android.library' version '8.3.0' apply false
 }

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

@@ -1,5 +1,5 @@
 plugins {
-    id 'com.android.application' version '8.2.2' apply false
-    id 'com.android.library' version '8.2.2' apply false
-    id 'org.jetbrains.kotlin.android' version '1.9.22' apply false
+    id 'com.android.application' version '8.3.0' apply false
+    id 'com.android.library' version '8.3.0' apply false
+    id 'org.jetbrains.kotlin.android' version '1.9.23' apply false
 }

package/template/kotlin/build.gradle.kts

@@ -38,7 +38,7 @@ java {
 }
 
 dependencies {
-    implementation("org.jetbrains.kotlin:kotlin-stdlib:1.9.22")
+    implementation("org.jetbrains.kotlin:kotlin-stdlib:1.9.23")
     implementation("androidx.core:core-ktx:1.12.0")
     testImplementation("junit:junit:4.13.2")
     androidTestImplementation("androidx.test.ext:junit:1.1.5")

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

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