@pi-r/android 0.3.5 → 0.3.6

package/LICENSE

@@ -1,7 +1,7 @@
-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:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
+Copyright 2023 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:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/README.md

@@ -1,7 +1,5 @@
-# @pi-r/android
-
-PEP 402 - Forever
-
-## LICENSE
-
+# @pi-r/android
+
+## LICENSE
+
 MIT

package/extensions/app/manifest/index.js

@@ -20,14 +20,14 @@ function finalize(instance) {
         const profileable = config.profileable;
         let modified;
         if (!existing) {
-            source = (0, util_1.replaceAll)(source, (name) => {
+            source = (0, util_1.replaceAll)(source.replace(manifestPackage ? '{{package}}' : ' package="{{package}}"', manifestPackage || ''), (name) => {
                 switch (name) {
                     case 'supportsRtl':
                         return supportsRtl === false ? 'false' : 'true';
                     case 'label':
                         return '@string/' + (label || 'app_name');
                     case 'theme':
-                        return '@style/' + (theme || 'Theme.Android2');
+                        return theme ? '@style/' + theme : '';
                     case 'activityName':
                         return activityName || '';
                     case 'profileable':
@@ -45,7 +45,7 @@ function finalize(instance) {
                 }
                 let target = null;
                 if (manifestPackage && (target = domutils.findOne(elem => elem.tagName === 'manifest', dom, true))) {
-                    target.attribs.package = manifestPackage;
+                    target.attribs['package'] = manifestPackage;
                     modified = true;
                 }
                 if (target = domutils.findOne(elem => elem.tagName === 'application', dom, true)) {

package/extensions/gradle/dependencies/index.js

@@ -10,8 +10,7 @@ function finalize(instance) {
     if (!profileable && !dependencies && !dataBinding && !versionName && !versionCode && !config.namespace) {
         return;
     }
-    const detect = this.incremental !== 'staging';
-    let { localUri, source, existing, kotlin } = instance.findTemplate(path.join(this.baseDirectory, config.mainParentDir), "build.gradle", { detect, languageOf: 'gradle' });
+    let { localUri, source, existing, kotlin } = instance.findTemplate(path.join(this.baseDirectory, config.mainParentDir), 'build.gradle', { detect: this.incremental !== 'staging', languageOf: 'gradle' });
     if (localUri && source && instance.canWrite(localUri, { ownPermissionOnly: true })) {
         let { namespace, javaVersion } = config, jvmTarget, modified;
         const upgrade = javaVersion > 0;
@@ -97,9 +96,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.22")}'` });
+                    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.24")}'` });
                     output = Document.updateGradle(output, ['android', 'buildFeatures'], "compose true");
-                    output = Document.updateGradle(output, ['android', 'composeOptions'], `kotlinCompilerExtensionVersion '${instance.findVersion('kotlinCompilerExtensionVersion', "1.5.9")}'`, true);
+                    output = Document.updateGradle(output, ['android', 'composeOptions'], `kotlinCompilerExtensionVersion '${instance.findVersion('kotlinCompilerExtensionVersion', "1.5.14")}'`, true);
                     if (upgrade) {
                         output = Document.updateGradle(output, ['android', 'kotlinOptions'], `jvmTarget = '${javaVersion}'`, true);
                     }
@@ -201,19 +200,6 @@ function finalize(instance) {
             }
         }
     }
-    if (!existing) {
-        ({ localUri, source, existing, kotlin } = instance.findTemplate(this.baseDirectory, "build.gradle", { detect, languageOf: 'gradle', subDir: 'static' }));
-        if (localUri && source && instance.canWrite(localUri, { ownPermissionOnly: true })) {
-            try {
-                if (instance.writeFile(localUri, source, { encoding: 'utf-8', ownPermissionOnly: true, throwsPermission: true })) {
-                    this.add(localUri);
-                }
-            }
-            catch (err) {
-                this.writeFail(["Unable to write file", path.basename(localUri)], err, 8192);
-            }
-        }
-    }
 }
 
 module.exports = finalize;

package/extensions/gradle/settings/index.js

@@ -3,13 +3,14 @@ const path = require("path");
 const util_1 = require("@e-mc/document/util");
 const parse_1 = require("@e-mc/document/parse");
 function finalize(instance) {
-    const { dependencies, projectName, manifest, mainParentDir } = instance.config;
+    const { dependencies, projectName, mainParentDir } = instance.config;
     if (!dependencies && !projectName) {
         return;
     }
     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 === null || projectName === void 0 ? void 0 : projectName.replace(/"/g, '\\"'), modified;
+        const targetName = projectName ? projectName.replace(/"/g, '\\"') : '';
+        let modified;
         if (existing) {
             let match;
             if (dependencies) {
@@ -49,14 +50,10 @@ function finalize(instance) {
             }
         }
         else {
-            if (!targetName && (targetName = manifest === null || manifest === void 0 ? void 0 : manifest.package)) {
-                const index = targetName.lastIndexOf('.');
-                targetName = index !== -1 ? targetName.substring(index + 1) : '';
-            }
             source = (0, util_1.replaceAll)(source, (name) => {
                 switch (name) {
                     case 'projectName':
-                        return targetName || '';
+                        return targetName;
                     case 'name':
                         return ':' + mainParentDir;
                     default:

package/extensions/task/index.js

@@ -5,7 +5,7 @@ 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;
+    var _a, _b, _c;
     const commands = instance.config.commands;
     if (!commands || this.incremental === 'staging') {
         return;
@@ -25,15 +25,13 @@ async function finalize(instance) {
     else {
         return;
     }
-    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;
+    let { broadcastId, baseDirectory } = this, command = (_b = (_a = instance.settings.extensions) === null || _a === void 0 ? void 0 : _a.task) === null || _b === void 0 ? void 0 : _b.command, title, name, foundCwd;
     if (command) {
         if (command.indexOf('mvn') !== -1) {
             title = 'maven';
         }
         else {
-            title = ((_b = /([^\\/]+?)(?:\.[a-z]+)?$/i.exec(command)) === null || _b === void 0 ? void 0 : _b[1]) || 'SPAWN';
+            title = ((_c = /([^\\/]+?)(?:\.[a-z]+)?$/i.exec(command)) === null || _c === void 0 ? void 0 : _c[1]) || 'SPAWN';
         }
         command = path.normalize(command);
         if (!command.includes(path.sep)) {
@@ -63,15 +61,6 @@ async function finalize(instance) {
         catch {
         }
     }
-    if ((0, types_1.isPlainObject)(exec)) {
-        let { uid: u, gid: g } = exec;
-        if ((u = parseInt(u)) >= 0) {
-            uid = u;
-        }
-        if ((g = parseInt(g)) >= 0) {
-            gid = g;
-        }
-    }
     for (const args of taskArgs) {
         if (instance.aborted) {
             return Promise.reject((0, types_1.createAbortError)());
@@ -81,7 +70,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, Document.sanitizeArgs(args), { cwd: baseDirectory, shell: true, stdio: Document.hasLogType(32768) && !broadcastId ? 'inherit' : undefined, signal: instance.signal })
                 .on('exit', code => {
                 if (!code) {
                     instance.addLog(types_1.STATUS_TYPE.INFO, out);

package/index.d.ts

@@ -1,7 +1,7 @@
-import type { IFileManager } from '@e-mc/types/lib';
-
-import type { AndroidDocumentConstructor, DocumentAsset } from './types';
-
-declare const Android: AndroidDocumentConstructor<IFileManager<DocumentAsset>>;
-
+import type { IFileManager } from '@e-mc/types/lib';
+
+import type { AndroidDocumentConstructor, DocumentAsset } from './types';
+
+declare const Android: AndroidDocumentConstructor<IFileManager<DocumentAsset>>;
+
 export = Android;

package/index.js

@@ -162,9 +162,9 @@ class AndroidDocument extends Document {
     }
     findTemplate(baseDir, filename, options) {
         var _a;
-        let detect, languageOf, subDir;
+        let detect, languageOf;
         if (options) {
-            ({ detect, languageOf, subDir } = options);
+            ({ detect, languageOf } = options);
         }
         let kotlin, language;
         if (languageOf) {
@@ -178,14 +178,7 @@ class AndroidDocument extends Document {
         const localUri = path.join(baseDir, filename);
         try {
             const existing = detect && fs.existsSync(localUri);
-            const paths = [];
-            if (language) {
-                paths.push(language);
-            }
-            if (subDir) {
-                paths.push(...Array.isArray(subDir) ? subDir : [subDir]);
-            }
-            paths.push(filename);
+            const paths = language ? [language, filename] : [filename];
             let uri;
             if (!existing && !(uri = this.resolveDir('template', ...paths)) && !fs.existsSync(uri = path.join(__dirname, 'template', ...paths))) {
                 throw (0, types_1.errorValue)("File not found", uri);

package/package.json

@@ -1,27 +1,30 @@
-{
-  "name": "@pi-r/android",
-  "version": "0.3.5",
-  "description": "Android document constructor for E-mc.",
-  "main": "index.js",
-  "publishConfig": {
-    "access": "public"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/anpham6/pi-r.git",
-    "directory": "src/module/android"
-  },
-  "keywords": [
-    "squared",
-    "e-mc",
-    "squared-functions"
-  ],
-  "author": "An Pham <anpham6@gmail.com>",
-  "license": "MIT",
-  "homepage": "https://github.com/anpham6/pi-r#readme",
-  "dependencies": {
-    "@e-mc/document": "^0.6.7",
-    "@e-mc/types": "^0.6.7",
-    "htmlparser2": "^9.1.0"
-  }
-}
+{
+  "name": "@pi-r/android",
+  "version": "0.3.6",
+  "description": "Android document constructor for E-mc.",
+  "main": "index.js",
+  "publishConfig": {
+    "access": "public"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/anpham6/pi-r.git",
+    "directory": "src/module/android"
+  },
+  "keywords": [
+    "squared",
+    "e-mc",
+    "squared-functions"
+  ],
+  "author": "An Pham <anpham6@gmail.com>",
+  "license": "MIT",
+  "homepage": "https://github.com/anpham6/pi-r#readme",
+  "dependencies": {
+    "@e-mc/document": "^0.6.16",
+    "@e-mc/types": "^0.6.16",
+    "dom-serializer": "^2.0.0",
+    "domhandler": "^5.0.3",
+    "domutils": "^3.1.0",
+    "htmlparser2": "^9.1.0"
+  }
+}

package/template/AndroidManifest.xml

@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <application
-        android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
-        android:label="{{label}}"
-        android:roundIcon="@mipmap/ic_launcher_round"
-        android:supportsRtl="{{supportsRtl}}"
-        android:theme="{{theme}}">
-        <activity
-            android:name="{{activityName}}"
-            android:exported="true"
-            android:label="{{label}}"
-            android:theme="{{theme}}">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-        <profileable android:shell="true" android:enabled="{{profileable}}" />
-    </application>
-
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <application
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="{{label}}"
+        android:roundIcon="@mipmap/ic_launcher_round"
+        android:supportsRtl="{{supportsRtl}}"
+        android:theme="{{theme}}">
+        <activity
+            android:name="{{activityName}}"
+            android:exported="true"
+            android:label="{{label}}"
+            android:theme="{{theme}}">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <profileable android:shell="true" android:enabled="{{profileable}}" />
+    </application>
+
 </manifest>

package/template/java/build.gradle

@@ -1,39 +1,39 @@
-plugins {
-    id 'com.android.application'
-}
-
-android {
-    namespace ''
-    compileSdk 34
-
-    defaultConfig {
-        applicationId ''
-        minSdk 21
-        targetSdk 34
-        versionCode 1
-        versionName '1.0'
-
-        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
-    }
-    buildTypes {
-        release {
-            debuggable false
-            minifyEnabled true
-            shrinkResources false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-    buildFeatures {
-        viewBinding false
-    }
-}
-
-dependencies {
-    testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+plugins {
+    id 'com.android.application'
+}
+
+android {
+    namespace ''
+    compileSdk 34
+
+    defaultConfig {
+        applicationId ''
+        minSdk 21
+        targetSdk 34
+        versionCode 1
+        versionName '1.0'
+
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
+    }
+    buildTypes {
+        release {
+            debuggable false
+            minifyEnabled true
+            shrinkResources false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    buildFeatures {
+        viewBinding false
+    }
+}
+
+dependencies {
+    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/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.2.0' apply false
-    id 'com.android.library' version '8.2.0' apply false
+plugins {
+    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

@@ -1,44 +1,44 @@
-plugins {
-    id 'com.android.application'
-    id 'org.jetbrains.kotlin.android'
-}
-
-android {
-    namespace ''
-    compileSdk 34
-
-    defaultConfig {
-        applicationId ''
-        minSdk 21
-        targetSdk 34
-        versionCode 1
-        versionName '1.0'
-
-        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
-    }
-    buildTypes {
-        release {
-            debuggable false
-            minifyEnabled true
-            shrinkResources false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-    kotlinOptions {
-        jvmTarget = '1.8'
-    }
-    buildFeatures {
-        viewBinding false
-    }
-}
-
-dependencies {
-    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'
+plugins {
+    id 'com.android.application'
+    id 'org.jetbrains.kotlin.android'
+}
+
+android {
+    namespace ''
+    compileSdk 34
+
+    defaultConfig {
+        applicationId ''
+        minSdk 21
+        targetSdk 34
+        versionCode 1
+        versionName '1.0'
+
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
+    }
+    buildTypes {
+        release {
+            debuggable false
+            minifyEnabled true
+            shrinkResources false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
+    buildFeatures {
+        viewBinding false
+    }
+}
+
+dependencies {
+    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/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+kotlin/static/build.gradle

@@ -1,5 +1,5 @@
-plugins {
-    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
+plugins {
+    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

@@ -1,46 +1,46 @@
-plugins {
-    id("com.android.application")
-    id("org.jetbrains.kotlin.android")
-}
-
-android {
-    namespace = ""
-    compileSdk = 34
-
-    defaultConfig {
-        applicationId = ""
-        minSdk = 21
-        targetSdk = 34
-        versionCode = 1
-        versionName = "1.0"
-
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-    }
-    buildTypes {
-        release {
-            isDebuggable = false
-            isMinifyEnabled = true
-            isShrinkResources = false
-            proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
-        }
-    }
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-    buildFeatures {
-        viewBinding = true
-    }
-}
-
-java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
-}
-
-dependencies {
-    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")
+plugins {
+    id("com.android.application")
+    id("org.jetbrains.kotlin.android")
+}
+
+android {
+    namespace = ""
+    compileSdk = 34
+
+    defaultConfig {
+        applicationId = ""
+        minSdk = 21
+        targetSdk = 34
+        versionCode = 1
+        versionName = "1.0"
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+    }
+    buildTypes {
+        release {
+            isDebuggable = false
+            isMinifyEnabled = true
+            isShrinkResources = false
+            proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
+        }
+    }
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+    buildFeatures {
+        viewBinding = true
+    }
+}
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
+
+dependencies {
+    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/settings.gradle.kts

@@ -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/kotlin/static/build.gradle.kts

@@ -1,5 +1,5 @@
-plugins {
-    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
+plugins {
+    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/types/index.d.ts

@@ -1,69 +1,67 @@
-import type { FinalizedElement } from '@e-mc/types/lib/squared';
-
-import type { DocumentConstructor, IDocument, IFileManager } from '@e-mc/types/lib';
-import type { ExternalAsset } from '@e-mc/types/lib/asset';
-import type { DocumentDirectory as IDocumentDirectory, DocumentModule as IDocumentModule, ExecAction } from '@e-mc/types/lib/settings';
-
-import type { DocumentOutput } from './squared';
-
-interface DocumentDirectory extends IDocumentDirectory {
-    template?: string;
-}
-
-interface AndroidDocumentSettings extends PlainObject {
-    extensions?: {
-        task?: {
-            exec?: ExecAction;
-            command?: string;
-        };
-    };
-    language?: {
-        gradle?: "java" | "kotlin" | "java+kotlin";
-    };
-    directory?: DocumentDirectory;
-}
-
-type LanguageType = "gradle";
-type DocumentProperties = "targetAPI" | "elements" | "extensionData" | "directories";
-
-export interface UserConfig extends Omit<DocumentOutput, DocumentProperties> {
-    mainParentDir: string;
-    mainSrcDir: string;
-    mainActivityFile: string;
-    javaVersion: number;
-    dataBinding: boolean;
-}
-
-export interface DocumentModule extends IDocumentModule {
-    settings?: AndroidDocumentSettings;
-}
-
-export interface TemplateData {
-    localUri?: string;
-    source?: string;
-    existing?: boolean;
-    kotlin?: boolean;
-    language?: string;
-}
-
-export interface FindTemplateOptions {
-    detect?: boolean;
-    languageOf?: LanguageType;
-    subDir?: ArrayOf<string>;
-}
-
-export interface IAndroidDocument<T extends IFileManager<U>, U extends DocumentAsset = DocumentAsset> extends IDocument<T, U>, Pick<DocumentOutput, DocumentProperties> {
-    config: UserConfig;
-    elements: FinalizedElement[];
-    extensionData: PlainObject;
-    findTemplate(baseDir: string, filename: string, options?: FindTemplateOptions): TemplateData;
-    detectKts(...paths: string[]): Null<boolean>;
-    get settings(): AndroidDocumentSettings;
-}
-
-export interface AndroidDocumentConstructor<T extends IFileManager<U>, U extends DocumentAsset = DocumentAsset> extends DocumentConstructor<T, U> {
-    readonly prototype: IAndroidDocument<T, U>;
-    new(module?: DocumentModule, ...args: unknown[]): IAndroidDocument<T, U>;
-}
-
+import type { FinalizedElement } from '@e-mc/types/lib/squared';
+
+import type { DocumentConstructor, IDocument, IFileManager } from '@e-mc/types/lib';
+import type { ExternalAsset } from '@e-mc/types/lib/asset';
+import type { DocumentDirectory as IDocumentDirectory, DocumentModule as IDocumentModule } from '@e-mc/types/lib/settings';
+
+import type { DocumentOutput } from './squared';
+
+interface DocumentDirectory extends IDocumentDirectory {
+    template?: string;
+}
+
+interface AndroidDocumentSettings extends PlainObject {
+    extensions?: {
+        task?: {
+            command?: string;
+        };
+    };
+    language?: {
+        gradle?: "java" | "kotlin" | "java+kotlin";
+    };
+    directory?: DocumentDirectory;
+}
+
+type LanguageType = "gradle";
+type DocumentProperties = "targetAPI" | "elements" | "extensionData" | "directories";
+
+export interface UserConfig extends Omit<DocumentOutput, DocumentProperties> {
+    mainParentDir: string;
+    mainSrcDir: string;
+    mainActivityFile: string;
+    javaVersion: number;
+    dataBinding: boolean;
+}
+
+export interface DocumentModule extends IDocumentModule {
+    settings?: AndroidDocumentSettings;
+}
+
+export interface TemplateData {
+    localUri?: string;
+    source?: string;
+    existing?: boolean;
+    kotlin?: boolean;
+    language?: string;
+}
+
+export interface FindTemplateOptions {
+    detect?: boolean;
+    languageOf?: LanguageType;
+}
+
+export interface IAndroidDocument<T extends IFileManager<U>, U extends DocumentAsset = DocumentAsset> extends IDocument<T, U>, Pick<DocumentOutput, DocumentProperties> {
+    config: UserConfig;
+    elements: FinalizedElement[];
+    extensionData: PlainObject;
+    findTemplate(baseDir: string, filename: string, options?: FindTemplateOptions): TemplateData;
+    detectKts(...paths: string[]): Null<boolean>;
+    get settings(): AndroidDocumentSettings;
+}
+
+export interface AndroidDocumentConstructor<T extends IFileManager<U>, U extends DocumentAsset = DocumentAsset> extends DocumentConstructor<T, U> {
+    readonly prototype: IAndroidDocument<T, U>;
+    new(module?: DocumentModule, ...args: unknown[]): IAndroidDocument<T, U>;
+}
+
 export type DocumentAsset = ExternalAsset;

package/types/squared.d.ts

@@ -1,53 +1,53 @@
-import type { FinalizedElement, ControllerSettingsDirectoryUI as IControllerSettingsDirectoryUI } from '@e-mc/types/lib/squared';
-
-import type { ExternalAsset } from '@e-mc/types/lib/asset';
-import type { RequestData as IRequestData } from '@e-mc/types/lib/node';
-
-export interface DocumentOutput {
-    targetAPI?: NumString;
-    manifest?: ManifestData;
-    namespace?: string;
-    profileable?: boolean | StringOfArray;
-    dependencies?: string[];
-    directories?: ControllerSettingsDirectoryUI;
-    elements?: FinalizedElement[];
-    projectName?: string;
-    mainParentDir?: string;
-    mainSrcDir?: string;
-    mainActivityFile?: string;
-    javaVersion?: NumString;
-    versionName?: string;
-    versionCode?: number;
-    dataBinding?: boolean;
-    commands?: ArrayOf<StringOfArray>;
-    extensionData?: PlainObject;
-}
-
-export interface RequestData extends IRequestData<ExternalAsset>, DocumentOutput {}
-
-export interface ManifestData {
-    package?: string;
-    application?: {
-        supportsRtl?: boolean;
-        label?: string;
-        theme?: string;
-        metaData?: { name?: string; resource?: string; value?: string }[];
-        activity?: ObjectMap<{
-            layout?: {
-                defaultWidth?: string;
-                defaultHeight?: string;
-                minWidth?: string;
-                minHeight?: string;
-                gravity?: string;
-            };
-        }>;
-        activityName?: string;
-        fontProvider?: string;
-    };
-}
-
-export interface ControllerSettingsDirectoryUI extends IControllerSettingsDirectoryUI {
-    main: string;
-    animation: string;
-    theme: string;
+import type { FinalizedElement, ControllerSettingsDirectoryUI as IControllerSettingsDirectoryUI } from '@e-mc/types/lib/squared';
+
+import type { ExternalAsset } from '@e-mc/types/lib/asset';
+import type { RequestData as IRequestData } from '@e-mc/types/lib/node';
+
+export interface DocumentOutput {
+    targetAPI?: NumString;
+    manifest?: ManifestData;
+    namespace?: string;
+    profileable?: boolean | StringOfArray;
+    dependencies?: string[];
+    directories?: ControllerSettingsDirectoryUI;
+    elements?: FinalizedElement[];
+    projectName?: string;
+    mainParentDir?: string;
+    mainSrcDir?: string;
+    mainActivityFile?: string;
+    javaVersion?: NumString;
+    versionName?: string;
+    versionCode?: number;
+    dataBinding?: boolean;
+    commands?: ArrayOf<StringOfArray>;
+    extensionData?: PlainObject;
+}
+
+export interface RequestData extends IRequestData<ExternalAsset>, DocumentOutput {}
+
+export interface ManifestData {
+    package?: string;
+    application?: {
+        supportsRtl?: boolean;
+        label?: string;
+        theme?: string;
+        metaData?: { name?: string; resource?: string; value?: string }[];
+        activity?: ObjectMap<{
+            layout?: {
+                defaultWidth?: string;
+                defaultHeight?: string;
+                minWidth?: string;
+                minHeight?: string;
+                gravity?: string;
+            };
+        }>;
+        activityName?: string;
+        fontProvider?: string;
+    };
+}
+
+export interface ControllerSettingsDirectoryUI extends IControllerSettingsDirectoryUI {
+    main: string;
+    animation: string;
+    theme: string;
 }