@pi-r/android 0.3.2 → 0.3.4

package/LICENSE

@@ -1,4 +1,4 @@
-Copyright 2023 Studio Trigger
+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/README.md

@@ -1,6 +1,6 @@
 # @pi-r/android
 
-PEP 402 - Forever Aina
+PEP 402 - Forever
 
 ## LICENSE
 

package/extensions/app/manifest/index.js

@@ -1,5 +1,4 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
 const path = require("path");
 const htmlparser2 = require("htmlparser2");
 const domhandler = require("domhandler");
@@ -179,9 +178,5 @@ function finalize(instance) {
         }
     }
 }
-exports.default = finalize;
 
-if (exports.default) {
-    module.exports = exports.default;
-    module.exports.default = exports.default;
-}
+module.exports = finalize;

package/extensions/gradle/dependencies/index.js

@@ -1,10 +1,10 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
 const path = require("path");
 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) {
@@ -97,9 +97,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.0")}'` });
+                    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, ['android', 'buildFeatures'], "compose true");
-                    output = Document.updateGradle(output, ['android', 'composeOptions'], `kotlinCompilerExtensionVersion '${instance.findVersion('kotlinCompilerExtensionVersion', "1.5.0")}'`, true);
+                    output = Document.updateGradle(output, ['android', 'composeOptions'], `kotlinCompilerExtensionVersion '${instance.findVersion('kotlinCompilerExtensionVersion', "1.5.9")}'`, true);
                     if (upgrade) {
                         output = Document.updateGradle(output, ['android', 'kotlinOptions'], `jvmTarget = '${javaVersion}'`, true);
                     }
@@ -150,7 +150,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);
@@ -215,9 +215,5 @@ function finalize(instance) {
         }
     }
 }
-exports.default = finalize;
 
-if (exports.default) {
-    module.exports = exports.default;
-    module.exports.default = exports.default;
-}
+module.exports = finalize;

package/extensions/gradle/settings/index.js

@@ -1,5 +1,4 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
 const path = require("path");
 const util_1 = require("@e-mc/document/util");
 const parse_1 = require("@e-mc/document/parse");
@@ -10,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) {
@@ -50,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) : '';
             }
@@ -77,9 +76,5 @@ function finalize(instance) {
         }
     }
 }
-exports.default = finalize;
 
-if (exports.default) {
-    module.exports = exports.default;
-    module.exports.default = exports.default;
-}
+module.exports = finalize;

package/extensions/task/index.js

@@ -1,11 +1,11 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
 const path = require("path");
 const fs = require("fs");
 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;
     const commands = instance.config.commands;
     if (!commands || this.incremental === 'staging') {
         return;
@@ -25,7 +25,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, name, foundCwd;
     if (command) {
@@ -33,7 +33,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';
         }
         command = path.normalize(command);
         if (!command.includes(path.sep)) {
@@ -113,9 +113,5 @@ async function finalize(instance) {
             .catch(err => instance.writeFail(["Unable to perform task", command + ' ' + task], err, { type: 4, startTime }));
     }
 }
-exports.default = finalize;
 
-if (exports.default) {
-    module.exports = exports.default;
-    module.exports.default = exports.default;
-}
+module.exports = finalize;

package/index.js

@@ -1,5 +1,4 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs");
 const path = require("path");
 const types_1 = require("@e-mc/types");
@@ -162,13 +161,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) {
@@ -216,9 +216,5 @@ class AndroidDocument extends Document {
         return (_a = this.module).settings || (_a.settings = {});
     }
 }
-exports.default = AndroidDocument;
 
-if (exports.default) {
-    module.exports = exports.default;
-    module.exports.default = exports.default;
-}
+module.exports = AndroidDocument;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/android",
-  "version": "0.3.2",
+  "version": "0.3.4",
   "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.6.1",
-    "@e-mc/types": "^0.6.1",
+    "@e-mc/document": "^0.6.3",
+    "@e-mc/types": "^0.6.3",
     "htmlparser2": "^9.0.0"
   }
 }

package/template/java/static/build.gradle

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

package/template/java+kotlin/build.gradle

@@ -37,7 +37,7 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.core:core-ktx:1.10.1'
+    implementation 'androidx.core:core-ktx:1.12.0'
     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.1.0' apply false
-    id 'com.android.library' version '8.1.0' apply false
-    id 'org.jetbrains.kotlin.android' version '1.9.0' apply false
+    id 'com.android.application' version '8.2.0' apply false
+    id 'com.android.library' version '8.2.0' apply false
+    id 'org.jetbrains.kotlin.android' version '1.9.22' apply false
 }

package/template/kotlin/build.gradle.kts

@@ -38,8 +38,8 @@ java {
 }
 
 dependencies {
-    implementation("org.jetbrains.kotlin:kotlin-stdlib:1.9.0")
-    implementation("androidx.core:core-ktx:1.10.1")
+    implementation("org.jetbrains.kotlin:kotlin-stdlib:1.9.22")
+    implementation("androidx.core:core-ktx:1.12.0")
     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.1.0" apply false
-    id("com.android.library") version "8.1.0" apply false
-    id("org.jetbrains.kotlin.android") version "1.9.0" apply false
+    id("com.android.application") version "8.2.0" apply false
+    id("com.android.library") version "8.2.0" apply false
+    id("org.jetbrains.kotlin.android") version "1.9.22" apply false
 }