@hot-updater/android-helper 1.2.0-rc.13 → 1.2.0-rc.15

package/dist/index.cjs

@@ -548,6 +548,8 @@ const resolveSandboxLauncher = (mergedManifest) => {
 	if (activity === void 0) throw new Error(`The launcher ${name} targets ${targetActivity ?? "no activity"}, which this variant's manifest doesn't declare.\nFix its android:targetActivity.`);
 	const refusal = taskRefusal(name, activity);
 	if (refusal !== null) throw new Error(refusal);
+	const launcherProcess = attribute(activity, "process");
+	if (launcherProcess !== void 0 && launcherProcess !== attribute(application ?? {}, "process")) throw new Error(`Sandbox builds run the launcher in the application's process, and ${name} sets android:process ${launcherProcess}.\nRemove it, or set the same android:process on <application>, for this build variant.`);
 	const shortcuts = asArray(element["meta-data"]).find((item) => attribute(item, "name") === SHORTCUTS);
 	const label = attribute(element, "label");
 	const icon = attribute(element, "icon");
@@ -582,10 +584,12 @@ const optional = (name, value) => value === void 0 ? "" : ` android:${name}="${x
 * also takes the links of `appId`'s URL scheme; the rest of the app's activity
 * stays, so its own links still reach it. `appId` is the scheme's `packageName`,
 * before the `.sandbox` suffix, so a preview link needs no build to derive it.
+* The dev server is plain http, which a project's network security config can
+* still refuse: the screen then says so.
 */
 const sandboxManifestOverlay = ({ channel, appId, launcher }) => `<?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
-  <application>
+  <application android:usesCleartextTraffic="true" tools:replace="android:usesCleartextTraffic">
     <meta-data android:name="com.hotupdater.CHANNEL" android:value="${xml(channel)}" tools:replace="android:value" />
     <meta-data android:name="${_hot_updater_protocol_native_artifact.SANDBOX_META_DATA}" android:value="true" />
     <activity android:name="${_hot_updater_protocol_native_artifact.SANDBOX_ACTIVITY}" android:exported="true" android:launchMode="singleTop" android:theme="@style/HotUpdaterSandboxTheme" android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize|uiMode"${optional("label", launcher.label)}${optional("icon", launcher.icon)}${optional("roundIcon", launcher.roundIcon)}>
@@ -601,6 +605,7 @@ ${filterXml(launcher.filter)}
     <${launcher.kind} android:name="${xml(launcher.name)}"${optional("targetActivity", launcher.targetActivity)}>
 ${filterXml(launcher.filter, " tools:node=\"remove\"")}${launcher.shortcuts === void 0 ? "" : `\n      <meta-data android:name="${SHORTCUTS}" tools:node="remove" />`}
     </${launcher.kind}>
+    <activity android:name="com.hotupdater.HotUpdaterSandboxRelaunchActivity" android:excludeFromRecents="true" android:exported="false" android:launchMode="singleTask" android:noHistory="true" android:process=":hotupdater_restart" android:theme="@android:style/Theme.NoDisplay" />
     <provider android:name="com.hotupdater.HotUpdaterSandboxProcess" android:authorities="\${applicationId}.hotupdater.sandbox" android:exported="false" />
   </application>
 </manifest>
@@ -629,6 +634,9 @@ const UNSUPPORTED_DSL = `Sandbox builds don't support AGP 9's default DSL yet.
 Set android.newDsl=false in android/gradle.properties.`;
 /** The message when the build type has a manifest the overlay would replace. */
 const ownManifest = (manifest) => `A sandbox build can't merge with ${manifest}.\nMove what it declares to src/main/AndroidManifest.xml.`;
+/** The message when no project compiled the SDK from source, which a dev server needs. */
+const PREBUILT_SDK = `This app takes @hot-updater/react-native as a prebuilt AAR, and a sandbox build compiles the SDK from source.
+Add the SDK's autolinked project to this build instead of the AAR.`;
 /** Text as a single-quoted Groovy string. */
 const groovyString = (text) => `'${text.replace(/\\/gu, "\\\\").replace(/'/gu, "\\'").replace(/\n/gu, "\\n")}'`;
 /**
@@ -644,6 +652,13 @@ def overlay = new File(${groovyString(overlay)})
 def minVersionCode = ${minVersionCode ?? "null"}
 allprojects { project ->
   if (project.path != appModule) return
+  // In this build alone: an init script also runs for React Native's included
+  // Gradle plugin. The SDK's sandbox script sets this on the project it compiles.
+  gradle.taskGraph.whenReady {
+    if (!gradle.rootProject.ext.has('hotUpdaterSandboxSdkProject')) {
+      throw new GradleException(${groovyString(PREBUILT_SDK)})
+    }
+  }
   project.plugins.withId('com.android.application') {
     def components = project.extensions.getByName('androidComponents')
     if (components.pluginVersion.major >= 9 && project.findProperty('android.newDsl')?.toString() != 'false') {

package/dist/index.mjs

@@ -520,6 +520,8 @@ const resolveSandboxLauncher = (mergedManifest) => {
 	if (activity === void 0) throw new Error(`The launcher ${name} targets ${targetActivity ?? "no activity"}, which this variant's manifest doesn't declare.\nFix its android:targetActivity.`);
 	const refusal = taskRefusal(name, activity);
 	if (refusal !== null) throw new Error(refusal);
+	const launcherProcess = attribute(activity, "process");
+	if (launcherProcess !== void 0 && launcherProcess !== attribute(application ?? {}, "process")) throw new Error(`Sandbox builds run the launcher in the application's process, and ${name} sets android:process ${launcherProcess}.\nRemove it, or set the same android:process on <application>, for this build variant.`);
 	const shortcuts = asArray(element["meta-data"]).find((item) => attribute(item, "name") === SHORTCUTS);
 	const label = attribute(element, "label");
 	const icon = attribute(element, "icon");
@@ -554,10 +556,12 @@ const optional = (name, value) => value === void 0 ? "" : ` android:${name}="${x
 * also takes the links of `appId`'s URL scheme; the rest of the app's activity
 * stays, so its own links still reach it. `appId` is the scheme's `packageName`,
 * before the `.sandbox` suffix, so a preview link needs no build to derive it.
+* The dev server is plain http, which a project's network security config can
+* still refuse: the screen then says so.
 */
 const sandboxManifestOverlay = ({ channel, appId, launcher }) => `<?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
-  <application>
+  <application android:usesCleartextTraffic="true" tools:replace="android:usesCleartextTraffic">
     <meta-data android:name="com.hotupdater.CHANNEL" android:value="${xml(channel)}" tools:replace="android:value" />
     <meta-data android:name="${SANDBOX_META_DATA}" android:value="true" />
     <activity android:name="${SANDBOX_ACTIVITY}" android:exported="true" android:launchMode="singleTop" android:theme="@style/HotUpdaterSandboxTheme" android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize|uiMode"${optional("label", launcher.label)}${optional("icon", launcher.icon)}${optional("roundIcon", launcher.roundIcon)}>
@@ -573,6 +577,7 @@ ${filterXml(launcher.filter)}
     <${launcher.kind} android:name="${xml(launcher.name)}"${optional("targetActivity", launcher.targetActivity)}>
 ${filterXml(launcher.filter, " tools:node=\"remove\"")}${launcher.shortcuts === void 0 ? "" : `\n      <meta-data android:name="${SHORTCUTS}" tools:node="remove" />`}
     </${launcher.kind}>
+    <activity android:name="com.hotupdater.HotUpdaterSandboxRelaunchActivity" android:excludeFromRecents="true" android:exported="false" android:launchMode="singleTask" android:noHistory="true" android:process=":hotupdater_restart" android:theme="@android:style/Theme.NoDisplay" />
     <provider android:name="com.hotupdater.HotUpdaterSandboxProcess" android:authorities="\${applicationId}.hotupdater.sandbox" android:exported="false" />
   </application>
 </manifest>
@@ -601,6 +606,9 @@ const UNSUPPORTED_DSL = `Sandbox builds don't support AGP 9's default DSL yet.
 Set android.newDsl=false in android/gradle.properties.`;
 /** The message when the build type has a manifest the overlay would replace. */
 const ownManifest = (manifest) => `A sandbox build can't merge with ${manifest}.\nMove what it declares to src/main/AndroidManifest.xml.`;
+/** The message when no project compiled the SDK from source, which a dev server needs. */
+const PREBUILT_SDK = `This app takes @hot-updater/react-native as a prebuilt AAR, and a sandbox build compiles the SDK from source.
+Add the SDK's autolinked project to this build instead of the AAR.`;
 /** Text as a single-quoted Groovy string. */
 const groovyString = (text) => `'${text.replace(/\\/gu, "\\\\").replace(/'/gu, "\\'").replace(/\n/gu, "\\n")}'`;
 /**
@@ -616,6 +624,13 @@ def overlay = new File(${groovyString(overlay)})
 def minVersionCode = ${minVersionCode ?? "null"}
 allprojects { project ->
   if (project.path != appModule) return
+  // In this build alone: an init script also runs for React Native's included
+  // Gradle plugin. The SDK's sandbox script sets this on the project it compiles.
+  gradle.taskGraph.whenReady {
+    if (!gradle.rootProject.ext.has('hotUpdaterSandboxSdkProject')) {
+      throw new GradleException(${groovyString(PREBUILT_SDK)})
+    }
+  }
   project.plugins.withId('com.android.application') {
     def components = project.extensions.getByName('androidComponents')
     if (components.pluginVersion.major >= 9 && project.findProperty('android.newDsl')?.toString() != 'false') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hot-updater/android-helper",
-  "version": "1.2.0-rc.13",
+  "version": "1.2.0-rc.15",
   "type": "module",
   "main": "dist/index.cjs",
   "module": "dist/index.mjs",
@@ -30,9 +30,9 @@
     "execa": "9.5.2",
     "fast-xml-parser": "5.7.2",
     "jszip": "^3.10.1",
-    "@hot-updater/plugin-core": "1.2.0-rc.13",
-    "@hot-updater/cli-tools": "1.2.0-rc.13",
-    "@hot-updater/protocol": "1.2.0-rc.13"
+    "@hot-updater/plugin-core": "1.2.0-rc.15",
+    "@hot-updater/protocol": "1.2.0-rc.15",
+    "@hot-updater/cli-tools": "1.2.0-rc.15"
   },
   "devDependencies": {
     "@types/node": "^20"