@pi-r/android 0.8.2 → 0.8.4

package/template/kotlin/libs.versions.toml

@@ -1,23 +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" }
+[versions]
+agp = "8.7.0"
+kotlin = "2.0.21"
+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,24 +1,24 @@
-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()
+        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

@@ -1,80 +1,80 @@
-import type { DocumentConstructor, IDocument, IFileManager } from '@e-mc/types/lib';
-import type { ExternalAsset } from '@e-mc/types/lib/asset';
-import type { ExecAction, DocumentDirectory as IDocumentDirectory, DocumentModule as IDocumentModule, DocumentSettings as IDocumentSettings } from '@e-mc/types/lib/settings';
-
-import type { DependencyScopes, DocumentOutput, FinalizedElement } from './squared';
-
-interface DocumentDirectory extends IDocumentDirectory {
-    template?: string;
-    project?: string;
-}
-
-interface AndroidDocumentSettings extends Pick<IDocumentSettings, "users" | "directory">, PlainObject {
-    extensions?: {
-        task?: {
-            exec?: ExecAction;
-            command?: string;
-        };
-    };
-    language?: {
-        [T in LanguageOfType]?: LanguageType;
-    };
-}
-
-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?: LanguageType;
-}
-
-export interface FindTemplateOptions {
-    detect?: boolean;
-    languageOf?: LanguageOfType;
-    subDir?: ArrayOf<string>;
-    throwsDoesNotExist?: boolean;
-}
-
-export interface MavenArtifact {
-    groupId: string;
-    artifactId: string;
-    version: string;
-    scope?: DependencyScopes;
-    dependencies?: MavenArtifact[];
-}
-
-export type LanguageType = "java" | "kotlin" | "java+kotlin";
-export type LanguageOfType = "gradle";
-export type DocumentAsset = ExternalAsset;
-
-export interface IAndroidDocument<T extends IFileManager<U>, U extends DocumentAsset = DocumentAsset> extends IDocument<T, U, DocumentModule>, Pick<DocumentOutput, DocumentProperties> {
-    config: UserConfig;
-    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>;
-    detect(host?: T): boolean;
-    get settings(): AndroidDocumentSettings;
-}
-
-export interface AndroidDocumentConstructor<T extends IFileManager<U>, U extends DocumentAsset = DocumentAsset> extends ConstructorDerived<DocumentConstructor<T, U>> {
-    readonly prototype: IAndroidDocument<T, U>;
-    new(module?: DocumentModule, ...args: unknown[]): IAndroidDocument<T, U>;
+import type { DocumentConstructor, IDocument, IFileManager } from '@e-mc/types/lib';
+import type { ExternalAsset } from '@e-mc/types/lib/asset';
+import type { ExecAction, DocumentDirectory as IDocumentDirectory, DocumentModule as IDocumentModule, DocumentSettings as IDocumentSettings } from '@e-mc/types/lib/settings';
+
+import type { DependencyScopes, DocumentOutput, FinalizedElement } from './squared';
+
+interface DocumentDirectory extends IDocumentDirectory {
+    template?: string;
+    project?: string;
+}
+
+interface AndroidDocumentSettings extends Pick<IDocumentSettings, "users" | "directory">, PlainObject {
+    extensions?: {
+        task?: {
+            exec?: ExecAction;
+            command?: string;
+        };
+    };
+    language?: {
+        [T in LanguageOfType]?: LanguageType;
+    };
+}
+
+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?: LanguageType;
+}
+
+export interface FindTemplateOptions {
+    detect?: boolean;
+    languageOf?: LanguageOfType;
+    subDir?: ArrayOf<string>;
+    throwsDoesNotExist?: boolean;
+}
+
+export interface MavenArtifact {
+    groupId: string;
+    artifactId: string;
+    version: string;
+    scope?: DependencyScopes;
+    dependencies?: MavenArtifact[];
+}
+
+export type LanguageType = "java" | "kotlin" | "java+kotlin";
+export type LanguageOfType = "gradle";
+export type DocumentAsset = ExternalAsset;
+
+export interface IAndroidDocument<T extends IFileManager<U>, U extends DocumentAsset = DocumentAsset> extends IDocument<T, U, DocumentModule>, Pick<DocumentOutput, DocumentProperties> {
+    config: UserConfig;
+    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>;
+    detect(host?: T): boolean;
+    get settings(): AndroidDocumentSettings;
+}
+
+export interface AndroidDocumentConstructor<T extends IFileManager<U>, U extends DocumentAsset = DocumentAsset> extends ConstructorDerived<DocumentConstructor<T, U>> {
+    readonly prototype: IAndroidDocument<T, U>;
+    new(module?: DocumentModule, ...args: unknown[]): IAndroidDocument<T, U>;
 }

package/types/squared.d.ts

@@ -1,90 +1,90 @@
-import type { RequestData as IRequestData } from '@e-mc/types/lib/node';
-
-interface BoxRect<T = number> {
-    top: T;
-    right: T;
-    bottom: T;
-    left: T;
-}
-
-interface BoxRectDimension extends BoxRect, Dimension {
-    numberOfLines?: number;
-    overflow?: boolean;
-}
-
-export interface FinalizedElement {
-    documentId: string;
-    bounds: BoxRectDimension;
-    css: PlainObject;
-    outerWrapperIds?: string[];
-}
-
-export interface ConditionProperty {
-    conditionText: string;
-}
-
-export interface CssConditionData extends ConditionProperty {
-    name?: string;
-    conditionText: string;
-}
-
-export interface DocumentOutput {
-    targetAPI?: number | string;
-    manifest?: ManifestData;
-    namespace?: string;
-    applicationId?: string;
-    profileable?: boolean | ArrayOf<string>;
-    dependencies?: string[];
-    dependencyScopes?: boolean | 1 | ArrayOf<DependencyScopes | "snapshot" | "constraints">;
-    directories?: ControllerSettingsDirectoryUI;
-    elements?: FinalizedElement[];
-    projectName?: string;
-    mainParentDir?: string;
-    mainSrcDir?: string;
-    mainActivityFile?: string;
-    javaVersion?: number | string;
-    jvmToolchain?: number | string;
-    versionCatalog?: boolean;
-    versionName?: string;
-    versionCode?: number;
-    dataBinding?: boolean;
-    commands?: ArrayOf<ArrayOf<string>>;
-    extensionData?: PlainObject;
-}
-
-export interface RequestData extends IRequestData, DocumentOutput {}
-
-export interface ManifestData extends PlainObject {
-    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 {
-    layout: string;
-    string: string;
-    font: string;
-    image: string;
-    video: string;
-    audio: string;
-    main: string;
-    animation: string;
-    theme: string;
-}
-
+import type { RequestData as IRequestData } from '@e-mc/types/lib/node';
+
+interface BoxRect<T = number> {
+    top: T;
+    right: T;
+    bottom: T;
+    left: T;
+}
+
+interface BoxRectDimension extends BoxRect, Dimension {
+    numberOfLines?: number;
+    overflow?: boolean;
+}
+
+export interface FinalizedElement {
+    documentId: string;
+    bounds: BoxRectDimension;
+    css: PlainObject;
+    outerWrapperIds?: string[];
+}
+
+export interface ConditionProperty {
+    conditionText: string;
+}
+
+export interface CssConditionData extends ConditionProperty {
+    name?: string;
+    conditionText: string;
+}
+
+export interface DocumentOutput {
+    targetAPI?: number | string;
+    manifest?: ManifestData;
+    namespace?: string;
+    applicationId?: string;
+    profileable?: boolean | ArrayOf<string>;
+    dependencies?: string[];
+    dependencyScopes?: boolean | 1 | ArrayOf<DependencyScopes | "snapshot" | "constraints">;
+    directories?: ControllerSettingsDirectoryUI;
+    elements?: FinalizedElement[];
+    projectName?: string;
+    mainParentDir?: string;
+    mainSrcDir?: string;
+    mainActivityFile?: string;
+    javaVersion?: number | string;
+    jvmToolchain?: number | string;
+    versionCatalog?: boolean;
+    versionName?: string;
+    versionCode?: number;
+    dataBinding?: boolean;
+    commands?: ArrayOf<ArrayOf<string>>;
+    extensionData?: PlainObject;
+}
+
+export interface RequestData extends IRequestData, DocumentOutput {}
+
+export interface ManifestData extends PlainObject {
+    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 {
+    layout: string;
+    string: string;
+    font: string;
+    image: string;
+    video: string;
+    audio: string;
+    main: string;
+    animation: string;
+    theme: string;
+}
+
 export type DependencyScopes = "compile" | "provided" | "runtime" | "test";