@pi-r/android 0.10.0 → 0.10.2

package/extensions/app/manifest/index.js

@@ -8,7 +8,147 @@ const types_1 = require("@e-mc/types");
 const util_1 = require("@e-mc/document/util");
 const Parser = htmlparser2.Parser;
 const DomHandler = domhandler.DomHandler;
-const MANIFEST_ATTR = ['package', 'android:sharedUserId', 'android:sharedUserLabel', 'android:sharedUserMaxSdkVersion', 'android:versionCode', 'android:versionName', 'android:installLocation'];
+const MANIFEST_ATTR = [
+    'package',
+    'android:sharedUserId',
+    'android:sharedUserLabel',
+    'android:sharedUserMaxSdkVersion',
+    'android:versionCode',
+    'android:versionName',
+    'android:installLocation'
+];
+const APPLICATION_ATTR = [
+    'android:allowTaskReparenting',
+    'android:allowBackup',
+    'android:allowClearUserData',
+    'android:allowNativeHeapPointerTagging',
+    'android:appCategory',
+    'android:backupAgent',
+    'android:backupInForeground',
+    'android:banner',
+    'android:dataExtractionRules',
+    'android:debuggable',
+    'android:description',
+    'android:enabled',
+    'android:enableOnBackInvokedCallback',
+    'android:extractNativeLibs',
+    'android:fullBackupContent',
+    'android:fullBackupOnly',
+    'android:gwpAsanMode',
+    'android:hasCode',
+    'android:hasFragileUserData',
+    'android:hardwareAccelerated',
+    'android:icon',
+    'android:isGame',
+    'android:isMonitoringTool',
+    'android:killAfterRestore',
+    'android:largeHeap',
+    'android:logo',
+    'android:manageSpaceActivity',
+    'android:name',
+    'android:networkSecurityConfig',
+    'android:permission',
+    'android:persistent',
+    'android:process',
+    'android:restoreAnyVersion',
+    'android:requestLegacyExternalStorage',
+    'android:requiredAccountType',
+    'android:resizeableActivity',
+    'android:restrictedAccountType',
+    'android:taskAffinity',
+    'android:testOnly',
+    'android:uiOptions',
+    'android:usesCleartextTraffic',
+    'android:vmSafeMode'
+];
+const ACTIVITY_ATTR = [
+    'android:allowEmbedded',
+    'android:allowTaskReparenting',
+    'android:alwaysRetainTaskState',
+    'android:autoRemoveFromRecents',
+    'android:banner',
+    'android:canDisplayOnRemoteDevices',
+    'android:clearTaskOnLaunch',
+    'android:colorMode',
+    'android:configChanges',
+    'android:directBootAware',
+    'android:documentLaunchMode',
+    'android:enabled',
+    'android:enableOnBackInvokedCallback',
+    'android:excludeFromRecents',
+    'android:exported',
+    'android:finishOnTaskLaunch',
+    'android:hardwareAccelerated',
+    'android:icon',
+    'android:immersive',
+    'android:label',
+    'android:launchMode',
+    'android:lockTaskMode',
+    'android:maxRecents',
+    'android:maxAspectRatio',
+    'android:minAspectRatio',
+    'android:multiprocess',
+    'android:name',
+    'android:noHistory',
+    'android:parentActivityName',
+    'android:persistableMode',
+    'android:permission',
+    'android:process',
+    'android:relinquishTaskIdentity',
+    'android:requireContentUriPermissionFromCaller',
+    'android:resizeableActivity',
+    'android:screenOrientation',
+    'android:showForAllUsers',
+    'android:stateNotNeeded',
+    'android:supportsPictureInPicture',
+    'android:taskAffinity',
+    'android:theme',
+    'android:uiOptions',
+    'android:windowSoftInputMode'
+];
+const INVALID_ATTR = [
+    [36, ['android:resizableActivity', 'android:minAspectRatio', 'android:maxAspectRatio']]
+];
+function getValidKeys(instance, data, attrList) {
+    const result = [];
+    const targetApi = typeof instance.targetAPI === 'number' ? instance.targetAPI : 0;
+    for (let attr in data) {
+        let value = data[attr];
+        const messageString = (type) => `${type} attribute: ${attr}="${value || 'null'}"`;
+        invalid: {
+            if (attrList.includes(attr) || !attr.includes(':') && attrList.includes(attr = 'android:' + attr)) {
+                value = Array.isArray(value) ? value.join('|') : value?.toString() || '';
+                if (targetApi >= 36) {
+                    for (const [api, attrs] of INVALID_ATTR) {
+                        if (targetApi >= api && attrs.includes(attr)) {
+                            instance.addLog(instance.statusType.WARN, messageString("Invalid config"));
+                            break invalid;
+                        }
+                    }
+                }
+                result.push([attr, value]);
+            }
+            else if (value !== undefined) {
+                instance.addLog(instance.statusType.INFO, messageString("Unknown"));
+            }
+        }
+    }
+    return result;
+}
+function applyAttributes(target, keys) {
+    if (keys.length === 0) {
+        return false;
+    }
+    for (const [attr, value] of keys) {
+        if (value) {
+            target.attribs[attr] = value;
+        }
+        else {
+            delete target.attribs[attr];
+        }
+    }
+    return true;
+}
 function finalize(instance) {
     const config = instance.config;
     const manifest = config.manifest;
@@ -17,8 +157,11 @@ function finalize(instance) {
     }
     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 { supportsRtl, label, theme, activity, metaData = [], activityName, fontProvider } = manifest.application || {};
+        const application = 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);
         let modified = false;
         if (!existing) {
             source = (0, util_1.replaceAll)(source, (name) => {
@@ -28,7 +171,7 @@ function finalize(instance) {
                     case 'label':
                         return '@string/' + (label || 'app_name');
                     case 'theme':
-                        return '@style/' + (theme || 'Theme.Android4');
+                        return '@style/' + (theme || 'Theme.AppCompat.Light.NoActionBar');
                     case 'activityName':
                         return activityName || '';
                     case 'profileable':
@@ -38,7 +181,7 @@ function finalize(instance) {
                 }
             });
         }
-        else if (theme || activityName || activity || supportsRtl !== undefined) {
+        if (existing && (theme || activityName || activity || supportsRtl !== undefined) || applicationKeys.length > 0) {
             new Parser(new DomHandler((err, dom) => {
                 if (err) {
                     instance.writeFail(['Unable to parse XML document', "AndroidManifest.xml"], err, 0);
@@ -48,38 +191,44 @@ function finalize(instance) {
                 if (!target) {
                     return;
                 }
-                if (label) {
-                    target.attribs['android:label'] = '@string/' + label;
-                    modified = true;
-                }
-                if (theme) {
-                    target.attribs['android:theme'] = '@style/' + theme;
-                    modified = true;
-                }
-                if (supportsRtl !== undefined) {
-                    target.attribs['android:supportsRtl'] = supportsRtl.toString();
-                    modified = true;
-                }
-                if (activityName || activity) {
-                    const activities = domutils.getElementsByTagName('activity', target, true);
-                    if (activityName) {
-                        for (const item of activities) {
-                            const intentFilter = domutils.findAll(elem => elem.tagName === 'intent-filter', [item]);
-                            if (intentFilter.length > 0) {
-                                const action = domutils.findOne(elem => elem.tagName === 'action' && elem.attribs['android:name'] === 'android.intent.action.MAIN', intentFilter);
-                                if (action) {
-                                    const attribs = item.attribs;
-                                    attribs['android:name'] = activityName;
-                                    attribs['android:exported'] = 'true';
-                                    modified = true;
-                                    break;
+                if (existing) {
+                    if (label) {
+                        target.attribs['android:label'] = '@string/' + label;
+                        modified = true;
+                    }
+                    if (theme) {
+                        target.attribs['android:theme'] = '@style/' + theme;
+                        modified = true;
+                    }
+                    if (supportsRtl !== undefined) {
+                        target.attribs['android:supportsRtl'] = supportsRtl.toString();
+                        modified = true;
+                    }
+                    if (activityName || activity) {
+                        const activities = domutils.getElementsByTagName('activity', target, true);
+                        if (activityName) {
+                            for (const item of activities) {
+                                const intentFilter = domutils.findAll(elem => elem.tagName === 'intent-filter', [item]);
+                                if (intentFilter.length > 0) {
+                                    const action = domutils.findOne(elem => elem.tagName === 'action' && elem.attribs['android:name'] === 'android.intent.action.MAIN', intentFilter);
+                                    if (action) {
+                                        const attribs = item.attribs;
+                                        attribs['android:name'] = activityName;
+                                        attribs['android:exported'] = 'true';
+                                        modified = true;
+                                        break;
+                                    }
                                 }
                             }
                         }
-                    }
-                    for (const name in activity) {
-                        const { layout: attribs } = activity[name];
-                        if (attribs) {
+                        for (const name in activity) {
+                            const data = activity[name];
+                            const attribs = data.layout;
+                            delete data.layout;
+                            const activityKeys = getValidKeys(instance, data, ACTIVITY_ATTR);
+                            if (!(0, types_1.isPlainObject)(attribs) && activityKeys.length === 0) {
+                                continue;
+                            }
                             let element = domutils.findOne(elem => elem.attribs['android:name'] === name, activities);
                             if (!element) {
                                 domutils.appendChild(target, element = new domhandler.Element('activity', { 'android:name': name }));
@@ -91,6 +240,9 @@ function finalize(instance) {
                                 domutils.append(layout, new domhandler.Text('\n'));
                                 found = false;
                             }
+                            if (applyAttributes(layout, activityKeys)) {
+                                modified = true;
+                            }
                             for (const attr in attribs) {
                                 switch (attr) {
                                     case 'defaultHeight':
@@ -109,17 +261,20 @@ function finalize(instance) {
                             }
                         }
                     }
-                }
-                if (profileable !== undefined) {
-                    const attribs = profileable ? { 'android:shell': 'true', 'android:enabled': 'true' } : { 'android:enabled': 'false' };
-                    const element = domutils.findOne(elem => elem.tagName === 'profileable', [target]);
-                    if (element) {
-                        Object.assign(element.attribs, attribs);
-                    }
-                    else if (profileable) {
-                        domutils.appendChild(target, new domhandler.Element('profileable', attribs));
-                        domutils.appendChild(target, new domhandler.Text('\n'));
+                    if (profileable !== undefined) {
+                        const attribs = profileable ? { 'android:shell': 'true', 'android:enabled': 'true' } : { 'android:enabled': 'false' };
+                        const element = domutils.findOne(elem => elem.tagName === 'profileable', [target]);
+                        if (element) {
+                            Object.assign(element.attribs, attribs);
+                        }
+                        else if (profileable) {
+                            domutils.appendChild(target, new domhandler.Element('profileable', attribs));
+                            domutils.appendChild(target, new domhandler.Text('\n'));
+                        }
+                        modified = true;
                     }
+                }
+                if (applyAttributes(target, applicationKeys)) {
                     modified = true;
                 }
                 if (modified) {
@@ -130,22 +285,15 @@ function finalize(instance) {
         if (fontProvider) {
             metaData.push({ name: 'preloaded_fonts', resource: '@array/' + fontProvider });
         }
-        const keys = Object.keys(manifest).map(attr => MANIFEST_ATTR.includes(attr) ? attr : attr !== 'package' && MANIFEST_ATTR.includes('android:' + attr) ? attr : '').filter(item => item);
-        if (keys.length > 0 || (0, types_1.isArray)(metaData)) {
+        if (manifestKeys.length > 0 || (0, types_1.isArray)(metaData)) {
             new Parser(new DomHandler((err, dom) => {
                 if (err) {
                     instance.writeFail(['Unable to parse XML document', "AndroidManifest.xml"], err, 0);
                     return;
                 }
                 let target = null;
-                if (keys.length > 0 && (target = domutils.findOne(elem => elem.tagName === 'manifest', dom, true))) {
-                    for (let key of keys) {
-                        if (!key.startsWith('android:') && key !== 'package') {
-                            key = 'android:' + key;
-                        }
-                        target.attribs[key] = manifest[key]?.toString() || '';
-                        modified = true;
-                    }
+                if (manifestKeys.length > 0 && (target = domutils.findOne(elem => elem.tagName === 'manifest', dom, true)) && applyAttributes(target, manifestKeys)) {
+                    modified = true;
                 }
                 if ((0, types_1.isArray)(metaData) && (target = domutils.findOne(elem => elem.tagName === 'application', dom, true))) {
                     for (const { name, resource, value } of metaData) {

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.1.20");
+                    const stdLib = instance.findVersion('org.jetbrains.kotlin:kotlin-stdlib', "2.2.0");
                     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.')) {
@@ -561,8 +561,7 @@ function finalize(instance) {
             const targetAPI = instance.targetAPI;
             let output = source;
             if (targetAPI) {
-                const [compileSdk, targetSdk] = typeof targetAPI === 'string' ? [`"android-${targetAPI}"`, `"${targetAPI}"`] : [targetAPI, targetAPI];
-                const updateOnly = +targetAPI >= 33;
+                const [compileSdk, targetSdk, updateOnly] = typeof targetAPI === 'string' ? [`"android-${targetAPI}"`, `"${targetAPI}"`, true] : [targetAPI, targetAPI, targetAPI >= 33];
                 let content = Document.updateGradle(output, ['android'], kotlin ? `compileSdkVersion(${compileSdk})` : 'compileSdkVersion ' + compileSdk, { upgrade: true, updateOnly });
                 if (content === output) {
                     output = Document.updateGradle(output, ['android'], kotlin ? `compileSdk(${compileSdk})` : 'compileSdk ' + compileSdk, true);

package/extensions/task/index.js

@@ -40,7 +40,6 @@ async function finalize(instance) {
         if (!command.includes(path.sep)) {
             filename = checkWin32(command);
         }
-        command = (0, types_1.sanitizeCmd)(command);
     }
     else {
         filename = checkWin32("gradlew");
@@ -64,7 +63,7 @@ async function finalize(instance) {
             else if (altname) {
                 const bin = which.sync(altname, { nothrow: true });
                 if (bin) {
-                    command = (0, types_1.sanitizeCmd)(bin);
+                    command = bin;
                 }
             }
         }
@@ -89,10 +88,10 @@ async function finalize(instance) {
         await new Promise((resolve, reject) => {
             this.formatMessage(4, title, ['Executing task...', task], baseDirectory);
             let out = '', message = '';
-            const { stdout, stderr } = child_process.spawn(command, (0, types_1.sanitizeArgs)(args), { cwd: baseDirectory, shell: true, stdio: Document.hasLogType(32768) && !broadcastId ? 'inherit' : undefined, signal: instance.signal, uid, gid })
+            const { stdout, stderr } = child_process.spawn((0, types_1.sanitizeCmd)(command, (0, types_1.sanitizeArgs)(args)), { cwd: baseDirectory, shell: true, stdio: Document.hasLogType(32768) && !broadcastId ? 'inherit' : undefined, signal: instance.signal, uid, gid })
                 .on('exit', code => {
                 if (!code) {
-                    instance.addLog(types_1.STATUS_TYPE.INFO, out);
+                    instance.addLog(4, out);
                     this.writeTimeProcess(title, 'Success -> ' + task, startTime);
                     resolve();
                 }
@@ -104,7 +103,7 @@ async function finalize(instance) {
             if (stdout) {
                 stdout.setEncoding('utf8').on('data', (value) => {
                     if (broadcastId) {
-                        this.formatMessage(types_1.STATUS_TYPE.INFO, '', value, null, { sessionId: '' });
+                        this.formatMessage(4, '', value, null, { sessionId: '' });
                     }
                     out += value;
                 });
@@ -112,7 +111,7 @@ async function finalize(instance) {
             if (stderr) {
                 stderr.setEncoding('utf8').on('data', (value) => {
                     if (broadcastId) {
-                        this.formatMessage(types_1.STATUS_TYPE.ERROR, '', value, null, { sessionId: '' });
+                        this.formatMessage(2, '', value, null, { sessionId: '' });
                     }
                     message += value;
                 });

package/package.json

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

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.11.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

package/template/java/build.gradle

@@ -3,13 +3,13 @@ plugins {
 }
 
 android {
-    namespace ''
-    compileSdk 35
+    namespace = ''
+    compileSdk = 36
 
     defaultConfig {
         applicationId ''
-        minSdk 24
-        targetSdk 35
+        minSdk = 24
+        targetSdk = 36
         versionCode 1
         versionName '1.0'
 
@@ -19,7 +19,7 @@ android {
         release {
             debuggable false
             minifyEnabled true
-            shrinkResources false
+            shrinkResources = false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
@@ -28,7 +28,7 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
     }
     buildFeatures {
-        viewBinding false
+        viewBinding = false
     }
 }
 

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.9.2' apply false
-    id 'com.android.library' version '8.9.2' apply false
+    id 'com.android.application' version '8.12.0' apply false
+    id 'com.android.library' version '8.12.0' apply false
 }

package/template/java+kotlin/build.gradle

@@ -1,16 +1,18 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     alias libs.plugins.android.application
     alias libs.plugins.kotlin.android
 }
 
 android {
-    namespace ''
-    compileSdk 35
+    namespace = ''
+    compileSdk = 36
 
     defaultConfig {
         applicationId ''
-        minSdk 24
-        targetSdk 35
+        minSdk = 24
+        targetSdk = 36
         versionCode 1
         versionName '1.0'
 
@@ -20,7 +22,7 @@ android {
         release {
             debuggable false
             minifyEnabled true
-            shrinkResources false
+            shrinkResources = false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
@@ -28,14 +30,17 @@ android {
         sourceCompatibility JavaVersion.VERSION_11
         targetCompatibility JavaVersion.VERSION_11
     }
-    kotlinOptions {
-        jvmTarget = '11'
-    }
     buildFeatures {
-        viewBinding true
+        viewBinding = true
+    }
+    lint {
+        checkDependencies = false
     }
-    lintOptions {
-        checkDependencies false
+}
+
+kotlin {
+    compilerOptions {
+        jvmTarget = JvmTarget.fromTarget('11')
     }
 }
 

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

@@ -1,6 +1,6 @@
 [versions]
-agp = "8.9.2"
-kotlin = "2.1.20"
+agp = "8.12.0"
+kotlin = "2.2.0"
 coreKtx = "1.16.0"
 junit = "4.13.2"
 junitVersion = "1.2.1"

package/template/kotlin/build.gradle.kts

@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.kotlin.android)
@@ -6,12 +8,12 @@ plugins {
 
 android {
     namespace = ""
-    compileSdk = 35
+    compileSdk = 36
 
     defaultConfig {
         applicationId = ""
         minSdk = 24
-        targetSdk = 35
+        targetSdk = 36
         versionCode = 1
         versionName = "1.0"
 
@@ -25,14 +27,11 @@ android {
             proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
         }
     }
-    kotlinOptions {
-        jvmTarget = "11"
-    }
     buildFeatures {
         viewBinding = true
     }
     lint {
-        isCheckDependencies = false
+        checkDependencies = false
     }
 }
 
@@ -41,6 +40,12 @@ java {
     targetCompatibility = JavaVersion.VERSION_11
 }
 
+kotlin {
+    compilerOptions {
+        jvmTarget = JvmTarget.fromTarget("11")
+    }
+}
+
 dependencies {
     implementation(libs.jetbrains.kotlin)
     implementation(libs.androidx.core.ktx)

package/template/kotlin/libs.versions.toml

@@ -1,11 +1,11 @@
 [versions]
-agp = "8.9.2"
-kotlin = "2.1.20"
+agp = "8.12.0"
+kotlin = "2.2.0"
 coreKtx = "1.16.0"
 junit = "4.13.2"
 junitVersion = "1.2.1"
 espressoCore = "3.6.1"
-appcompat = "1.7.0"
+appcompat = "1.7.1"
 material = "1.12.0"
 constraintlayout = "2.2.1"
 

package/types/squared.d.ts

@@ -75,10 +75,10 @@ export interface ManifestData extends PlainObject {
                 minHeight?: string;
                 gravity?: string;
             };
-        }>;
+        } & PlainObject>;
         activityName?: string;
         fontProvider?: string;
-    };
+    } & PlainObject;
 }
 
 export interface ControllerSettingsDirectoryUI {