@pi-r/android 0.8.3 → 0.9.0

package/project/gradle.properties

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

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

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

package/template/java+kotlin/build.gradle

@@ -25,19 +25,19 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '11'
     }
     buildFeatures {
-        viewBinding false
+        viewBinding true
     }
 }
 
 dependencies {
-    implementation 'androidx.core:core-ktx:1.13.1'
+    implementation 'androidx.core:core-ktx:1.15.0'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'

package/template/java+kotlin/settings.gradle

@@ -1,6 +1,12 @@
 pluginManagement {
     repositories {
-        google()
+        google {
+            content {
+                includeGroupByRegex("com\\.android.*")
+                includeGroupByRegex("com\\.google.*")
+                includeGroupByRegex("androidx.*")
+            }
+        }
         mavenCentral()
         gradlePluginPortal()
     }

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

@@ -1,5 +1,5 @@
 plugins {
-    id 'com.android.application' version '8.7.0' apply false
-    id 'com.android.library' version '8.7.0' apply false
-    id 'org.jetbrains.kotlin.android' version '1.9.25' apply false
+    id 'com.android.application' version '8.7.3' apply false
+    id 'com.android.library' version '8.7.3' apply false
+    id 'org.jetbrains.kotlin.android' version '2.1.0' apply false
 }

package/template/kotlin/build.gradle.kts

@@ -34,8 +34,8 @@ android {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
 }
 
 dependencies {

package/template/kotlin/libs.versions.toml

@@ -1,12 +1,12 @@
 [versions]
-agp = "8.7.0"
-kotlin = "2.0.21"
-coreKtx = "1.13.1"
+agp = "8.7.3"
+kotlin = "2.1.0"
+coreKtx = "1.15.0"
 junit = "4.13.2"
 junitVersion = "1.2.1"
 espressoCore = "3.6.1"
 appcompat = "1.7.0"
-constraintlayout = "2.1.4"
+constraintlayout = "2.2.0"
 
 [libraries]
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }

package/template/kotlin/settings.gradle.kts

@@ -1,24 +1,30 @@
-val snapshotVersion : String? = System.getenv("ANDROIDX_SNAPSHOT_ID")
-
-pluginManagement {
-    repositories {
-        google()
-        mavenCentral()
-        gradlePluginPortal()
-    }
-}
-
-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()
-    }
-}
-
-rootProject.name = "{{projectName}}"
+val snapshotVersion : String? = System.getenv("ANDROIDX_SNAPSHOT_ID")
+
+pluginManagement {
+    repositories {
+        google {
+            content {
+                includeGroupByRegex("com\\.android.*")
+                includeGroupByRegex("com\\.google.*")
+                includeGroupByRegex("androidx.*")
+            }
+        }
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
+
+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()
+    }
+}
+
+rootProject.name = "{{projectName}}"
 include("{{name}}")

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

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

package/types/index.d.ts

@@ -46,7 +46,7 @@ export interface TemplateData {
 export interface FindTemplateOptions {
     detect?: boolean;
     languageOf?: LanguageOfType;
-    subDir?: ArrayOf<string>;
+    subDir?: string | string[];
     throwsDoesNotExist?: boolean;
 }
 
@@ -67,9 +67,9 @@ export interface IAndroidDocument<T extends IFileManager<U>, U extends DocumentA
     elements: FinalizedElement[];
     extensionData: PlainObject;
     findTemplate(baseDir: string, filename: string, options?: FindTemplateOptions): TemplateData;
-    findData<V = AnyObject>(filename: string, format?: string): Null<V>;
-    languageOf(name: LanguageOfType, value?: LanguageType): Undef<LanguageType>;
-    detectKts(...paths: string[]): Null<boolean>;
+    findData<V = AnyObject>(filename: string, format?: string): V | null;
+    languageOf(name: LanguageOfType, value?: LanguageType): LanguageType | undefined;
+    detectKts(...paths: string[]): boolean | null;
     detect(host?: T): boolean;
     get settings(): AndroidDocumentSettings;
 }

package/types/squared.d.ts

@@ -1,3 +1,4 @@
+import type { Dimension } from '@e-mc/types/lib/image';
 import type { RequestData as IRequestData } from '@e-mc/types/lib/node';
 
 interface BoxRect<T = number> {
@@ -33,7 +34,7 @@ export interface DocumentOutput {
     manifest?: ManifestData;
     namespace?: string;
     applicationId?: string;
-    profileable?: boolean | ArrayOf<string>;
+    profileable?: boolean | string | string[];
     dependencies?: string[];
     dependencyScopes?: boolean | 1 | ArrayOf<DependencyScopes | "snapshot" | "constraints">;
     directories?: ControllerSettingsDirectoryUI;
@@ -48,7 +49,7 @@ export interface DocumentOutput {
     versionName?: string;
     versionCode?: number;
     dataBinding?: boolean;
-    commands?: ArrayOf<ArrayOf<string>>;
+    commands?: ArrayOf<string | string[]>;
     extensionData?: PlainObject;
 }