@pi-r/android 0.1.0 → 0.2.0

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.
Files changed (7) hide show
  1. package/extensions/app/manifest/index.js +1 -1
  2. package/extensions/gradle/dependencies/index.js +2 -2
  3. package/extensions/gradle/settings/index.js +1 -1
  4. package/extensions/task/index.js +1 -1
  5. package/package.json +3 -3
  6. package/template/java+kotlin/build.gradle +1 -1
  7. package/template/kotlin/build.gradle.kts +1 -1
package/extensions/app/manifest/index.js CHANGED
@@ -14,7 +14,7 @@ function finalize(instance) {
14
14
  if (!config.manifest) {
15
15
  return;
16
16
  }
17
- let { localUri, source, existing } = instance.findTemplate(path.join(this.baseDirectory, config.mainParentDir, config.mainSrcDir), "AndroidManifest.xml" /* MANIFEST.FILENAME */, { detect: !this.archiving });
17
+ let { localUri, source, existing } = instance.findTemplate(path.join(this.baseDirectory, config.mainParentDir, config.mainSrcDir), "AndroidManifest.xml" /* MANIFEST.FILENAME */, { detect: this.incremental !== 'staging' });
18
18
  if (localUri && source && instance.canWrite(localUri, { ownPermissionOnly: true })) {
19
19
  const { package: manifestPackage, application = {} } = config.manifest;
20
20
  const { supportsRtl, label, theme, activity, metaData = [], activityName, fontProvider } = application;
package/extensions/gradle/dependencies/index.js CHANGED
@@ -10,7 +10,7 @@ function finalize(instance) {
10
10
  if (!profileable && !dependencies && !dataBinding && !versionName && !versionCode && !config.namespace) {
11
11
  return;
12
12
  }
13
- let { localUri, source, existing, kotlin } = instance.findTemplate(path.join(this.baseDirectory, config.mainParentDir), 'build.gradle', { detect: !this.archiving, languageOf: 'gradle' });
13
+ let { localUri, source, existing, kotlin } = instance.findTemplate(path.join(this.baseDirectory, config.mainParentDir), 'build.gradle', { detect: this.incremental !== 'staging', languageOf: 'gradle' });
14
14
  if (localUri && source && instance.canWrite(localUri, { ownPermissionOnly: true })) {
15
15
  let { namespace, javaVersion } = config, jvmTarget, modified;
16
16
  const upgrade = javaVersion > 0;
@@ -101,7 +101,7 @@ function finalize(instance) {
101
101
  else {
102
102
  output = Document.updateGradle(output, ['plugins'], "id 'org.jetbrains.kotlin.android'", { upgrade: true, multiple: true, addendum: `version '${instance.findVersion('org.jetbrains.kotlin:kotlin-stdlib', "1.8.20" /* VERSIONS.KOTLIN_STDLIB */)}'` });
103
103
  output = Document.updateGradle(output, ['android', 'buildFeatures'], "compose true");
104
- output = Document.updateGradle(output, ['android', 'composeOptions'], `kotlinCompilerExtensionVersion '${instance.findVersion('kotlinCompilerExtensionVersion', "1.4.4" /* VERSIONS.KOTLIN_COMPILER */)}'`, true);
104
+ output = Document.updateGradle(output, ['android', 'composeOptions'], `kotlinCompilerExtensionVersion '${instance.findVersion('kotlinCompilerExtensionVersion', "1.4.5" /* VERSIONS.KOTLIN_COMPILER */)}'`, true);
105
105
  if (upgrade) {
106
106
  output = Document.updateGradle(output, ['android', 'kotlinOptions'], `jvmTarget = '${javaVersion}'`, true);
107
107
  }
package/extensions/gradle/settings/index.js CHANGED
@@ -8,7 +8,7 @@ function finalize(instance) {
8
8
  if (!dependencies && !projectName) {
9
9
  return;
10
10
  }
11
- let { localUri, source, existing, kotlin } = instance.findTemplate(this.baseDirectory, 'settings.gradle', { detect: !this.archiving, languageOf: 'gradle' });
11
+ let { localUri, source, existing, kotlin } = instance.findTemplate(this.baseDirectory, 'settings.gradle', { detect: this.incremental !== 'staging', languageOf: 'gradle' });
12
12
  if (localUri && source && instance.canWrite(localUri, { ownPermissionOnly: true })) {
13
13
  const targetName = projectName ? projectName.replace(/"/g, '\\"') : '';
14
14
  let modified;
package/extensions/task/index.js CHANGED
@@ -7,7 +7,7 @@ const types_1 = require("@e-mc/types");
7
7
  const Document = require("@e-mc/document");
8
8
  async function finalize(instance) {
9
9
  const commands = instance.config.commands;
10
- if (!commands || this.archiving) {
10
+ if (!commands || this.incremental === 'staging') {
11
11
  return;
12
12
  }
13
13
  let taskArgs;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@pi-r/android",
3
- "version": "0.1.0",
3
+ "version": "0.2.0",
4
4
  "description": "Android document constructor for E-mc.",
5
5
  "main": "index.js",
6
6
  "publishConfig": {
@@ -20,8 +20,8 @@
20
20
  "license": "MIT",
21
21
  "homepage": "https://github.com/anpham6/pi-r#readme",
22
22
  "dependencies": {
23
- "@e-mc/document": "^0.4.2",
24
- "@e-mc/types": "^0.4.2",
23
+ "@e-mc/document": "^0.5.0",
24
+ "@e-mc/types": "^0.5.0",
25
25
  "htmlparser2": "^8.0.2"
26
26
  }
27
27
  }
package/template/java+kotlin/build.gradle CHANGED
@@ -37,7 +37,7 @@ android {
37
37
  }
38
38
 
39
39
  dependencies {
40
- implementation 'androidx.core:core-ktx:1.9.0'
40
+ implementation 'androidx.core:core-ktx:1.10.0'
41
41
  testImplementation 'junit:junit:4.13.2'
42
42
  androidTestImplementation 'androidx.test.ext:junit:1.1.5'
43
43
  androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
package/template/kotlin/build.gradle.kts CHANGED
@@ -39,7 +39,7 @@ java {
39
39
 
40
40
  dependencies {
41
41
  implementation("org.jetbrains.kotlin:kotlin-stdlib:1.8.20")
42
- implementation("androidx.core:core-ktx:1.9.0")
42
+ implementation("androidx.core:core-ktx:1.10.0")
43
43
  testImplementation("junit:junit:4.13.2")
44
44
  androidTestImplementation("androidx.test.ext:junit:1.1.5")
45
45
  androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")