@pi-r/android 0.10.2 → 0.11.0

package/extensions/app/manifest/index.js

@@ -151,17 +151,16 @@ function applyAttributes(target, keys) {
 }
 function finalize(instance) {
     const config = instance.config;
-    const manifest = config.manifest;
-    if (!manifest) {
+    if (!config.manifest) {
         return;
     }
     let { localUri, source, existing } = instance.findTemplate(path.join(this.baseDirectory, config.mainParentDir, config.mainSrcDir), "AndroidManifest.xml", { detect: instance.detect(this) });
     if (localUri && source && instance.canWrite(localUri, { ownPermissionOnly: true })) {
-        const application = manifest.application || {};
+        const application = config.manifest.application || {};
         const { supportsRtl, label, theme, activity, metaData = [], activityName, fontProvider } = application;
         const profileable = config.profileable;
         const applicationKeys = getValidKeys(instance, application, APPLICATION_ATTR);
-        const manifestKeys = getValidKeys(instance, manifest, MANIFEST_ATTR);
+        const manifestKeys = getValidKeys(instance, config.manifest, MANIFEST_ATTR);
         let modified = false;
         if (!existing) {
             source = (0, util_1.replaceAll)(source, (name) => {

package/extensions/gradle/dependencies/index.js

@@ -434,7 +434,7 @@ function finalize(instance) {
                     output = Document.updateGradle(output, ['android', 'buildFeatures'], 'compose = true');
                 }
                 else {
-                    const stdLib = instance.findVersion('org.jetbrains.kotlin:kotlin-stdlib', "2.2.0");
+                    const stdLib = instance.findVersion('org.jetbrains.kotlin:kotlin-stdlib', "2.2.20");
                     output = Document.updateGradle(output, ['plugins'], "id 'org.jetbrains.kotlin.android'", { upgrade: true, multiple: true, addendum: `version '${stdLib}'` });
                     output = Document.updateGradle(output, ['android', 'buildFeatures'], "compose true");
                     if (stdLib.startsWith('1.')) {
@@ -638,13 +638,13 @@ function finalize(instance) {
     }
     if (!existing) {
         const detect = instance.detect(this);
+        const projectDir = instance.resolveDir('project');
         const template = instance.findTemplate(this.baseDirectory, "build.gradle", { detect, languageOf: 'gradle', subDir: 'static' });
-        instance.writeTemplate(template, this);
         const properties = instance.findTemplate(this.baseDirectory, "gradle.properties", { detect, subDir: [instance.languageOf('gradle') || 'java', 'static'] });
+        instance.writeTemplate(template, this);
         instance.writeTemplate(properties, this);
-        try {
-            const projectDir = instance.resolveDir('project');
-            if (projectDir) {
+        if (projectDir) {
+            try {
                 (function recurse(subDir, targetDir) {
                     fs.readdirSync(subDir, { withFileTypes: true }).forEach(item => {
                         const srcName = path.join(subDir, item.name);
@@ -676,9 +676,9 @@ function finalize(instance) {
                     });
                 }).call(this, projectDir, './');
             }
-        }
-        catch (err) {
-            this.writeFail("Path not found", err, 32);
+            catch (err) {
+                this.writeFail("Path not found", err, 32);
+            }
         }
     }
 }

package/extensions/gradle/settings/index.js

@@ -15,10 +15,9 @@ function finalize(instance) {
             if (dependencies) {
                 found: {
                     const pattern = kotlin ? /^\s*include\(((?:\s*"[^"]+"\s*,?\s*)+)\)/gm : /^\s*include\s*((?:(?:"[^"]+"|'[^']+')\s*,?\s*)+)/gm;
-                    let match;
+                    let match, app;
                     while (match = pattern.exec(source)) {
                         const namespace = /":?([^"]+)"|':?([^']+)'/g;
-                        let app;
                         while (app = namespace.exec(match[1])) {
                             if (app[1] === mainParentDir || app[2] === mainParentDir) {
                                 break found;

package/extensions/task/index.js

@@ -100,22 +100,18 @@ async function finalize(instance) {
                 }
             })
                 .on('error', reject);
-            if (stdout) {
-                stdout.setEncoding('utf8').on('data', (value) => {
-                    if (broadcastId) {
-                        this.formatMessage(4, '', value, null, { sessionId: '' });
-                    }
-                    out += value;
-                });
-            }
-            if (stderr) {
-                stderr.setEncoding('utf8').on('data', (value) => {
-                    if (broadcastId) {
-                        this.formatMessage(2, '', value, null, { sessionId: '' });
-                    }
-                    message += value;
-                });
-            }
+            stdout?.setEncoding('utf8').on('data', (value) => {
+                if (broadcastId) {
+                    this.formatMessage(4, '', value, null, { sessionId: '' });
+                }
+                out += value;
+            });
+            stderr?.setEncoding('utf8').on('data', (value) => {
+                if (broadcastId) {
+                    this.formatMessage(2, '', value, null, { sessionId: '' });
+                }
+                message += value;
+            });
         })
             .catch((err) => {
             instance.writeFail(["Unable to perform task", command + ' ' + task], err, { type: 4, startTime });

package/index.js

@@ -4,6 +4,7 @@ const path = require("node:path");
 const types_1 = require("@e-mc/types");
 const Document = require('@e-mc/document');
 const kAndroid = Symbol.for('android:constructor');
+const sanitizePath = (value) => Document.PLATFORM_WIN32 ? value.replace(/^\.?[\\/]+/, '').replace(/[\\/]+$/, '') : value.replace(/^\.?\/+/, '').replace(/\/+$/, '');
 class AndroidDocument extends Document {
     static [kAndroid] = true;
     static async finalize(instance) {
@@ -72,10 +73,10 @@ class AndroidDocument extends Document {
                 target.applicationId = applicationId;
             }
             if (mainParentDir) {
-                target.mainParentDir = mainParentDir;
+                target.mainParentDir = sanitizePath(mainParentDir);
             }
             if (mainSrcDir) {
-                target.mainSrcDir = mainSrcDir;
+                target.mainSrcDir = sanitizePath(mainSrcDir);
             }
             if (mainActivityFile) {
                 target.mainActivityFile = mainActivityFile;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/android",
-  "version": "0.10.2",
+  "version": "0.11.0",
   "description": "Android document constructor for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -20,8 +20,8 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@e-mc/document": "^0.12.5",
-    "@e-mc/types": "^0.12.5",
+    "@e-mc/document": "^0.13.0",
+    "@e-mc/types": "^0.13.0",
     "dom-serializer": "^2.0.0",
     "domhandler": "^5.0.3",
     "domutils": "^3.2.2",

package/project/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

package/template/java/build.gradle

@@ -34,6 +34,6 @@ android {
 
 dependencies {
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.2.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
+    androidTestImplementation 'androidx.test.ext:junit:1.3.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.7.0'
 }

package/template/java/settings.gradle

@@ -1,18 +1,18 @@
-pluginManagement {
-    repositories {
-        google()
-        mavenCentral()
-        gradlePluginPortal()
-    }
-}
-
-dependencyResolutionManagement {
-    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
-    repositories {
-        google()
-        mavenCentral()
-    }
-}
-
-rootProject.name = '{{projectName}}'
+pluginManagement {
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
+
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    repositories {
+        google()
+        mavenCentral()
+    }
+}
+
+rootProject.name = '{{projectName}}'
 include '{{name}}'

package/template/java/static/build.gradle

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

package/template/java+kotlin/libs.versions.toml

@@ -1,10 +1,10 @@
 [versions]
-agp = "8.12.0"
-kotlin = "2.2.0"
-coreKtx = "1.16.0"
+agp = "8.13.0"
+kotlin = "2.2.20"
+coreKtx = "1.17.0"
 junit = "4.13.2"
-junitVersion = "1.2.1"
-espressoCore = "3.6.1"
+junitVersion = "1.3.0"
+espressoCore = "3.7.0"
 
 [libraries]
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }

package/template/kotlin/libs.versions.toml

@@ -1,12 +1,12 @@
 [versions]
-agp = "8.12.0"
-kotlin = "2.2.0"
-coreKtx = "1.16.0"
+agp = "8.13.0"
+kotlin = "2.2.20"
+coreKtx = "1.17.0"
 junit = "4.13.2"
-junitVersion = "1.2.1"
-espressoCore = "3.6.1"
+junitVersion = "1.3.0"
+espressoCore = "3.7.0"
 appcompat = "1.7.1"
-material = "1.12.0"
+material = "1.13.0"
 constraintlayout = "2.2.1"
 
 [libraries]