@pi-r/android 0.11.3 → 0.12.0

package/extensions/gradle/settings/index.js

@@ -1,7 +1,8 @@
 "use strict";
-const path = require("node:path");
-const parse_1 = require("@e-mc/document/parse");
-const util_1 = require("@e-mc/document/util");
+
+const path = require('node:path');
+const { XmlWriter } = require('@e-mc/document/parse');
+const { getNewline, replaceAll } = require('@e-mc/document/util');
 function finalize(instance) {
     const { dependencies, projectName, mainParentDir } = instance.config;
     if (!dependencies && !projectName) {
@@ -15,23 +16,21 @@ function finalize(instance) {
             if (dependencies) {
                 found: {
                     const pattern = kotlin ? /^\s*include\(((?:\s*"[^"]+"\s*,?\s*)+)\)/gm : /^\s*include\s*((?:(?:"[^"]+"|'[^']+')\s*,?\s*)+)/gm;
-                    let match, app;
-                    while (match = pattern.exec(source)) {
-                        const namespace = /":?([^"]+)"|':?([^']+)'/g;
-                        while (app = namespace.exec(match[1])) {
+                    for (const match of source.matchAll(pattern)) {
+                        for (const app of match[1].matchAll(/":?([^"]+)"|':?([^']+)'/g)) {
                             if (app[1] === mainParentDir || app[2] === mainParentDir) {
                                 break found;
                             }
                         }
                     }
-                    pattern.lastIndex = 0;
-                    if (match = pattern.exec(source)) {
+                    const match = pattern.exec(source);
+                    if (match) {
                         const index = match.index + match[0].length;
                         if (kotlin) {
-                            source = source.substring(0, index - 1).trimEnd() + `, "${mainParentDir}")` + source.substring(index);
+                            source = source.slice(0, index - 1).trimEnd() + `, "${mainParentDir}")` + source.slice(index);
                         }
                         else {
-                            source = parse_1.XmlWriter.replaceMatch(match, source, `, '${mainParentDir}'`, { trimLeading: true });
+                            source = XmlWriter.replaceMatch(match, source, `, '${mainParentDir}'`, { trimLeading: true });
                         }
                         modified = true;
                     }
@@ -39,18 +38,18 @@ function finalize(instance) {
             }
             if (targetName) {
                 const value = `rootProject.name = "${targetName}"`;
-                const match = new RegExp('^\\s*rootProject\\.name\\s*=\\s*' + parse_1.XmlWriter.PATTERN_QUOTEVALUE, 'm').exec(source);
+                const match = new RegExp('^\\s*rootProject\\.name\\s*=\\s*' + XmlWriter.PATTERN_QUOTEVALUE, 'm').exec(source);
                 if (match) {
-                    source = parse_1.XmlWriter.replaceMatch(match, source, value);
+                    source = XmlWriter.replaceMatch(match, source, value);
                 }
                 else {
-                    source += (0, util_1.getNewline)(source) + value;
+                    source += getNewline(source) + value;
                 }
                 modified = true;
             }
         }
         else {
-            source = (0, util_1.replaceAll)(source, (name) => {
+            source = replaceAll(source, (name) => {
                 switch (name) {
                     case 'projectName':
                         return targetName || '';
@@ -76,4 +75,5 @@ function finalize(instance) {
         }
     }
 }
+
 module.exports = finalize;

package/extensions/task/index.js

@@ -1,10 +1,11 @@
 "use strict";
-const path = require("node:path");
-const fs = require("node:fs");
-const child_process = require("node:child_process");
-const which = require("which");
-const Document = require("@e-mc/document");
-const types_1 = require("@e-mc/types");
+
+const path = require('node:path');
+const fs = require('node:fs');
+const child_process = require('node:child_process');
+const which = require('which');
+const Document = require('@e-mc/document');
+const { createAbortError, errorValue, isArray, isPlainObject, sanitizeArgs, sanitizeCmd } = require('@e-mc/types');
 const checkWin32 = (value) => value === "gradlew" && Document.PLATFORM_WIN32 ? value + '.bat' : value;
 async function finalize(instance) {
     const commands = instance.config.commands;
@@ -15,7 +16,7 @@ async function finalize(instance) {
     if (typeof commands === 'string') {
         taskArgs = [[commands]];
     }
-    else if ((0, types_1.isArray)(commands)) {
+    else if (isArray(commands)) {
         if (commands.every(value => typeof value === 'string')) {
             taskArgs = [commands];
         }
@@ -70,7 +71,7 @@ async function finalize(instance) {
         catch {
         }
     }
-    if ((0, types_1.isPlainObject)(exec)) {
+    if (isPlainObject(exec)) {
         let { uid: u, gid: g } = exec;
         if ((u = parseInt(u)) >= 0) {
             uid = u;
@@ -81,14 +82,14 @@ async function finalize(instance) {
     }
     for (const args of taskArgs) {
         if (instance.aborted) {
-            return (0, types_1.createAbortError)(true);
+            return createAbortError(true);
         }
         const startTime = process.hrtime();
         const task = args.join(' ');
         await new Promise((resolve, reject) => {
             this.formatMessage(4, title, ['Executing task...', task], baseDirectory);
             let out = '', message = '';
-            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 })
+            const { stdout, stderr } = child_process.spawn(sanitizeCmd(command, 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(4, out);
@@ -96,7 +97,7 @@ async function finalize(instance) {
                     resolve();
                 }
                 else {
-                    reject((0, types_1.errorValue)(message || (!foundDir && code === 1 ? "Unable to execute file" : "Unknown"), "Error code" + ': ' + code));
+                    reject(errorValue(message || (!foundDir && code === 1 ? "Unable to execute file" : "Unknown"), "Error code" + ': ' + code));
                 }
             })
                 .on('error', reject);
@@ -118,4 +119,5 @@ async function finalize(instance) {
         });
     }
 }
+
 module.exports = finalize;

package/index.js

@@ -1,7 +1,8 @@
 "use strict";
-const fs = require("node:fs");
-const path = require("node:path");
-const types_1 = require("@e-mc/types");
+
+const fs = require('node:fs');
+const path = require('node:path');
+const { asExt, createAbortError, errorValue, isArray, isPlainObject } = 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(/\/+$/, '');
@@ -9,7 +10,7 @@ class AndroidDocument extends Document {
     static [kAndroid] = true;
     static async finalize(instance) {
         if (instance.aborted) {
-            return (0, types_1.createAbortError)(true);
+            return createAbortError(true);
         }
         if (instance.extensions.length > 0) {
             const config = instance.config;
@@ -56,12 +57,14 @@ class AndroidDocument extends Document {
     elements = [];
     extensionData = {};
     targetAPI;
+    resolutionScreenWidth;
+    resolutionScreenHeight;
     directories;
     _moduleName = 'android';
     _threadable = true;
     init(assets, config) {
         if (config) {
-            const { targetAPI, mainParentDir, mainSrcDir, mainActivityFile, javaVersion, jvmToolchain, projectName, versionName, versionCode = 0, manifest, namespace, applicationId, profileable, dependencies, dependencyScopes, versionCatalog, libraries, dataBinding, commands, directories, elements, extensionData } = config;
+            const { targetAPI, resolutionScreenWidth = 0, resolutionScreenHeight = 0, mainParentDir, mainSrcDir, mainActivityFile, javaVersion, jvmToolchain, projectName, versionName, versionCode = 0, manifest, namespace, applicationId, profileable, dependencies, dependencyScopes, versionCatalog, libraries, dataBinding, commands, directories, elements, extensionData } = config;
             const target = this.config;
             if (projectName) {
                 target.projectName = projectName;
@@ -96,7 +99,7 @@ class AndroidDocument extends Document {
             if (dataBinding) {
                 target.dataBinding = true;
             }
-            if ((0, types_1.isPlainObject)(manifest)) {
+            if (isPlainObject(manifest)) {
                 target.manifest = manifest;
             }
             if (profileable !== undefined) {
@@ -111,22 +114,26 @@ class AndroidDocument extends Document {
             if (javaVersion) {
                 target.javaVersion = typeof javaVersion === 'string' ? +javaVersion.replace(/_/g, '.') : javaVersion;
             }
-            if ((0, types_1.isArray)(dependencies)) {
+            if (isArray(dependencies)) {
                 target.dependencies = dependencies;
             }
-            if ((0, types_1.isPlainObject)(libraries) && Object.keys(libraries).length > 0) {
+            if (isPlainObject(libraries) && Object.keys(libraries).length > 0) {
                 target.libraries = libraries;
             }
             if (targetAPI) {
                 this.targetAPI = targetAPI;
             }
-            if ((0, types_1.isPlainObject)(directories)) {
+            if (resolutionScreenWidth > 0 && resolutionScreenHeight > 0) {
+                this.resolutionScreenWidth = resolutionScreenWidth;
+                this.resolutionScreenHeight = resolutionScreenHeight;
+            }
+            if (isPlainObject(directories)) {
                 this.directories = directories;
             }
-            if ((0, types_1.isArray)(elements)) {
+            if (isArray(elements)) {
                 this.elements = elements;
             }
-            if ((0, types_1.isPlainObject)(extensionData)) {
+            if (isPlainObject(extensionData)) {
                 this.extensionData = extensionData;
             }
         }
@@ -152,7 +159,7 @@ class AndroidDocument extends Document {
     }
     async using(data) {
         if (this.aborted) {
-            return (0, types_1.createAbortError)(true);
+            return createAbortError(true);
         }
         const { host, file } = data;
         const localUri = file.localUri;
@@ -225,7 +232,7 @@ class AndroidDocument extends Document {
             paths.push(filename);
             let uri;
             if (!existing && !(uri = this.resolveDir('template', ...paths))) {
-                throw (0, types_1.errorValue)("File not found", uri);
+                throw errorValue("File not found", uri);
             }
             return { localUri, source: fs.readFileSync(uri || localUri, 'utf8'), existing, kotlin, language };
         }
@@ -251,7 +258,7 @@ class AndroidDocument extends Document {
         let localUri;
         try {
             if (localUri = this.resolveDir('data', filename)) {
-                return this.tryParse(fs.readFileSync(localUri, 'utf8'), format || path.extname(localUri).substring(1));
+                return this.tryParse(fs.readFileSync(localUri, 'utf8'), format || asExt(localUri));
             }
         }
         catch (err) {
@@ -286,4 +293,5 @@ class AndroidDocument extends Document {
         return this.module.settings ||= {};
     }
 }
+
 module.exports = AndroidDocument;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/android",
-  "version": "0.11.3",
+  "version": "0.12.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.13.10",
-    "@e-mc/types": "^0.13.10",
+    "@e-mc/document": "^0.14.0",
+    "@e-mc/types": "^0.14.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.14.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

package/template/java/build.gradle

@@ -4,12 +4,12 @@ plugins {
 
 android {
     namespace = ''
-    compileSdk = 36
+    compileSdk = 37
 
     defaultConfig {
         applicationId ''
-        minSdk = 24
-        targetSdk = 36
+        minSdk = 26
+        targetSdk = 37
         versionCode 1
         versionName '1.0'
 
@@ -20,7 +20,7 @@ android {
             debuggable false
             minifyEnabled true
             shrinkResources = false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
     compileOptions {

package/template/java/static/build.gradle

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

package/template/java/static/gradle.properties

@@ -12,3 +12,4 @@
 # android.nonFinalResIds=true
 # android.nonTransitiveRClass=true
 # android.enableR8.fullMode=true
+# android.r8.optimizedResource=true

package/template/java+kotlin/build.gradle

@@ -1,18 +1,20 @@
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-
 plugins {
     alias libs.plugins.android.application
-    alias libs.plugins.kotlin.android
+    alias libs.plugins.kotlin.compose
 }
 
 android {
     namespace = ''
-    compileSdk = 36
+    compileSdk {
+        version = release(37) {
+            minorApiLevel = 0
+        }
+    }
 
     defaultConfig {
         applicationId ''
-        minSdk = 24
-        targetSdk = 36
+        minSdk = 26
+        targetSdk = 37
         versionCode 1
         versionName '1.0'
 
@@ -23,7 +25,7 @@ android {
             debuggable false
             minifyEnabled true
             shrinkResources = false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
     compileOptions {
@@ -38,12 +40,6 @@ android {
     }
 }
 
-kotlin {
-    compilerOptions {
-        jvmTarget = JvmTarget.fromTarget('11')
-    }
-}
-
 dependencies {
     implementation libs.androidx.core.ktx
     testImplementation libs.junit

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

@@ -1,7 +1,7 @@
 [versions]
-agp = "8.13.2"
-kotlin = "2.2.21"
+agp = "9.2.0"
 coreKtx = "1.18.0"
+kotlin = "2.3.21"
 junit = "4.13.2"
 junitVersion = "1.3.0"
 espressoCore = "3.7.0"
@@ -14,4 +14,4 @@ androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-co
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }
-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
+kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }

package/template/java+kotlin/settings.gradle

@@ -12,6 +12,10 @@ pluginManagement {
     }
 }
 
+plugins {
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0'
+}
+
 dependencyResolutionManagement {
     repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
     repositories {

package/template/java+kotlin/static/build.gradle

@@ -1,4 +1,5 @@
 plugins {
     alias libs.plugins.android.application apply false
     alias libs.plugins.kotlin.android apply false
+    alias libs.plugins.kotlin.compose false
 }

package/template/java+kotlin/static/gradle.properties

@@ -12,5 +12,6 @@ android.useAndroidX=true
 # android.nonFinalResIds=true
 # android.nonTransitiveRClass=true
 # android.enableR8.fullMode=true
+# android.r8.optimizedResource=true
 
 # kotlin.code.style=official

package/template/kotlin/build.gradle.kts

@@ -1,19 +1,20 @@
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-
 plugins {
     alias(libs.plugins.android.application)
-    alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.compose)
 }
 
 android {
     namespace = ""
-    compileSdk = 36
+    compileSdk {
+        version = release(37) {
+            minorApiLevel = 0
+        }
+    }
 
     defaultConfig {
         applicationId = ""
-        minSdk = 24
-        targetSdk = 36
+        minSdk = 26
+        targetSdk = 37
         versionCode = 1
         versionName = "1.0"
 
@@ -24,9 +25,13 @@ android {
             isDebuggable = false
             isMinifyEnabled = true
             isShrinkResources = false
-            proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
+            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
         }
     }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
     buildFeatures {
         viewBinding = true
     }
@@ -35,17 +40,6 @@ android {
     }
 }
 
-java {
-    sourceCompatibility = JavaVersion.VERSION_11
-    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,7 +1,7 @@
 [versions]
-agp = "8.13.2"
-kotlin = "2.2.21"
+agp = "9.2.0"
 coreKtx = "1.18.0"
+kotlin = "2.3.21"
 junit = "4.13.2"
 junitVersion = "1.3.0"
 espressoCore = "3.7.0"
@@ -21,5 +21,4 @@ android-material = { group = "com.google.android.material", name = "material", v
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }
-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }

package/template/kotlin/settings.gradle.kts

@@ -12,6 +12,10 @@ pluginManagement {
     }
 }
 
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"
+}
+
 dependencyResolutionManagement {
     repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
     repositories {

package/template/kotlin/static/gradle.properties

@@ -9,8 +9,9 @@ org.gradle.configuration-cache=true
 # org.gradle.warning.mode=summary
 
 android.useAndroidX=true
+android.nonTransitiveRClass=true
 # android.nonFinalResIds=true
-# android.nonTransitiveRClass=true
 # android.enableR8.fullMode=true
+# android.r8.optimizedResource=true
 
 kotlin.code.style=official

package/types/index.d.ts

@@ -1,5 +1,5 @@
 import type { DocumentConstructor, IDocument, IFileManager } from '@e-mc/types/lib';
-import type { ExternalAsset } from '@e-mc/types/lib/asset';
+import type { ExternalAsset, IFileThread } from '@e-mc/types/lib/asset';
 import type { ExecAction, DocumentDirectory as IDocumentDirectory, DocumentModule as IDocumentModule, DocumentSettings as IDocumentSettings } from '@e-mc/types/lib/settings';
 
 import type { DependencyScopes, DocumentOutput, FinalizedElement } from './squared';
@@ -21,7 +21,7 @@ interface AndroidDocumentSettings extends Pick<IDocumentSettings, "users" | "dir
     };
 }
 
-type DocumentProperties = "targetAPI" | "elements" | "extensionData" | "directories";
+type DocumentProperties = "targetAPI" | "resolutionScreenWidth" | "resolutionScreenHeight" | "elements" | "extensionData" | "directories";
 
 export interface UserConfig extends Omit<DocumentOutput, DocumentProperties> {
     mainParentDir: string;
@@ -66,6 +66,7 @@ export interface IAndroidDocument<T extends IFileManager<U>, U extends DocumentA
     config: UserConfig;
     elements: FinalizedElement[];
     extensionData: PlainObject;
+    using(data: IFileThread): Promise<void>;
     writeTemplate(data: TemplateData, host?: T): void;
     findTemplate(baseDir: string, filename: string, options?: FindTemplateOptions): TemplateData;
     findData<V = AnyObject>(filename: string, format?: string): V | null;

package/types/squared.d.ts

@@ -31,6 +31,8 @@ export interface CssConditionData extends ConditionProperty {
 
 export interface DocumentOutput {
     targetAPI?: number | string;
+    resolutionScreenWidth?: number;
+    resolutionScreenHeight?: number;
     manifest?: ManifestData;
     namespace?: string;
     applicationId?: string;