@pi-r/android 0.9.3 → 0.10.0

package/extensions/app/manifest/index.js

@@ -173,7 +173,7 @@ function finalize(instance) {
         }
         if (modified || !existing) {
             try {
-                if (instance.writeFile(localUri, source, { encoding: 'utf-8', ownPermissionOnly: true, throwsPermission: true }) && !existing) {
+                if (instance.writeFile(localUri, source, { encoding: 'utf8', ownPermissionOnly: true, throwsPermission: true }) && !existing) {
                     this.add(localUri);
                 }
             }

package/extensions/gradle/dependencies/index.js

@@ -6,8 +6,10 @@ const types_1 = require("@e-mc/types");
 const util_1 = require("@e-mc/document/util");
 const REGEXP_SEMVER = /^((\s*,\s*)?[([\]]((\s*,\s*)?\d+\.\d+(\s*,\s*)?)+[)\][])+$/;
 const REGEXP_DEPENDENCIES = /dependencies\s+\{((?:{[^{]*{|{[^}]*}|}[^}]*}|\\}*?|[^{}+])+)\}/;
-const REGEXP_DEPENDENCY = /([ \t]*)([A-Za-z_$][\w$]*)(?:\s*\(?\s*(?:module\(?\s*)?["']([^"']+)["']\s*\)?|\s+((?:\s*(?:group|name|version)\s*:\s*(?:"[^"]+"|'[^']+')\s*,?){3}))?/gd;
-const REGEXP_DEPENDENCY_KOTLIN = /([ \t]*)([A-Za-z_$][\w$]*)\((?:\s*(?:(?:module\(\s*)?"([^"]+)"|((?:\s*(?:group|name|version)\s*=\s*"[^"]+"\s*,?){3}))\s*\))?/gd;
+const REGEXP_DEPENDENCY = /([ \t]*)([A-Za-z_$][\w$]*)(?:\s*\(?\s*(?:module\(?\s*)?["']([^"']+)["']\s*\)?|\s+((?:\s*(?:group|name|version)\s*:\s*(?:"(?:[^"]|(?<=\\)")+"|'(?:[^']|(?<=\\)')+')\s*,?){3}))?/gd;
+const REGEXP_DEPENDENCY_KOTLIN = /([ \t]*)([A-Za-z_$][\w$]*)\((?:\s*(?:(?:module\(\s*)?"([^"]+)"|((?:\s*(?:group|name|version)\s*=\s*"(?:[^"]|(?<=\\)")+"\s*,?){3}))\s*\))?/gd;
+const REGEXP_LIBRARY = /([ \t]*)implementation\s+(?:(project|files)\s*\(\s*("(?:[^"]|(?<=\\)")+"|'(?:[^']|(?<=\\)')+')\s*\)|(fileTree)\s*\(\s*((?:\s*(?:dir|include)\s*:\s*(?:"(?:[^"]|(?<=\\)")+"|'(?:[^']|(?<=\\)')+'|\[[^\]]+\])\s*,?){2})\s*\))[ \t\r]*\n/gd;
+const REGEXP_LIBRARY_KOTLIN = /([ \t]*)implementation\(\s*(?:(project|files)\(\s*"(.+)"\s*\)|(fileTree)\(\s*mapOf\(((?:\s*"(?:dir|include)"\s+to\s+(?:"(?:[^"]|(?<=\\)")+"|listOf\([^)]+\))\s*,?){2})\)\s*\))\s*\)[ \t\r]*\n/gd;
 const REGEXP_VERSIONS = /([^\s]+)\s*=\s*(?:"([^":]+)"|'([^':]+)'|(\{(?:\s*(?:require|strictly|prefer|reject(?:All)?)\s*=\s*(?:"[^":]+"|'[^':]+')\s*,?)+\s*\}))/g;
 const REGEXP_VERSIONS_LIB = /([^\s]+)\s*=\s*(?:\{\s*(group|name|module|version(?:\.ref)?)\s*=\s*(?:"([^"]+)"|'([^']+)'|(\{[^}]+\}))\s*,\s*(group|name|module|version(?:\.ref)?)\s*=\s*(?:"([^"]+)"|'([^']+)'|(\{[^}]+\}))(?:\s*,\s*(group|name|module|version(?:\.ref)?)\s*=\s*(?:"([^"]+)"|'([^']+)')|(\{[^}]+\}))?\s*\}|(?:"([^:]+:[^"]+)"|'([^:]+:[^']+)'))/gd;
 function isUpgrade(version, pending) {
@@ -34,7 +36,7 @@ function isUpgrade(version, pending) {
     return false;
 }
 function writeMethod(kotlin, named, item, args = '', prefix = 'implementation') {
-    if (/^(?:implementation|api|compileOnly(?:Api)?|runtimeOnly|(?:test|androidTest)(?:Implementation|RuntimeOnly|CompileOnly))$/.test(prefix)) {
+    if (/^(?:implementation|api|compileOnly(?:Api)?|runtimeOnly|(?:test|androidTest)(?:Implementation|RuntimeOnly|CompileOnly)|lint(?:Checks|Publish))$/.test(prefix)) {
         switch (parseInt(item[3])) {
             case 0:
                 prefix = 'implementation';
@@ -69,6 +71,12 @@ function writeMethod(kotlin, named, item, args = '', prefix = 'implementation')
             case 10:
                 prefix = 'androidTestRuntimeOnly';
                 break;
+            case 11:
+                prefix = 'lintChecks';
+                break;
+            case 12:
+                prefix = 'lintPublish';
+                break;
         }
     }
     const [group, name, version] = item;
@@ -92,8 +100,8 @@ const isLatest = (value) => value === '' || value.startsWith('latest.');
 const isSemVer = (value) => isLatest(value) || REGEXP_SEMVER.test(value);
 const toCamelCase = (value) => value.replace(/-([a-z])/gi, (...capture) => capture[1].toUpperCase());
 function finalize(instance) {
-    const { profileable, dependencies, dataBinding, jvmToolchain, versionName, versionCode, namespace, applicationId, mainParentDir } = instance.config;
-    if (!profileable && !dependencies && !dataBinding && !jvmToolchain && !versionName && !versionCode && !namespace && !applicationId) {
+    const { profileable, dependencies, libraries, dataBinding, jvmToolchain, versionName, versionCode, namespace, applicationId, mainParentDir } = instance.config;
+    if (!profileable && !dependencies && !libraries && !dataBinding && !jvmToolchain && !versionName && !versionCode && !namespace && !applicationId) {
         return;
     }
     let { localUri, source, existing, kotlin = false, language } = instance.findTemplate(path.join(this.baseDirectory, mainParentDir), "build.gradle", { detect: instance.detect(this), languageOf: 'gradle' });
@@ -107,6 +115,11 @@ function finalize(instance) {
                 modified = true;
             }
         };
+        const setDependencies = (match, output) => {
+            if (modified || !existing) {
+                setModified((0, util_1.spliceString)(source, match.index, match.index + match[0].length, `dependencies {${output}}`));
+            }
+        };
         if (dependencies) {
             const { dependencyScopes, versionCatalog } = instance.config;
             let mavenData;
@@ -222,14 +235,14 @@ function finalize(instance) {
             }
             const match = REGEXP_DEPENDENCIES.exec(source);
             if (match) {
-                const newLine = source.includes('\r\n') ? '\r\n' : '\n';
+                const newLine = (0, util_1.getNewline)(source);
                 const gradleDir = path.join(this.baseDirectory, 'gradle');
-                const template = instance.findTemplate(gradleDir, "libs.versions.toml", { detect: true, subDir: kotlin ? 'kotlin' : undefined, throwsDoesNotExist: false });
+                const template = instance.findTemplate(gradleDir, "libs.versions.toml", { detect: true, subDir: language, throwsDoesNotExist: false });
                 let content = match[1], named = false, versioning = false, indent;
                 if (template.localUri && template.source) {
                     versioning = kotlin && versionCatalog !== false || !!versionCatalog;
                     if (versioning || template.existing) {
-                        const libraries = {};
+                        const libs = {};
                         const versions = {};
                         let config = template.source, catalog;
                         while (catalog = REGEXP_VERSIONS.exec(config)) {
@@ -278,7 +291,7 @@ function finalize(instance) {
                                         }
                                     }
                                 }
-                                libraries[catalog[1]] = lib;
+                                libs[catalog[1]] = lib;
                             }
                         }
                         if (versioning && items.length > 0) {
@@ -287,15 +300,15 @@ function finalize(instance) {
                                 const item = items[i];
                                 const [group, name, version] = item;
                                 let key = group.replaceAll('.', '-');
-                                if (libraries[key]) {
+                                if (libs[key]) {
                                     key += '-' + name.replaceAll('.', '-');
                                 }
                                 let versionRef;
                                 found: {
                                     for (const ref in versions) {
                                         if (versions[ref] === version) {
-                                            for (const lib in libraries) {
-                                                if (libraries[lib]['version.ref'] === ref && (libraries[lib].group === group || libraries[lib].module?.startsWith(group + ':'))) {
+                                            for (const lib in libs) {
+                                                if (libs[lib]['version.ref'] === ref && (libs[lib].group === group || libs[lib].module?.startsWith(group + ':'))) {
                                                     versionRef = ref;
                                                     break found;
                                                 }
@@ -324,7 +337,7 @@ function finalize(instance) {
                                 item[0] = 'libs.' + key.replaceAll('-', '.');
                                 item[1] = '';
                                 item[2] = '';
-                                libraries[key] = { group, name, "version.ref": versionRef };
+                                libs[key] = { group, name, "version.ref": versionRef };
                             }
                             let section = /\[libraries\]\s*/.exec(config);
                             const writeOutput = (value) => (0, util_1.spliceString)(config, section.index, section.index + section[0].length, value);
@@ -347,12 +360,11 @@ function finalize(instance) {
                         }
                         if (instance.canWrite(template.localUri, { ownPermissionOnly: true }) && Document.createDir(gradleDir)) {
                             try {
-                                if (instance.writeFile(template.localUri, config, { encoding: 'utf-8', ownPermissionOnly: true, throwsPermission: true })) {
-                                    this.add(template.localUri);
-                                }
+                                fs.writeFileSync(template.localUri, config, 'utf8');
+                                this.add(template.localUri);
                             }
                             catch (err) {
-                                this.writeFail(["Unable to write file", path.basename(template.localUri)], err, 8192);
+                                this.writeFail(["Unable to write file", path.basename(template.localUri)], err, 32);
                             }
                         }
                         REGEXP_VERSIONS_LIB.lastIndex = 0;
@@ -365,7 +377,7 @@ function finalize(instance) {
                         let method;
                         while (method = pattern.exec(content)) {
                             let group, name, version;
-                            if (method[1]) {
+                            if ((0, types_1.isString)(method[1])) {
                                 indent ||= method[1];
                             }
                             if (method[3]) {
@@ -409,13 +421,11 @@ function finalize(instance) {
                             }
                         }
                     }
-                    indent ||= (0, util_1.getIndent)(source);
+                    indent ||= (0, util_1.getIndent)(match[1]);
                     content = items.reduce((a, b) => a + indent + writeMethod(kotlin, named, b) + newLine, content);
                     modified = true;
                 }
-                if (modified || !existing) {
-                    setModified((0, util_1.spliceString)(source, match.index, match.index + match[0].length, `dependencies {${content}}`));
-                }
+                setDependencies(match, content);
             }
             if (items.some(seg => seg[0] === 'androidx.compose.ui')) {
                 let output = source;
@@ -441,6 +451,88 @@ function finalize(instance) {
                 setModified(output);
             }
         }
+        if (libraries) {
+            const match = REGEXP_DEPENDENCIES.exec(source);
+            if (match) {
+                let content = match[1], method, indent;
+                const pattern = kotlin ? REGEXP_LIBRARY_KOTLIN : REGEXP_LIBRARY;
+                pattern.lastIndex = 0;
+                while (method = pattern.exec(content)) {
+                    const attr = (method[2] || method[4]);
+                    if ((0, types_1.isArray)(libraries[attr])) {
+                        let index = -1;
+                        switch (attr) {
+                            case 'project':
+                            case 'files': {
+                                const pathname = (0, util_1.trimQuote)(method[3]);
+                                index = libraries[attr].findIndex(value => value === pathname);
+                                break;
+                            }
+                            case 'fileTree': {
+                                const dir = /"dir"\s+to\s+"(.+?)"(?:\s*,|$)/.exec(match[5])?.[1];
+                                const include = /"include"\s+to\s+listOf\((.+?)\)(?:\s*,|$)/.exec(match[5])?.[1];
+                                if (dir && include) {
+                                    const compare = (from, orig) => {
+                                        try {
+                                            return (0, types_1.isArray)(from) && from.sort().toString() === JSON.parse(`[${orig}]`).sort().toString();
+                                        }
+                                        catch {
+                                            return false;
+                                        }
+                                    };
+                                    const target = libraries[attr];
+                                    for (let i = 0; i < target.length; ++i) {
+                                        if (target[i].dir === dir && compare(target[i].include, include)) {
+                                            index = i;
+                                            break;
+                                        }
+                                    }
+                                }
+                                break;
+                            }
+                        }
+                        if (index !== -1) {
+                            libraries[attr].splice(index, 1);
+                        }
+                        if ((0, types_1.isString)(method[1])) {
+                            indent ||= method[1];
+                        }
+                    }
+                }
+                const { project, files, fileTree } = libraries;
+                if ((0, types_1.isArray)(project) || (0, types_1.isArray)(files) || (0, types_1.isArray)(fileTree)) {
+                    indent ||= (0, util_1.getIndent)(match[1]);
+                    const newLine = (0, util_1.getNewline)(source);
+                    const writeImpl = (name, value) => indent + 'implementation' + (kotlin ? `(${name}(${(0, util_1.wrapQuote)(value)}))` : ` ${name}(${(0, util_1.wrapQuote)(value)})`) + newLine;
+                    if ((0, types_1.isArray)(project)) {
+                        content = project.reduce((a, b) => a + writeImpl('project', b), content);
+                        modified = true;
+                    }
+                    if ((0, types_1.isArray)(files)) {
+                        content = files.reduce((a, b) => a + writeImpl('files', b), content);
+                        modified = true;
+                    }
+                    if ((0, types_1.isArray)(fileTree)) {
+                        for (const item of fileTree) {
+                            if ((0, types_1.isString)(item.dir) && (0, types_1.isArray)(item.include)) {
+                                const dir = (0, util_1.wrapQuote)(item.dir);
+                                const include = item.include.map(value => (0, util_1.wrapQuote)(value)).join(', ');
+                                content += indent + 'implementation';
+                                if (kotlin) {
+                                    content += `(fileTree(mapOf("dir" to ${dir}, "include" to listOf(${include}))))`;
+                                }
+                                else {
+                                    content += ` fileTree(dir: ${dir}, include: [${include}])`;
+                                }
+                                content += newLine;
+                                modified = true;
+                            }
+                        }
+                    }
+                    setDependencies(match, content);
+                }
+            }
+        }
         if (upgrade || jvmTarget) {
             const compatibility = 'JavaVersion.VERSION_' + (upgrade ? javaVersion.toString().replace(/\./g, '_') : jvmTarget);
             let output = source;
@@ -469,21 +561,21 @@ function finalize(instance) {
             const targetAPI = instance.targetAPI;
             let output = source;
             if (targetAPI) {
-                const values = typeof targetAPI === 'string' ? [`"android-${targetAPI}"`, `"${targetAPI}"`] : [targetAPI, targetAPI];
-                const updateOnly = +targetAPI >= +"33";
-                let revised = Document.updateGradle(output, ['android'], kotlin ? `compileSdkVersion(${values[0]})` : 'compileSdkVersion ' + values[0], { upgrade: true, updateOnly });
-                if (revised === output) {
-                    output = Document.updateGradle(output, ['android'], kotlin ? `compileSdk(${values[0]})` : 'compileSdk ' + values[0], true);
+                const [compileSdk, targetSdk] = typeof targetAPI === 'string' ? [`"android-${targetAPI}"`, `"${targetAPI}"`] : [targetAPI, targetAPI];
+                const updateOnly = +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);
                 }
                 else {
-                    output = revised;
+                    output = content;
                 }
-                revised = Document.updateGradle(output, ['android', 'defaultConfig'], kotlin ? `targetSdkVersion(${values[1]})` : 'targetSdkVersion ' + values[1], { upgrade: true, updateOnly });
-                if (revised === output) {
-                    output = Document.updateGradle(output, ['android', 'defaultConfig'], kotlin ? `targetSdk(${values[1]})` : 'targetSdk ' + values[1], true);
+                content = Document.updateGradle(output, ['android', 'defaultConfig'], kotlin ? `targetSdkVersion(${targetSdk})` : 'targetSdkVersion ' + targetSdk, { upgrade: true, updateOnly });
+                if (content === output) {
+                    output = Document.updateGradle(output, ['android', 'defaultConfig'], kotlin ? `targetSdk(${targetSdk})` : 'targetSdk ' + targetSdk, true);
                 }
                 else {
-                    output = revised;
+                    output = content;
                 }
                 const version = instance.findVersion('buildToolsVersion');
                 if (version) {
@@ -536,7 +628,7 @@ function finalize(instance) {
         }
         if (modified || !existing) {
             try {
-                if (instance.writeFile(localUri, source, { encoding: 'utf-8', ownPermissionOnly: true, throwsPermission: true }) && !existing) {
+                if (instance.writeFile(localUri, source, { encoding: 'utf8', ownPermissionOnly: true, throwsPermission: true }) && !existing) {
                     this.add(localUri);
                 }
             }
@@ -546,17 +638,11 @@ function finalize(instance) {
         }
     }
     if (!existing) {
-        const template = instance.findTemplate(this.baseDirectory, "build.gradle", { detect: instance.detect(this), languageOf: 'gradle', subDir: 'static' });
-        if (template.localUri && template.source && instance.canWrite(template.localUri, { ownPermissionOnly: true })) {
-            try {
-                if (instance.writeFile(template.localUri, template.source, { encoding: 'utf-8', ownPermissionOnly: true, throwsPermission: true })) {
-                    this.add(template.localUri);
-                }
-            }
-            catch (err) {
-                this.writeFail(["Unable to write file", path.basename(template.localUri)], err, 8192);
-            }
-        }
+        const detect = instance.detect(this);
+        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(properties, this);
         try {
             const projectDir = instance.resolveDir('project');
             if (projectDir) {

package/extensions/gradle/settings/index.js

@@ -12,10 +12,10 @@ function finalize(instance) {
         const targetName = projectName?.replace(/"/g, '\\"');
         let modified = false;
         if (existing) {
-            let match;
             if (dependencies) {
                 found: {
                     const pattern = kotlin ? /^\s*include\(((?:\s*"[^"]+"\s*,?\s*)+)\)/gm : /^\s*include\s*((?:(?:"[^"]+"|'[^']+')\s*,?\s*)+)/gm;
+                    let match;
                     while (match = pattern.exec(source)) {
                         const namespace = /":?([^"]+)"|':?([^']+)'/g;
                         let app;
@@ -40,7 +40,8 @@ function finalize(instance) {
             }
             if (targetName) {
                 const value = `rootProject.name = "${targetName}"`;
-                if (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*' + parse_1.XmlWriter.PATTERN_QUOTEVALUE, 'm').exec(source);
+                if (match) {
                     source = parse_1.XmlWriter.replaceMatch(match, source, value);
                 }
                 else {
@@ -66,7 +67,7 @@ function finalize(instance) {
         }
         if (modified || !existing) {
             try {
-                if (instance.writeFile(localUri, source, { encoding: 'utf-8', ownPermissionOnly: true, throwsPermission: true }) && !existing) {
+                if (instance.writeFile(localUri, source, { encoding: 'utf8', ownPermissionOnly: true, throwsPermission: true }) && !existing) {
                     this.add(localUri);
                 }
             }

package/extensions/task/index.js

@@ -40,7 +40,7 @@ async function finalize(instance) {
         if (!command.includes(path.sep)) {
             filename = checkWin32(command);
         }
-        command = Document.sanitizeCmd(command);
+        command = (0, types_1.sanitizeCmd)(command);
     }
     else {
         filename = checkWin32("gradlew");
@@ -64,7 +64,7 @@ async function finalize(instance) {
             else if (altname) {
                 const bin = which.sync(altname, { nothrow: true });
                 if (bin) {
-                    command = Document.sanitizeCmd(bin);
+                    command = (0, types_1.sanitizeCmd)(bin);
                 }
             }
         }
@@ -89,7 +89,7 @@ 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, Document.sanitizeArgs(args), { cwd: baseDirectory, shell: true, stdio: Document.hasLogType(32768) && !broadcastId ? 'inherit' : undefined, signal: instance.signal, uid, gid })
+            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 })
                 .on('exit', code => {
                 if (!code) {
                     instance.addLog(types_1.STATUS_TYPE.INFO, out);
@@ -102,7 +102,7 @@ async function finalize(instance) {
             })
                 .on('error', reject);
             if (stdout) {
-                stdout.setEncoding('utf-8').on('data', (value) => {
+                stdout.setEncoding('utf8').on('data', (value) => {
                     if (broadcastId) {
                         this.formatMessage(types_1.STATUS_TYPE.INFO, '', value, null, { sessionId: '' });
                     }
@@ -110,7 +110,7 @@ async function finalize(instance) {
                 });
             }
             if (stderr) {
-                stderr.setEncoding('utf-8').on('data', (value) => {
+                stderr.setEncoding('utf8').on('data', (value) => {
                     if (broadcastId) {
                         this.formatMessage(types_1.STATUS_TYPE.ERROR, '', value, null, { sessionId: '' });
                     }

package/index.js

@@ -3,7 +3,9 @@ const fs = require("node:fs");
 const path = require("node:path");
 const types_1 = require("@e-mc/types");
 const Document = require('@e-mc/document');
+const kAndroid = Symbol.for('android:constructor');
 class AndroidDocument extends Document {
+    static [kAndroid] = true;
     static async finalize(instance) {
         if (instance.aborted) {
             return (0, types_1.createAbortError)(true);
@@ -47,6 +49,7 @@ class AndroidDocument extends Document {
         dependencies: undefined,
         dependencyScopes: undefined,
         versionCatalog: undefined,
+        libraries: undefined,
         commands: undefined
     };
     elements = [];
@@ -57,7 +60,7 @@ class AndroidDocument extends Document {
     _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, dataBinding, commands, directories, elements, extensionData } = 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 target = this.config;
             if (projectName) {
                 target.projectName = projectName;
@@ -110,6 +113,9 @@ class AndroidDocument extends Document {
             if ((0, types_1.isArray)(dependencies)) {
                 target.dependencies = dependencies;
             }
+            if ((0, types_1.isPlainObject)(libraries) && Object.keys(libraries).length > 0) {
+                target.libraries = libraries;
+            }
             if (targetAPI) {
                 this.targetAPI = targetAPI;
             }
@@ -165,10 +171,9 @@ class AndroidDocument extends Document {
             case 'font/woff':
             case 'font/woff2': {
                 const instance = host.loadModule('compress');
-                const buffer = host.getBuffer(file);
-                if (instance && buffer) {
-                    const options = { format: 'ttf', etag: file.etag };
-                    await instance.tryFile(buffer, localUri, options)
+                if (instance) {
+                    const options = { format: 'ttf', etag: file.etag, worker: true };
+                    await instance.tryFile(file.buffer || localUri, localUri, options)
                         .then(() => {
                         if (options.outFile) {
                             host.replace(file, options.outFile);
@@ -190,7 +195,8 @@ class AndroidDocument extends Document {
         }
         let kotlin = false, language;
         if (languageOf) {
-            kotlin = (language = this.languageOf(languageOf)) === 'kotlin';
+            language = this.languageOf(languageOf);
+            kotlin = language === 'kotlin';
             if (detect !== false) {
                 const isKts = this.detectKts(baseDir, filename);
                 if (isKts && language === 'java') {
@@ -220,7 +226,7 @@ class AndroidDocument extends Document {
             if (!existing && !(uri = this.resolveDir('template', ...paths))) {
                 throw (0, types_1.errorValue)("File not found", uri);
             }
-            return { localUri, source: fs.readFileSync(uri || localUri, 'utf-8'), existing, kotlin, language };
+            return { localUri, source: fs.readFileSync(uri || localUri, 'utf8'), existing, kotlin, language };
         }
         catch (err) {
             if (options?.throwsDoesNotExist !== false) {
@@ -229,11 +235,22 @@ class AndroidDocument extends Document {
         }
         return { kotlin, language };
     }
+    writeTemplate(data, host = this.host) {
+        if (data.localUri && data.source && this.canWrite(data.localUri, { ownPermissionOnly: true }) && Document.createDir(path.dirname(data.localUri))) {
+            try {
+                fs.writeFileSync(data.localUri, data.source, 'utf8');
+                host?.add(data.localUri);
+            }
+            catch (err) {
+                (host || this).writeFail("Unable to write file", err, 32);
+            }
+        }
+    }
     findData(filename, format) {
         let localUri;
         try {
             if (localUri = this.resolveDir('data', filename)) {
-                return this.tryParse(fs.readFileSync(localUri, 'utf-8'), format || path.extname(localUri).substring(1));
+                return this.tryParse(fs.readFileSync(localUri, 'utf8'), format || path.extname(localUri).substring(1));
             }
         }
         catch (err) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/android",
-  "version": "0.9.3",
+  "version": "0.10.0",
   "description": "Android document constructor for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -20,12 +20,12 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@e-mc/document": "^0.11.4",
-    "@e-mc/types": "^0.11.4",
+    "@e-mc/document": "^0.12.0",
+    "@e-mc/types": "^0.12.0",
     "dom-serializer": "*",
     "domhandler": "*",
     "domutils": "*",
-    "htmlparser2": "^9.1.0",
+    "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.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
+zipStorePath=wrapper/dists

package/template/java/static/build.gradle

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

package/template/java/static/gradle.properties

@@ -0,0 +1,14 @@
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+
+# org.gradle.configuration-cache=false
+# org.gradle.jvmargs=-Xmx512m "-XX:MaxMetaspaceSize=384m"
+# org.gradle.caching=false
+# org.gradle.continue=false
+# org.gradle.daemon=true
+# org.gradle.parallel=false
+# org.gradle.warning.mode=summary
+
+# android.useAndroidX=false
+# android.nonFinalResIds=true
+# android.nonTransitiveRClass=true
+# android.enableR8.fullMode=true

package/template/java+kotlin/build.gradle

@@ -1,6 +1,6 @@
 plugins {
-    id 'com.android.application'
-    id 'org.jetbrains.kotlin.android'
+    alias libs.plugins.android.application
+    alias libs.plugins.kotlin.android
 }
 
 android {
@@ -34,11 +34,14 @@ android {
     buildFeatures {
         viewBinding true
     }
+    lintOptions {
+        checkDependencies false
+    }
 }
 
 dependencies {
-    implementation 'androidx.core:core-ktx:1.15.0'
-    testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.2.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
+    implementation libs.androidx.core.ktx
+    testImplementation libs.junit
+    androidTestImplementation libs.androidx.junit
+    androidTestImplementation libs.androidx.espresso.core
 }

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

@@ -0,0 +1,17 @@
+[versions]
+agp = "8.9.2"
+kotlin = "2.1.20"
+coreKtx = "1.16.0"
+junit = "4.13.2"
+junitVersion = "1.2.1"
+espressoCore = "3.6.1"
+
+[libraries]
+androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
+junit = { group = "junit", name = "junit", version.ref = "junit" }
+androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" }
+androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" }
+
+[plugins]
+android-application = { id = "com.android.application", version.ref = "agp" }
+kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }

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

@@ -1,5 +1,4 @@
 plugins {
-    id 'com.android.application' version '8.9.1' apply false
-    id 'com.android.library' version '8.9.1' apply false
-    id 'org.jetbrains.kotlin.android' version '2.1.20' apply false
+    alias libs.plugins.android.application apply false
+    alias libs.plugins.kotlin.android apply false
 }

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

@@ -0,0 +1,16 @@
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+
+org.gradle.configuration-cache=true
+# org.gradle.jvmargs=-Xmx2048m
+# org.gradle.caching=false
+# org.gradle.continue=false
+# org.gradle.daemon=true
+# org.gradle.parallel=false
+# org.gradle.warning.mode=summary
+
+android.useAndroidX=true
+# android.nonFinalResIds=true
+# android.nonTransitiveRClass=true
+# android.enableR8.fullMode=true
+
+# kotlin.code.style=official

package/template/kotlin/build.gradle.kts

@@ -31,6 +31,9 @@ android {
     buildFeatures {
         viewBinding = true
     }
+    lint {
+        isCheckDependencies = false
+    }
 }
 
 java {
@@ -43,6 +46,7 @@ dependencies {
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.appcompat)
     implementation(libs.androidx.constraintlayout)
+    implementation(libs.android.material)
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.junit)
     androidTestImplementation(libs.androidx.espresso.core)