@pi-r/android 0.7.3 → 0.8.1

package/extensions/task/index.js

@@ -3,10 +3,10 @@ const path = require("path");
 const fs = require("fs");
 const child_process = require("child_process");
 const which = require("which");
-const types_1 = require("@e-mc/types");
 const Document = require("@e-mc/document");
-const checkWin32 = (value) => value === "gradlew" && process.platform === 'win32' ? value + '.bat' : value;
-module.exports = async function finalize(instance) {
+const types_1 = require("@e-mc/types");
+const checkWin32 = (value) => value === "gradlew" && Document.PLATFORM_WIN32 ? value + '.bat' : value;
+async function finalize(instance) {
     const commands = instance.config.commands;
     if (!commands || this.incremental === 'staging') {
         return;
@@ -99,7 +99,7 @@ module.exports = async function finalize(instance) {
                     reject((0, types_1.errorValue)(message || (!foundDir && code === 1 ? "Unable to execute file" : "Unknown"), "Error code" + ': ' + code));
                 }
             })
-                .on('error', err => reject(err));
+                .on('error', reject);
             if (stdout) {
                 stdout.setEncoding('utf-8').on('data', (value) => {
                     if (broadcastId) {
@@ -117,6 +117,9 @@ module.exports = async function finalize(instance) {
                 });
             }
         })
-            .catch((err) => instance.writeFail(["Unable to perform task", command + ' ' + task], err, { type: 4, startTime }));
+            .catch((err) => {
+            instance.writeFail(["Unable to perform task", command + ' ' + task], err, { type: 4, startTime });
+        });
     }
-};
+}
+module.exports = finalize;

package/index.js

@@ -8,7 +8,7 @@ class AndroidDocument extends Document {
         if (instance.aborted) {
             return (0, types_1.createAbortError)(true);
         }
-        if (instance.extensions.length) {
+        if (instance.extensions.length > 0) {
             const config = instance.config;
             const mainActivityFile = config.mainActivityFile;
             if (mainActivityFile && !path.isAbsolute(mainActivityFile)) {
@@ -35,6 +35,7 @@ class AndroidDocument extends Document {
         mainSrcDir: 'src/main',
         mainActivityFile: '',
         javaVersion: 0,
+        jvmToolchain: 0,
         dataBinding: false,
         projectName: undefined,
         versionName: undefined,
@@ -45,6 +46,7 @@ class AndroidDocument extends Document {
         profileable: undefined,
         dependencies: undefined,
         dependencyScopes: undefined,
+        versionCatalog: undefined,
         commands: undefined
     };
     elements = [];
@@ -55,7 +57,7 @@ class AndroidDocument extends Document {
     _threadable = true;
     init(assets, config) {
         if (config) {
-            const { targetAPI, mainParentDir, mainSrcDir, mainActivityFile, javaVersion, projectName, versionName, versionCode = 0, manifest, namespace, applicationId, profileable, dependencies, dependencyScopes, dataBinding, commands, directories, elements, extensionData } = 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 target = this.config;
             if (projectName) {
                 target.projectName = projectName;
@@ -78,30 +80,36 @@ class AndroidDocument extends Document {
             if (versionName) {
                 target.versionName = versionName;
             }
+            if (commands) {
+                target.commands = commands;
+            }
+            if (jvmToolchain) {
+                target.jvmToolchain = jvmToolchain;
+            }
+            if (dependencyScopes) {
+                target.dependencyScopes = dependencyScopes;
+            }
+            if (dataBinding) {
+                target.dataBinding = true;
+            }
             if ((0, types_1.isPlainObject)(manifest)) {
                 target.manifest = manifest;
             }
             if (profileable !== undefined) {
                 target.profileable = profileable;
             }
+            if (typeof versionCatalog === 'boolean') {
+                target.versionCatalog = versionCatalog;
+            }
             if (versionCode >= 1) {
                 target.versionCode = Math.min(Math.ceil(versionCode), 2100000000);
             }
-            if (commands) {
-                target.commands = commands;
-            }
             if (javaVersion) {
                 target.javaVersion = typeof javaVersion === 'string' ? +javaVersion.replace(/_/g, '.') : javaVersion;
             }
-            if (dataBinding) {
-                target.dataBinding = true;
-            }
             if ((0, types_1.isArray)(dependencies)) {
                 target.dependencies = dependencies;
             }
-            if (dependencyScopes) {
-                target.dependencyScopes = dependencyScopes;
-            }
             if (targetAPI) {
                 this.targetAPI = targetAPI;
             }
@@ -129,6 +137,12 @@ class AndroidDocument extends Document {
         }
         return super.findVersion(name, fallback);
     }
+    resolveDir(name, ...paths) {
+        let result = super.resolveDir(name, ...paths);
+        if (result || fs.existsSync(result = path.join(__dirname, name, ...paths))) {
+            return result;
+        }
+    }
     async using(data) {
         if (this.aborted) {
             return (0, types_1.createAbortError)(true);
@@ -176,7 +190,7 @@ class AndroidDocument extends Document {
         }
         let kotlin, language;
         if (languageOf) {
-            kotlin = (language = this.settings.language?.[languageOf]) === 'kotlin';
+            kotlin = (language = this.languageOf(languageOf)) === 'kotlin';
             if (detect !== false) {
                 const isKts = this.detectKts(baseDir, filename);
                 if (isKts && language === 'java') {
@@ -203,25 +217,27 @@ class AndroidDocument extends Document {
             }
             paths.push(filename);
             let uri;
-            if (!existing && !(uri = this.resolveDir('template', ...paths)) && !fs.existsSync(uri = path.join(__dirname, 'template', ...paths))) {
+            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 };
         }
         catch (err) {
-            this.writeFail(["Unable to read file", path.basename(localUri)], err, 32);
+            if (options?.throwsDoesNotExist !== false) {
+                this.writeFail(["Unable to read file", path.basename(localUri)], err, 32);
+            }
         }
         return { kotlin, language };
     }
     findData(filename, format) {
         let localUri;
-        if ((localUri = this.resolveDir('data', filename)) || Document.isPath(localUri = path.join(__dirname, 'data', filename))) {
-            try {
+        try {
+            if (localUri = this.resolveDir('data', filename)) {
                 return this.tryParse(fs.readFileSync(localUri, 'utf-8'), format || path.extname(localUri).substring(1));
             }
-            catch (err) {
-                this.writeFail(["Unable to read file", path.basename(localUri)], err, 32);
-            }
+        }
+        catch (err) {
+            this.writeFail(["Unable to read file", localUri && path.basename(localUri)], err, 32);
         }
         return null;
     }
@@ -239,6 +255,15 @@ class AndroidDocument extends Document {
         }
         return null;
     }
+    languageOf(name, value) {
+        const result = this.settings.language?.[name];
+        if (result && (!value || value === result)) {
+            return result;
+        }
+    }
+    detect(host = this.host) {
+        return host?.incremental !== 'staging';
+    }
     get settings() {
         return this.module.settings ||= {};
     }

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "@pi-r/android",
-  "version": "0.7.3",
+  "version": "0.8.1",
   "description": "Android document constructor for E-mc.",
   "main": "index.js",
+  "types": "index.d.ts",
   "publishConfig": {
     "access": "public"
   },
@@ -20,8 +21,8 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@e-mc/document": "^0.9.6",
-    "@e-mc/types": "^0.9.6",
+    "@e-mc/document": "^0.10.0",
+    "@e-mc/types": "^0.10.0",
     "htmlparser2": "^9.1.0",
     "which": "^2.0.2"
   }

package/project/${app}/${src}/res/drawable/ic_launcher_background.xml

@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path
+        android:fillColor="#3DDC84"
+        android:pathData="M0,0h108v108h-108z" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M9,0L9,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,0L19,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,0L29,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,0L39,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,0L49,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,0L59,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,0L69,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,0L79,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M89,0L89,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M99,0L99,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,9L108,9"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,19L108,19"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,29L108,29"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,39L108,39"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,49L108,49"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,59L108,59"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,69L108,69"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,79L108,79"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,89L108,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,99L108,99"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,29L89,29"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,39L89,39"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,49L89,49"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,59L89,59"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,69L89,69"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,79L89,79"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,19L29,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,19L39,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,19L49,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,19L59,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,19L69,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,19L79,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+</vector>

package/project/${app}/${src}/res/drawable/ic_launcher_foreground.xml

@@ -0,0 +1,30 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:endX="85.84757"
+                android:endY="92.4963"
+                android:startX="42.9492"
+                android:startY="49.59793"
+                android:type="linear">
+                <item
+                    android:color="#44000000"
+                    android:offset="0.0" />
+                <item
+                    android:color="#00000000"
+                    android:offset="1.0" />
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path
+        android:fillColor="#FFFFFF"
+        android:fillType="nonZero"
+        android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000" />
+</vector>

package/project/${app}/${src}/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>

package/project/${app}/${src}/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>

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

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

package/project/gradle.properties

@@ -0,0 +1,4 @@
+org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
+android.useAndroidX=true
+kotlin.code.style=official
+android.nonTransitiveRClass=true

package/template/java/build.gradle

@@ -4,12 +4,12 @@ plugins {
 
 android {
     namespace ''
-    compileSdk 34
+    compileSdk 35
 
     defaultConfig {
         applicationId ''
         minSdk 21
-        targetSdk 34
+        targetSdk 35
         versionCode 1
         versionName '1.0'
 
@@ -35,5 +35,5 @@ android {
 dependencies {
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
 }

package/template/java/static/build.gradle

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

package/template/java+kotlin/build.gradle

@@ -5,12 +5,12 @@ plugins {
 
 android {
     namespace ''
-    compileSdk 34
+    compileSdk 35
 
     defaultConfig {
         applicationId ''
         minSdk 21
-        targetSdk 34
+        targetSdk 35
         versionCode 1
         versionName '1.0'
 
@@ -40,5 +40,5 @@ dependencies {
     implementation 'androidx.core:core-ktx:1.13.1'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
 }

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

@@ -1,5 +1,5 @@
 plugins {
-    id 'com.android.application' version '8.4.0' apply false
-    id 'com.android.library' version '8.4.0' apply false
-    id 'org.jetbrains.kotlin.android' version '1.9.24' apply false
+    id 'com.android.application' version '8.5.2' apply false
+    id 'com.android.library' version '8.5.2' apply false
+    id 'org.jetbrains.kotlin.android' version '1.9.25' apply false
 }

package/template/kotlin/build.gradle.kts

@@ -1,16 +1,17 @@
 plugins {
-    id("com.android.application")
-    id("org.jetbrains.kotlin.android")
+    alias(libs.plugins.android.application)
+    alias(libs.plugins.jetbrains.kotlin.android)
+    alias(libs.plugins.jetbrains.kotlin.compose)
 }
 
 android {
     namespace = ""
-    compileSdk = 34
+    compileSdk = 35
 
     defaultConfig {
         applicationId = ""
         minSdk = 21
-        targetSdk = 34
+        targetSdk = 35
         versionCode = 1
         versionName = "1.0"
 
@@ -38,9 +39,11 @@ java {
 }
 
 dependencies {
-    implementation("org.jetbrains.kotlin:kotlin-stdlib:1.9.24")
-    implementation("androidx.core:core-ktx:1.13.1")
-    testImplementation("junit:junit:4.13.2")
-    androidTestImplementation("androidx.test.ext:junit:1.1.5")
-    androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
+    implementation(libs.jetbrains.kotlin)
+    implementation(libs.androidx.core.ktx)
+    implementation(libs.androidx.appcompat)
+    implementation(libs.androidx.constraintlayout)
+    testImplementation(libs.junit)
+    androidTestImplementation(libs.androidx.junit)
+    androidTestImplementation(libs.androidx.espresso.core)
 }

package/template/kotlin/libs.versions.toml

@@ -0,0 +1,23 @@
+[versions]
+agp = "8.5.2"
+kotlin = "2.0.20"
+coreKtx = "1.13.1"
+junit = "4.13.2"
+junitVersion = "1.2.1"
+espressoCore = "3.6.1"
+appcompat = "1.7.0"
+constraintlayout = "2.1.4"
+
+[libraries]
+androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
+jetbrains-kotlin = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib", version.ref = "kotlin" }
+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" }
+androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
+androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "constraintlayout" }
+
+[plugins]
+android-application = { id = "com.android.application", version.ref = "agp" }
+jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
+jetbrains-kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }

package/template/kotlin/settings.gradle.kts

@@ -1,3 +1,5 @@
+val snapshotVersion : String? = System.getenv("ANDROIDX_SNAPSHOT_ID")
+
 pluginManagement {
     repositories {
         google()
@@ -9,6 +11,10 @@ pluginManagement {
 dependencyResolutionManagement {
     repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
     repositories {
+        snapshotVersion?.let {
+            println("https://androidx.dev/snapshots/builds/$it/artifacts/repository/")
+            maven { url = uri("https://androidx.dev/snapshots/builds/$it/artifacts/repository/") }
+        }
         google()
         mavenCentral()
     }

package/template/kotlin/static/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("com.android.application") version "8.4.0" apply false
-    id("com.android.library") version "8.4.0" apply false
-    id("org.jetbrains.kotlin.android") version "1.9.24" apply false
+    alias(libs.plugins.android.application) apply false
+    alias(libs.plugins.jetbrains.kotlin.android) apply false
+    alias(libs.plugins.jetbrains.kotlin.compose) apply false
 }