@pi-r/android 0.2.10 → 0.2.12

package/extensions/gradle/dependencies/index.js

@@ -4,6 +4,7 @@ const util_1 = require("@e-mc/document/util");
 const types_1 = require("@e-mc/types");
 const Document = require("@e-mc/document");
 function finalize(instance) {
+    var _a;
     const config = instance.config;
     const { profileable, dependencies, dataBinding, versionName, versionCode } = config;
     if (!profileable && !dependencies && !dataBinding && !versionName && !versionCode && !config.namespace) {
@@ -95,9 +96,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);
                     }
@@ -148,7 +149,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/task/index.js

@@ -5,6 +5,7 @@ const child_process = require("child_process");
 const types_1 = require("@e-mc/types");
 const Document = require("@e-mc/document");
 async function finalize(instance) {
+    var _a, _b, _c;
     const commands = instance.config.commands;
     if (!commands || this.incremental === 'staging') {
         return;
@@ -24,13 +25,13 @@ async function finalize(instance) {
     else {
         return;
     }
-    let { broadcastId, baseDirectory } = this, command = instance.settings.extensions?.task?.command, title, name, foundCwd;
+    let { broadcastId, baseDirectory } = this, command = (_b = (_a = instance.settings.extensions) === null || _a === void 0 ? void 0 : _a.task) === null || _b === void 0 ? void 0 : _b.command, title, name, foundCwd;
     if (command) {
         if (command.indexOf('mvn') !== -1) {
             title = 'maven';
         }
         else {
-            title = /([^\\/]+?)(?:\.[a-z]+)?$/i.exec(command)?.[1] || 'SPAWN';
+            title = ((_c = /([^\\/]+?)(?:\.[a-z]+)?$/i.exec(command)) === null || _c === void 0 ? void 0 : _c[1]) || 'SPAWN';
         }
         command = path.normalize(command);
         if (!command.includes(path.sep)) {

package/index.js

@@ -161,13 +161,14 @@ class AndroidDocument extends Document {
         }
     }
     findTemplate(baseDir, filename, options) {
+        var _a;
         let detect, languageOf;
         if (options) {
             ({ detect, languageOf } = 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.2.10",
+  "version": "0.2.12",
   "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.5.6",
-    "@e-mc/types": "^0.5.6",
-    "htmlparser2": "^9.0.0"
+    "@e-mc/document": "^0.5.10",
+    "@e-mc/types": "^0.5.10",
+    "htmlparser2": "^9.1.0"
   }
 }

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")