@pi-r/android 0.3.0 → 0.3.1

package/extensions/gradle/dependencies/index.js

@@ -26,7 +26,7 @@ function finalize(instance) {
             if (!kotlin && items.some(value => value[1].endsWith('-ktx'))) {
                 setModified(Document.updateGradle(source, ['plugins'], "id 'kotlin-android'", { multiple: true }));
             }
-            const match = /dependencies\s+\{([^}]+)\}/.exec(source);
+            const match = /dependencies\s+\{((?:{[^}]*}|(?![{}])[\S\s])+)\}/.exec(source);
             if (match) {
                 const writeImpl = (item) => 'implementation' + (kotlin ? `("${item.join(':')}")` : ` '${item.join(':')}'`);
                 const pattern = kotlin ? /([ \t]*)implementation\((?:\s*"([^"]+)"\s*\))?/g : /([ \t]*)implementation(?:\s*\(?\s*["']([^"']+)["']\s*\)?|\s+((?:\s*(?:group|name|version)\s*:\s*["'][^"']+["']\s*,?){3}))?/g;
@@ -59,12 +59,25 @@ function finalize(instance) {
                         if (version && (index = items.findIndex(seg => seg[0] === group && seg[1] === name)) !== -1) {
                             found = 1;
                             if (version[0] !== '$' || !kotlin && impl[0].indexOf("'") !== -1) {
-                                const current = items[index][2].split('.').map(seg => +seg);
-                                const parts = version.split('.');
-                                for (let i = 0, value; i < parts.length; ++i) {
-                                    if (isNaN(value = +parts[i]) || +current[i] > value) {
-                                        found = 2;
-                                        break;
+                                const semver = /^((\s*,\s*)?[([\]]((\s*,\s*)?\d+\.\d+(\s*,\s*)?)+[)\][])+$/;
+                                const pending = items[index][2];
+                                if (semver.test(pending)) {
+                                    found = 2;
+                                }
+                                else if (!semver.test(version)) {
+                                    const getArray = (value) => value.split(/[.-]/).map(seg => +seg);
+                                    const current = getArray(pending);
+                                    const previous = getArray(version);
+                                    for (let i = 0; i < previous.length; ++i) {
+                                        const a = previous[i];
+                                        const b = current[i];
+                                        if (isNaN(a) || b > a) {
+                                            found = 2;
+                                            break;
+                                        }
+                                        if (isNaN(b) || b < a) {
+                                            break;
+                                        }
                                     }
                                 }
                             }
@@ -97,9 +110,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.0" /* VERSIONS.KOTLIN_STDLIB */)}'` });
+                    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.10" /* VERSIONS.KOTLIN_STDLIB */)}'` });
                     output = Document.updateGradle(output, ['android', 'buildFeatures'], "compose true");
-                    output = Document.updateGradle(output, ['android', 'composeOptions'], `kotlinCompilerExtensionVersion '${instance.findVersion('kotlinCompilerExtensionVersion', "1.5.0" /* VERSIONS.KOTLIN_COMPILER */)}'`, true);
+                    output = Document.updateGradle(output, ['android', 'composeOptions'], `kotlinCompilerExtensionVersion '${instance.findVersion('kotlinCompilerExtensionVersion', "1.5.5" /* VERSIONS.KOTLIN_COMPILER */)}'`, true);
                     if (upgrade) {
                         output = Document.updateGradle(output, ['android', 'kotlinOptions'], `jvmTarget = '${javaVersion}'`, true);
                     }

package/extensions/task/index.js

@@ -5,6 +5,7 @@ const fs = require("fs");
 const child_process = require("child_process");
 const types_1 = require("@e-mc/types");
 const Document = require("@e-mc/document");
+const checkWin32 = (value) => value === "gradlew" /* STRINGS.GRADLEW */ && process.platform === 'win32' ? value + '.bat' : value;
 async function finalize(instance) {
     const commands = instance.config.commands;
     if (!commands || this.incremental === 'staging') {
@@ -27,7 +28,7 @@ async function finalize(instance) {
     }
     const settings = instance.settings.extensions?.task || {};
     const exec = settings.exec;
-    let { broadcastId, baseDirectory } = this, command = settings.command, uid, gid, title, name, foundCwd;
+    let { broadcastId, baseDirectory } = this, command = settings.command, uid, gid, title, filename, foundCwd;
     if (command) {
         if (command.indexOf('mvn') !== -1) {
             title = 'maven';
@@ -36,20 +37,20 @@ async function finalize(instance) {
             title = /([^\\/]+?)(?:\.[a-z]+)?$/i.exec(command)?.[1] || 'SPAWN';
         }
         command = path.normalize(command);
-        if (!command.includes(path.sep)) {
-            name = command;
+        if (!/[\\/]/.test(command = path.normalize(command))) {
+            filename = checkWin32(command);
         }
         command = Document.sanitizeCmd(command);
     }
     else {
-        name = 'gradlew';
-        command = '.' + path.sep + name;
+        filename = checkWin32("gradlew" /* STRINGS.GRADLEW */);
+        command = '.' + path.sep + filename;
         title = 'gradle';
     }
-    if (name) {
+    if (filename) {
         try {
             let appDir = baseDirectory;
-            while (!(foundCwd = fs.existsSync(path.join(appDir, name)))) {
+            while (!(foundCwd = fs.existsSync(path.join(appDir, filename)))) {
                 const parent = path.dirname(appDir);
                 if (parent === appDir) {
                     break;

package/index.d.ts

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/android",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "Android document constructor for E-mc.",
   "main": "index.js",
   "publishConfig": {

package/template/java/static/build.gradle

@@ -1,4 +1,4 @@
 plugins {
-    id 'com.android.application' version '8.1.0' apply false
-    id 'com.android.library' version '8.1.0' apply false
+    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

@@ -37,7 +37,7 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.core:core-ktx:1.10.1'
+    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/static/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'com.android.application' version '8.1.0' apply false
-    id 'com.android.library' version '8.1.0' apply false
-    id 'org.jetbrains.kotlin.android' version '1.9.0' apply false
+    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.10' apply false
 }

package/template/kotlin/build.gradle.kts

@@ -38,8 +38,8 @@ java {
 }
 
 dependencies {
-    implementation("org.jetbrains.kotlin:kotlin-stdlib:1.9.0")
-    implementation("androidx.core:core-ktx:1.10.1")
+    implementation("org.jetbrains.kotlin:kotlin-stdlib:1.9.10")
+    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/static/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("com.android.application") version "8.1.0" apply false
-    id("com.android.library") version "8.1.0" apply false
-    id("org.jetbrains.kotlin.android") version "1.9.0" apply false
+    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.10" apply false
 }