@pi-r/android 0.6.0 → 0.6.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +2 -0
- package/data/google-maven-snapshot.json +1 -1
- package/data/google-maven.json +1 -1
- package/extensions/gradle/dependencies/index.js +2 -2
- package/index.d.ts +6 -6
- package/package.json +5 -5
- package/template/java/static/build.gradle +2 -2
- package/template/java+kotlin/static/build.gradle +3 -3
- package/template/kotlin/build.gradle.kts +1 -1
- package/template/kotlin/static/build.gradle.kts +3 -3
- package/types/index.d.ts +3 -3
- package/types/squared.d.ts +1 -2
|
@@ -264,9 +264,9 @@ function finalize(instance) {
|
|
|
264
264
|
output = Document.updateGradle(output, ['android', 'buildFeatures'], 'compose = true');
|
|
265
265
|
}
|
|
266
266
|
else {
|
|
267
|
-
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.
|
|
267
|
+
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" /* VERSIONS.KOTLIN_STDLIB */)}'` });
|
|
268
268
|
output = Document.updateGradle(output, ['android', 'buildFeatures'], "compose true");
|
|
269
|
-
output = Document.updateGradle(output, ['android', 'composeOptions'], `kotlinCompilerExtensionVersion '${instance.findVersion('kotlinCompilerExtensionVersion', "1.5.
|
|
269
|
+
output = Document.updateGradle(output, ['android', 'composeOptions'], `kotlinCompilerExtensionVersion '${instance.findVersion('kotlinCompilerExtensionVersion', "1.5.9" /* VERSIONS.KOTLIN_COMPILER */)}'`, true);
|
|
270
270
|
if (upgrade) {
|
|
271
271
|
output = Document.updateGradle(output, ['android', 'kotlinOptions'], `jvmTarget = '${javaVersion}'`, true);
|
|
272
272
|
}
|
package/index.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import type { IFileManager } from '@e-mc/types/types/lib';
|
|
2
|
-
|
|
3
|
-
import type { AndroidDocumentConstructor, DocumentAsset } from './types';
|
|
4
|
-
|
|
5
|
-
declare const Android: AndroidDocumentConstructor<IFileManager<DocumentAsset>>;
|
|
6
|
-
|
|
1
|
+
import type { IFileManager } from '@e-mc/types/types/lib';
|
|
2
|
+
|
|
3
|
+
import type { AndroidDocumentConstructor, DocumentAsset } from './types';
|
|
4
|
+
|
|
5
|
+
declare const Android: AndroidDocumentConstructor<IFileManager<DocumentAsset>>;
|
|
6
|
+
|
|
7
7
|
export = Android;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@pi-r/android",
|
|
3
|
-
"version": "0.6.
|
|
3
|
+
"version": "0.6.4",
|
|
4
4
|
"description": "Android document constructor for E-mc.",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"publishConfig": {
|
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
},
|
|
9
9
|
"repository": {
|
|
10
10
|
"type": "git",
|
|
11
|
-
"url": "https://github.com/anpham6/pi-r.git",
|
|
11
|
+
"url": "git+https://github.com/anpham6/pi-r.git",
|
|
12
12
|
"directory": "src/module/android"
|
|
13
13
|
},
|
|
14
14
|
"keywords": [
|
|
@@ -20,9 +20,9 @@
|
|
|
20
20
|
"license": "MIT",
|
|
21
21
|
"homepage": "https://github.com/anpham6/pi-r#readme",
|
|
22
22
|
"dependencies": {
|
|
23
|
-
"@e-mc/document": "^0.8.
|
|
24
|
-
"@e-mc/types": "^0.8.
|
|
25
|
-
"htmlparser2": "^9.
|
|
23
|
+
"@e-mc/document": "^0.8.4",
|
|
24
|
+
"@e-mc/types": "^0.8.4",
|
|
25
|
+
"htmlparser2": "^9.1.0",
|
|
26
26
|
"which": "^2.0.2"
|
|
27
27
|
}
|
|
28
28
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
plugins {
|
|
2
|
-
id 'com.android.application' version '8.2.
|
|
3
|
-
id 'com.android.library' version '8.2.
|
|
4
|
-
id 'org.jetbrains.kotlin.android' version '1.9.
|
|
2
|
+
id 'com.android.application' version '8.2.2' apply false
|
|
3
|
+
id 'com.android.library' version '8.2.2' apply false
|
|
4
|
+
id 'org.jetbrains.kotlin.android' version '1.9.22' apply false
|
|
5
5
|
}
|
|
@@ -38,7 +38,7 @@ java {
|
|
|
38
38
|
}
|
|
39
39
|
|
|
40
40
|
dependencies {
|
|
41
|
-
implementation("org.jetbrains.kotlin:kotlin-stdlib:1.9.
|
|
41
|
+
implementation("org.jetbrains.kotlin:kotlin-stdlib:1.9.22")
|
|
42
42
|
implementation("androidx.core:core-ktx:1.12.0")
|
|
43
43
|
testImplementation("junit:junit:4.13.2")
|
|
44
44
|
androidTestImplementation("androidx.test.ext:junit:1.1.5")
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
plugins {
|
|
2
|
-
id("com.android.application") version "8.2.
|
|
3
|
-
id("com.android.library") version "8.2.
|
|
4
|
-
id("org.jetbrains.kotlin.android") version "1.9.
|
|
2
|
+
id("com.android.application") version "8.2.2" apply false
|
|
3
|
+
id("com.android.library") version "8.2.2" apply false
|
|
4
|
+
id("org.jetbrains.kotlin.android") version "1.9.22" apply false
|
|
5
5
|
}
|
package/types/index.d.ts
CHANGED
|
@@ -2,9 +2,9 @@ import type { FinalizedElement } from '@e-mc/types/lib/squared';
|
|
|
2
2
|
|
|
3
3
|
import type { DocumentConstructor, IDocument, IFileManager } from '@e-mc/types/lib';
|
|
4
4
|
import type { ExternalAsset } from '@e-mc/types/lib/asset';
|
|
5
|
-
import type { DocumentModule as IDocumentModule, DocumentSettings as IDocumentSettings
|
|
5
|
+
import type { ExecAction, DocumentDirectory as IDocumentDirectory, DocumentModule as IDocumentModule, DocumentSettings as IDocumentSettings } from '@e-mc/types/lib/settings';
|
|
6
6
|
|
|
7
|
-
import type {
|
|
7
|
+
import type { DependencyScopes, DocumentOutput } from './squared';
|
|
8
8
|
|
|
9
9
|
interface DocumentDirectory extends IDocumentDirectory {
|
|
10
10
|
template?: string;
|
|
@@ -55,7 +55,7 @@ export interface MavenArtifact {
|
|
|
55
55
|
groupId: string;
|
|
56
56
|
artifactId: string;
|
|
57
57
|
version: string;
|
|
58
|
-
scope?:
|
|
58
|
+
scope?: DependencyScopes;
|
|
59
59
|
dependencies?: MavenArtifact[];
|
|
60
60
|
}
|
|
61
61
|
|
package/types/squared.d.ts
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import type { FinalizedElement, ControllerSettingsDirectoryUI as IControllerSettingsDirectoryUI } from '@e-mc/types/lib/squared';
|
|
2
2
|
|
|
3
|
-
import type { ExternalAsset } from '@e-mc/types/lib/asset';
|
|
4
3
|
import type { RequestData as IRequestData } from '@e-mc/types/lib/node';
|
|
5
4
|
|
|
6
5
|
export interface DocumentOutput {
|
|
@@ -24,7 +23,7 @@ export interface DocumentOutput {
|
|
|
24
23
|
extensionData?: PlainObject;
|
|
25
24
|
}
|
|
26
25
|
|
|
27
|
-
export interface RequestData extends IRequestData
|
|
26
|
+
export interface RequestData extends IRequestData, DocumentOutput {}
|
|
28
27
|
|
|
29
28
|
export interface ManifestData {
|
|
30
29
|
package?: string;
|