@pi-r/android 0.5.3 → 0.5.5

package/LICENSE

@@ -1,4 +1,4 @@
-Copyright 2023 Haruhi Suzumiya
+Copyright 2024 An Pham
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

package/extensions/gradle/dependencies/index.js

@@ -28,6 +28,7 @@ function isUpgrade(version, pending) {
     return false;
 }
 function finalize(instance) {
+    var _a;
     const config = instance.config;
     const { profileable, dependencies, dataBinding, versionName, versionCode } = config;
     if (!profileable && !dependencies && !dataBinding && !versionName && !versionCode && !config.namespace) {
@@ -50,11 +51,12 @@ function finalize(instance) {
             const snapshot = hasScope('snapshot');
             const getData = () => data || (data = instance.findData('google-maven' + (snapshot ? '-snapshot' : '') + '.json', 'json'));
             const items = dependencies.map(item => {
+                var _a;
                 let [groupId, artifactId, version, type] = item.split(':');
                 if (!version || version === 'maven') {
                     const maven = getData();
                     let artifact;
-                    if (maven && (artifact = maven[groupId]?.find(child => child.artifactId === artifactId))) {
+                    if (maven && (artifact = (_a = maven[groupId]) === null || _a === void 0 ? void 0 : _a.find(child => child.artifactId === artifactId))) {
                         version = artifact.version;
                     }
                     else {
@@ -203,7 +205,7 @@ function finalize(instance) {
                     let dependency;
                     if (args || named) {
                         const [group, name, version] = item;
-                        dependency = kotlin ? `(group = "${group}", name = "${name}", version = "${version}")` : ` group: '${group}', name: '${name}', version: '${version}'` + (args?.endsWith(',') ? ',' : '');
+                        dependency = kotlin ? `(group = "${group}", name = "${name}", version = "${version}")` : ` group: '${group}', name: '${name}', version: '${version}'` + ((args === null || args === void 0 ? void 0 : args.endsWith(',')) ? ',' : '');
                     }
                     else {
                         dependency = item.slice(0, 3).join(':');
@@ -269,9 +271,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.24")}'` });
                     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.14")}'`, true);
                     if (upgrade) {
                         output = Document.updateGradle(output, ['android', 'kotlinOptions'], `jvmTarget = '${javaVersion}'`, true);
                     }
@@ -322,7 +324,7 @@ function finalize(instance) {
                     output = Document.updateGradle(output, ['android'], kotlin ? `buildToolsVersion = "${version}"` : `buildToolsVersion "${version}"`, true);
                 }
             }
-            if (namespace || (namespace = config.manifest?.package)) {
+            if (namespace || (namespace = (_a = config.manifest) === null || _a === void 0 ? void 0 : _a.package)) {
                 output = Document.updateGradle(output, ['android', 'defaultConfig'], (kotlin ? 'applicationId = ' : 'applicationId ') + `"${namespace}"`, true);
             }
             setModified(output);

package/extensions/gradle/settings/index.js

@@ -9,7 +9,7 @@ function finalize(instance) {
     }
     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;
+        let targetName = projectName === null || projectName === void 0 ? void 0 : projectName.replace(/"/g, '\\"'), modified;
         if (existing) {
             let match;
             if (dependencies) {
@@ -49,7 +49,7 @@ function finalize(instance) {
             }
         }
         else {
-            if (!targetName && (targetName = manifest?.package)) {
+            if (!targetName && (targetName = manifest === null || manifest === void 0 ? void 0 : manifest.package)) {
                 const index = targetName.lastIndexOf('.');
                 targetName = index !== -1 ? targetName.substring(index + 1) : '';
             }

package/extensions/task/index.js

@@ -7,6 +7,7 @@ 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) {
+    var _a, _b;
     const commands = instance.config.commands;
     if (!commands || this.incremental === 'staging') {
         return;
@@ -26,7 +27,7 @@ async function finalize(instance) {
     else {
         return;
     }
-    const settings = instance.settings.extensions?.task || {};
+    const settings = ((_a = instance.settings.extensions) === null || _a === void 0 ? void 0 : _a.task) || {};
     const exec = settings.exec;
     let { broadcastId, baseDirectory } = this, command = settings.command, uid, gid, title, filename, altname, foundDir;
     if (command) {
@@ -34,7 +35,7 @@ async function finalize(instance) {
             title = "maven";
         }
         else {
-            title = /([^\\/]+?)(?:\.[a-z]+)?$/i.exec(command)?.[1] || 'spawn';
+            title = ((_b = /([^\\/]+?)(?:\.[a-z]+)?$/i.exec(command)) === null || _b === void 0 ? void 0 : _b[1]) || 'spawn';
         }
         if (!/[\\/]/.test(command = path.normalize(command))) {
             filename = checkWin32(command);

package/index.js

@@ -165,13 +165,14 @@ class AndroidDocument extends Document {
         }
     }
     findTemplate(baseDir, filename, options) {
+        var _a;
         let detect, languageOf, subDir;
         if (options) {
             ({ detect, languageOf, subDir } = options);
         }
         let kotlin, language;
         if (languageOf) {
-            kotlin = (language = this.settings.language?.[languageOf]) === 'kotlin';
+            kotlin = (language = (_a = this.settings.language) === null || _a === void 0 ? void 0 : _a[languageOf]) === 'kotlin';
             const isKts = this.detectKts(baseDir, filename);
             detect = isKts !== null && (kotlin && isKts || !kotlin && !isKts);
             if (kotlin) {

package/package.json

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

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.24")
     implementation("androidx.core:core-ktx:1.12.0")
     testImplementation("junit:junit:4.13.2")
     androidTestImplementation("androidx.test.ext:junit:1.1.5")