@expo/build-tools 21.7.0 → 21.7.1

package/dist/logging/HttpLogStream.js

@@ -8,6 +8,7 @@ const node_fetch_1 = __importDefault(require("node-fetch"));
 const stream_1 = require("stream");
 const retry_1 = require("../utils/retry");
 const MAX_BATCH_BYTES = 200_000;
+const REQUEST_TIMEOUT_MS = 10_000;
 /**
  * A bunyan-compatible writable stream for sending logs over HTTP.
  */
@@ -120,6 +121,7 @@ class HttpLogStream extends stream_1.Writable {
                     'Content-Type': 'application/x-ndjson',
                 },
                 body: logs.map(log => log.serialized).join('\n'),
+                signal: AbortSignal.timeout(REQUEST_TIMEOUT_MS),
             });
             if (!response.ok) {
                 const responseText = await (0, results_1.asyncResult)(response.text());

package/dist/steps/utils/deviceRunSessionEvents.js

@@ -220,7 +220,7 @@ function createRealtimeLogStream(ctx, logger) {
         ? 'http://localhost:4999/logs/'
         : ctx.env.EXPO_STAGING
             ? 'https://staging-logs.expo.dev/logs/'
-            : undefined;
+            : 'https://logs.expo.dev/logs/';
     const jobRunId = ctx.env.EAS_BUILD_ID;
     const robotAccessToken = ctx.job.secrets?.robotAccessToken;
     if (!baseUrl || !jobRunId || !robotAccessToken) {

package/dist/templates/EasBuildConfigureVersionGradle.d.ts

@@ -1 +1 @@
-export declare const EasBuildConfigureVersionGradleTemplate = "// Build integration with EAS\n\nimport java.nio.file.Paths\n\ndef versionCodeVal = null\ndef versionNameVal = null\n<% if (VERSION_CODE) { %>\n    versionCodeVal = \"<%- VERSION_CODE %>\"\n<% } %>\n<% if (VERSION_NAME) { %>\n    versionNameVal = \"<%- VERSION_NAME %>\"\n<% } %>\n\nandroid {\n  defaultConfig {\n    if (versionCodeVal) {\n      versionCode = Integer.parseInt(versionCodeVal)\n    }\n    if (versionNameVal) {\n      versionName = versionNameVal\n    }\n  }\n  applicationVariants.all { variant ->\n    variant.outputs.each { output ->\n      if (versionCodeVal) {\n        output.versionCodeOverride = Integer.parseInt(versionCodeVal)\n      }\n      if (versionNameVal) {\n        output.versionNameOverride = versionNameVal\n      }\n    }\n  }\n}\n";
+export declare const EasBuildConfigureVersionGradleTemplate = "// Build integration with EAS\n\nimport java.nio.file.Paths\n\ndef versionCodeVal = null\ndef versionNameVal = null\n<% if (VERSION_CODE) { %>\n    versionCodeVal = \"<%- VERSION_CODE %>\"\n<% } %>\n<% if (VERSION_NAME) { %>\n    versionNameVal = \"<%- VERSION_NAME %>\"\n<% } %>\n\nandroid {\n  defaultConfig {\n    if (versionCodeVal) {\n      versionCode = Integer.parseInt(versionCodeVal)\n    }\n    if (versionNameVal) {\n      versionName = versionNameVal\n    }\n  }\n}\n\n// AGP 9's new DSL removes the applicationVariants API, we set the version on each output through the androidComponents API instead.\ndef easAndroidExtension = project.extensions.getByName('android')\nif (easAndroidExtension.hasProperty('applicationVariants')) {\n  easAndroidExtension.applicationVariants.all { variant ->\n    variant.outputs.each { output ->\n      if (versionCodeVal) {\n        output.versionCodeOverride = Integer.parseInt(versionCodeVal)\n      }\n      if (versionNameVal) {\n        output.versionNameOverride = versionNameVal\n      }\n    }\n  }\n} else {\n  def easAndroidComponents = project.extensions.getByName('androidComponents')\n  easAndroidComponents.onVariants(easAndroidComponents.selector().all()) { variant ->\n    variant.outputs.each { output ->\n      if (versionCodeVal) {\n        output.versionCode.set(Integer.parseInt(versionCodeVal))\n      }\n      if (versionNameVal) {\n        output.versionName.set(versionNameVal)\n      }\n    }\n  }\n}\n";

package/dist/templates/EasBuildConfigureVersionGradle.js

@@ -23,7 +23,12 @@ android {
       versionName = versionNameVal
     }
   }
-  applicationVariants.all { variant ->
+}
+
+// AGP 9's new DSL removes the applicationVariants API, we set the version on each output through the androidComponents API instead.
+def easAndroidExtension = project.extensions.getByName('android')
+if (easAndroidExtension.hasProperty('applicationVariants')) {
+  easAndroidExtension.applicationVariants.all { variant ->
     variant.outputs.each { output ->
       if (versionCodeVal) {
         output.versionCodeOverride = Integer.parseInt(versionCodeVal)
@@ -33,5 +38,17 @@ android {
       }
     }
   }
+} else {
+  def easAndroidComponents = project.extensions.getByName('androidComponents')
+  easAndroidComponents.onVariants(easAndroidComponents.selector().all()) { variant ->
+    variant.outputs.each { output ->
+      if (versionCodeVal) {
+        output.versionCode.set(Integer.parseInt(versionCodeVal))
+      }
+      if (versionNameVal) {
+        output.versionName.set(versionNameVal)
+      }
+    }
+  }
 }
 `;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expo/build-tools",
-  "version": "21.7.0",
+  "version": "21.7.1",
   "bugs": "https://github.com/expo/eas-cli/issues",
   "license": "BUSL-1.1",
   "author": "Expo <support@expo.io>",
@@ -46,7 +46,7 @@
     "@expo/plist": "^0.3.5",
     "@expo/results": "^1.0.0",
     "@expo/spawn-async": "1.7.2",
-    "@expo/steps": "21.6.0",
+    "@expo/steps": "21.7.1",
     "@expo/template-file": "21.0.2",
     "@expo/turtle-spawn": "21.0.0",
     "@expo/xcpretty": "^4.3.1",
@@ -100,5 +100,5 @@
     "typescript": "^5.5.4",
     "uuid": "^9.0.1"
   },
-  "gitHead": "f923181857de80919ec7ee9861c9b71c2ee5635d"
+  "gitHead": "60032049ec947177bbcacf8802c22e1d5f24845f"
 }