0.11.0: dist-apk takes Kotlin, libraries, archives and a Maven graph; dist-apple takes Info.plist entries and an iOS device

dist-apk
- options::kotlin_sources: kotlinc from xim:kotlin (feature dist-apk-kotlin)
  compiles the Kotlin with the Java as reference sources, before javac; the
  Kotlin stdlib is dexed.
- R classes: aapt2 link --java, with --extra-packages for every library.
- options::libraries (Android libraries from source), options::aars and
  options::jars, and options::maven through a lock file resolved by
  xim:coursier (feature dist-apk-maven). MCPP_DIST_APK_MAVEN=update and
  =fetch are the only packs that reach the network; an ordinary pack checks
  each cached artifact against the lock's sha256.
- A stated subset of the manifest merger: tools:node remove/replace,
  tools:replace, ${applicationId}, a conflicting element refused by name.
- options::sign = false writes the aligned package unsigned.

dist-apple
- options::info_plist: a project's entries join the Info.plist; a key the
  member derives is refused by name, and one it only defaults is replaced.
- options::provisioning_profile, on the iOS device row: embedded as
  embedded.mobileprovision, its entitlements sign the bundle, and its
  application identifier must cover the bundle's.
- The device row's runner named app is devicectl-run, from
  xim:apple-device-tools.

mcpp::plugins::xml is the XML reader and writer the two members share.
With no new option set, both members plan what 0.10.1 planned.

CI bridges the three xim recipes openxlings/xim-pkgindex#844 adds until the
published index carries them. The Android fixtures build on Linux: mcpp
2026.9.14.2 does not link an Android row on a macOS host
(mcpp-community/mcpp#647, E3).

Author: Sunrisepeak

.github/scripts/bridge-xim-recipes.py

@@ -0,0 +1,95 @@
+#!/usr/bin/env python3
+"""The xim recipes 0.11.0's features declare, until the published index has them.
+
+TEMPORARY. `dist-apk-kotlin` declares `xim:kotlin` 2.4.20, `dist-apk-maven`
+declares `xim:coursier` 2.1.24, and `dist-apple` declares
+`xim:apple-device-tools` 0.1.0 on the iOS device row. openxlings/xim-pkgindex#844
+adds the three recipes. Until the index mcpp syncs carries them, this script
+writes the reviewed recipe files into the synced copy and adds the entries the
+index cache resolves `xim:<name>` through -- what `mcpp index update` would
+have written.
+
+A recipe the synced index already carries at the version declared here is left
+as the index has it, and the script says so. A file this script wrote begins
+with a marker line, so a second run in one job does not mistake it for the
+index's own. When a run prints `published` for all three, the recipes are in the
+index, and this script and the steps that run it are deleted.
+
+The files come from the pull request's head commit, named by its hash, so a CI
+run reads the bytes that were reviewed and not whatever a branch holds later.
+
+Run after `mcpp index update`, with MCPP_HOME set.
+"""
+import json
+import os
+import re
+import sys
+import urllib.request
+
+COMMIT = "8286a17724a4a4a399b23a3e109be457c052e23b"
+BASE = f"https://raw.githubusercontent.com/Sunrisepeak/xim-pkgindex/{COMMIT}/pkgs/"
+MARKER = f"-- bridged by mcpp-plugins CI from xim-pkgindex {COMMIT}\n"
+RECIPES = {  # index path: the version this collection declares
+    "k/kotlin.lua": "2.4.20",
+    "c/coursier.lua": "2.1.24",
+    "a/apple-device-tools.lua": "0.1.0",
+}
+
+
+def main() -> int:
+    home = os.environ.get("MCPP_HOME")
+    if not home:
+        print("::error::MCPP_HOME is not set; this script edits the index under it")
+        return 1
+    root = os.path.join(home, "registry", "data", "xim-pkgindex")
+    cache_path = os.path.join(root, ".xlings-index-cache.json")
+    if not os.path.isfile(cache_path):
+        print(f"::error::{cache_path} does not exist; run `mcpp index update` first")
+        return 1
+    with open(cache_path, encoding="utf-8") as f:
+        cache = json.load(f)
+    entries = cache["entries"]
+
+    changed = False
+    for rel, version in RECIPES.items():
+        dest = os.path.join(root, "pkgs", rel)
+        name = os.path.basename(rel)[:-len(".lua")]
+        key = "xim:" + name
+        if key in entries and os.path.isfile(dest):
+            with open(dest, encoding="utf-8") as f:
+                present = f.read()
+            if present.startswith(MARKER):
+                print(f"bridged earlier in this job: {key} {version}")
+                continue
+            if re.search(r'\["%s"\]' % re.escape(version), present):
+                print(f"published: the index carries {key} {version}; this bridge is not needed for it")
+                continue
+        with urllib.request.urlopen(BASE + rel, timeout=60) as r:
+            text = r.read().decode("utf-8")
+        if not re.search(r'\["%s"\]' % re.escape(version), text):
+            print(f"::error::{BASE + rel} has no version {version}")
+            return 1
+        declared = re.search(r'^\s*name\s*=\s*"([^"]+)"', text, re.M).group(1)
+        if declared != name:
+            print(f"::error::{rel} declares the name {declared}")
+            return 1
+        description = re.search(r'^\s*description\s*=\s*"([^"]*)"', text, re.M).group(1)
+        os.makedirs(os.path.dirname(dest), exist_ok=True)
+        with open(dest, "w", encoding="utf-8", newline="\n") as f:
+            f.write(MARKER + text)
+        entries[key] = {
+            "canonical_name": key, "description": description, "entry_key": key,
+            "identity": {"name": name, "namespace": "xim"}, "name": name,
+            "path": dest.replace("\\", "/"), "ref": "", "type": 0, "version": "",
+        }
+        changed = True
+        print(f"bridged: {key} {version} from xim-pkgindex {COMMIT[:12]}")
+
+    if changed:
+        with open(cache_path, "w", encoding="utf-8") as f:
+            json.dump(cache, f, indent=1)
+    return 0
+
+
+if __name__ == "__main__":
+    sys.exit(main())

.github/workflows/ci.yml

@@ -1219,6 +1219,20 @@ jobs:
       - name: dist-web's second pack copies nothing
         working-directory: tests/web-consumer
         run: MCPP="$MCPP" ./check-web-idempotent.sh
+
+      # TEMPORARY, UNTIL openxlings/xim-pkgindex#844 IS IN THE PUBLISHED INDEX.
+      # 0.11.0's `dist-apk-kotlin` and `dist-apk-maven` declare `xim:kotlin` and
+      # `xim:coursier`, which only that pull request adds (with
+      # `xim:apple-device-tools`). The script writes the reviewed recipes into
+      # the synced index and does nothing for a recipe the index already
+      # carries; see its header for when it and this step are deleted. Here,
+      # right before the Android steps, because the index is synced again when
+      # a dependency misses and a sync rewrites the cache this edits.
+      - name: bridge the xim recipes the published index does not carry yet
+        run: |
+          "$MCPP" index update
+          python3 .github/scripts/bridge-xim-recipes.py
+
       # `kind = "app"` on `*-linux-android` links a shared object (#622 A3),
       # so this fixture's own toolchain resolution provisions `xim:android-
       # ndk` for `--target x86_64-linux-android` exactly as mcpp's own CI
@@ -1288,8 +1302,10 @@ jobs:
       # reached by an absolute path, dex into one file carrying classes from
       # both; (g) a project's own res/ links as the BASE -- two resources
       # nothing else defines reach the apk (0.9.0 linked res/ as an aapt2
-      # overlay, which refuses any resource the base does not already have).
-      - name: dist-apk's manifest template, Java roots, res/ and version tokens, (a) to (h)
+      # overlay, which refuses any resource the base does not already have);
+      # (i) Kotlin sources without the `dist-apk-kotlin` feature are refused
+      # naming it, and (j) `sign = false` with a keystore is refused (0.11.0).
+      - name: dist-apk's manifest template, Java roots, res/, version tokens and refusals, (a) to (j)
         working-directory: tests/apk-consumer
         run: MCPP="$MCPP" ./check-apk-features.sh
 
@@ -1308,6 +1324,24 @@ jobs:
         working-directory: tests/apk-consumer-shared
         run: MCPP="$MCPP" ./check-apk-closure.sh
 
+      # 0.11.0: KOTLIN, R CLASSES, LIBRARIES, ARCHIVES, A MAVEN GRAPH AND AN
+      # UNSIGNED PACKAGE. One fixture reaches every configuration through the
+      # environment variables its script sets: an application of Kotlin and
+      # Java, a library from source, a local AAR and JAR in one signed APK
+      # (every class in the dex, the three R packages, the application's value
+      # winning a resource both define, the merged manifest, the archive's
+      # native library and assets); `sign = false`; an App Bundle from the same
+      # inputs; a manifest conflict refused by name; and a Maven graph through
+      # its lock -- refused without one, resolved by
+      # `MCPP_DIST_APK_MAVEN=update`, read from the cache by an ordinary pack,
+      # refused with an empty cache, restored by `MCPP_DIST_APK_MAVEN=fetch`,
+      # and refused when the lock is stale. The two explicit modes are the only
+      # packs that reach the network.
+      - name: dist-apk compiles Kotlin beside Java and packs libraries, archives and a Maven graph
+        timeout-minutes: 30
+        working-directory: tests/apk-consumer-libraries
+        run: MCPP="$MCPP" ./check-apk-libraries.sh
+
       # Compiles the device unit on a machine with no GPU: the clang route
       # produces sm_89 code from the payload toolkit. Running it needs a
       # device, so the run is of the CPU variant, which the same seam serves.
@@ -1369,25 +1403,26 @@ jobs:
           # `<name> = { ... }`. Reading keys out of the table BODY matched
           # `sources` once per feature and reported the fixture as
           # incomplete while the extractor was what broke.
-          # MEMBERS, NOT EVERY FEATURE. A feature that another feature
-          # IMPLIES is internal -- `surface` carries the build-program half of
-          # the generated surface and every member implies it, and a consumer
-          # never writes it. Subtracting the implied ones keeps this check
+          # MEMBERS, NOT EVERY FEATURE. A member is a feature named for its
+          # family -- `rules-*`, `tools-*`, `dist-*`, the README's naming table
+          # -- and a consumer names it. `surface` is not one: it carries the
+          # build-program half of the generated surface, every member implies
+          # it, and a consumer never writes it. Keeping it out keeps this check
           # meaning "the fixture names every member a consumer can activate";
           # padding the fixture instead would make it mean less.
           #
-          # The rule is read out of the manifest, not listed here, so a seventh
-          # MEMBER is still caught: nothing implies it.
+          # BY NAME, NOT BY "NOTHING IMPLIES IT". That was the rule until 0.11.0,
+          # when `dist-apk-kotlin` and `dist-apk-maven` came to imply `dist-apk`,
+          # which a consumer still names. The rule is read out of the manifest,
+          # not listed here, so a new member is still caught.
           # A TEMP FILE, NOT `<(...)`. This step also runs on windows-2022
           # through Git Bash, where process substitution is emulated and not
           # dependable -- and a check that behaves differently on one of the
           # three hosts is the exact class of difference this job exists to
           # catch, so it must not introduce one.
-          grep -oE '^implies[[:space:]]*=.*' mcpp.toml \
-            | grep -oE '"[a-z0-9-]+"' | tr -d '"' | sort -u > /tmp/implied.txt
           grep -oE '^\[features\.[a-z0-9-]+\]' mcpp.toml \
-            | sed 's/^\[features\.//; s/\]$//' | sort > /tmp/allfeats.txt
-          feats=$(comm -23 /tmp/allfeats.txt /tmp/implied.txt)
+            | sed 's/^\[features\.//; s/\]$//' | grep -E '^(rules|tools|dist)-' | sort > /tmp/members.txt
+          feats=$(cat /tmp/members.txt)
           used=$(sed -n '/features = \[/,/\], host-module/p' tests/all-rules-compile/mcpp.toml \
                  | grep -oE '"[a-z-]+"' | tr -d '"' | sort)
           [ -n "$feats" ] || {
@@ -1710,23 +1745,20 @@ jobs:
           # `<name> = { ... }`. Reading keys out of the table BODY matched
           # `sources` once per feature and reported the fixture as
           # incomplete while the extractor was what broke.
-          # MEMBERS, NOT EVERY FEATURE. A feature that another feature
-          # IMPLIES is internal -- `surface` carries the build-program half of
-          # the generated surface and every member implies it, and a consumer
-          # never writes it. Subtracting the implied ones keeps this check
-          # meaning "the fixture names every member a consumer can activate";
-          # padding the fixture instead would make it mean less. The rule is
-          # read out of the manifest, so a seventh MEMBER is still caught.
+          # MEMBERS, NOT EVERY FEATURE: a feature named for its family
+          # (`rules-*`, `tools-*`, `dist-*`), which a consumer names; `surface`,
+          # which every member implies and no consumer writes, is not one. By
+          # name and not by "nothing implies it" since 0.11.0, when
+          # `dist-apk-kotlin` and `dist-apk-maven` came to imply `dist-apk`. The
+          # rule is read out of the manifest, so a new member is still caught.
           #
           # A temp file, not `<(...)`: this step also runs on windows-2022
           # through Git Bash, where process substitution is emulated and not
           # dependable -- and a check that behaves differently on one of the
           # three hosts is the class of difference this job exists to catch.
-          grep -oE '^implies[[:space:]]*=.*' mcpp.toml \
-            | grep -oE '"[a-z0-9-]+"' | tr -d '"' | sort -u > /tmp/implied.txt
           grep -oE '^\[features\.[a-z0-9-]+\]' mcpp.toml \
-            | sed 's/^\[features\.//; s/\]$//' | sort > /tmp/allfeats.txt
-          feats=$(comm -23 /tmp/allfeats.txt /tmp/implied.txt)
+            | sed 's/^\[features\.//; s/\]$//' | grep -E '^(rules|tools|dist)-' | sort > /tmp/members.txt
+          feats=$(cat /tmp/members.txt)
           used=$(sed -n '/features = \[/,/\], host-module/p' tests/all-rules-compile/mcpp.toml \
                  | grep -oE '"[a-z-]+"' | tr -d '"' | sort)
           [ -n "$feats" ] || {
@@ -1950,6 +1982,37 @@ jobs:
           grep -q 'closure = not-walked' pack.log || echo "note: the stage manifest's closure line was not echoed by pack"
           echo "ok: one bundle, a valid plist, it launches, and the resource is where NSBundle looks"
 
+      # 0.11.0 (`options::info_plist`): a project's Info.plist entries join the
+      # generated plist of the real bundle, a key the member only defaults
+      # (`NSHighResolutionCapable`) takes the project's value, Apple's parser
+      # accepts the result, and the bundle still launches. The refusal of a key
+      # the member derives is asserted at the plan level, in the Linux job.
+      - name: dist-apple carries a project's Info.plist entries, and the bundle launches
+        if: ${{ !cancelled() && runner.os == 'macOS' }}
+        working-directory: tests/app-consumer
+        run: |
+          set -e
+          export APP_CONSUMER_INFO_PLIST="$PWD/info-plist/usage.plist"
+          "$MCPP" pack --format app | tee pack-info.log
+          app=$(find target -name '*.app' -type d | head -1)
+          test -n "$app" || { cat pack-info.log; echo "FAIL: no .app bundle"; exit 1; }
+          plist="$app/Contents/Info.plist"
+          plutil -lint "$plist"
+          pb() { /usr/libexec/PlistBuddy -c "Print :$1" "$plist"; }
+          [ "$(pb NSCameraUsageDescription)" = "Scans the codes a user points the camera at." ] \
+            || { echo "FAIL: the usage description did not reach the bundle"; cat "$plist"; exit 1; }
+          [ "$(pb CFBundleURLTypes:0:CFBundleURLSchemes:0)" = "mcpp-fixture" ] \
+            || { echo "FAIL: the URL type did not reach the bundle"; cat "$plist"; exit 1; }
+          [ "$(pb NSHighResolutionCapable)" = "false" ] \
+            || { echo "FAIL: the project's NSHighResolutionCapable did not replace the default"; cat "$plist"; exit 1; }
+          [ "$(grep -c '<key>NSHighResolutionCapable</key>' "$plist")" -eq 1 ] \
+            || { echo "FAIL: NSHighResolutionCapable is stated twice"; cat "$plist"; exit 1; }
+          [ "$(pb CFBundleExecutable)" = "app-consumer" ] \
+            || { echo "FAIL: CFBundleExecutable is no longer the member's"; cat "$plist"; exit 1; }
+          "$app/Contents/MacOS/app-consumer" | grep -q '^app-consumer ok' \
+            || { echo "FAIL: the bundle does not launch with the project's entries"; exit 1; }
+          echo "ok: the project's entries are in the bundle's Info.plist, plutil accepts it, and the bundle launches"
+
       # THE CLOSURE AS A FRAMEWORK, ON THE BUNDLE (mcpp#634, B1 to B3). The
       # plan-level half runs on Linux. This step, the Metal step and the iOS
       # step measure independent things, so each runs when an earlier step of
@@ -2070,6 +2133,54 @@ jobs:
             || { echo "FAIL: the program's output line '1-2-3' is absent"; printf '%s\n' "$out" | tail -8 | od -c; exit 1; }
           echo "ok: a flat iOS Simulator bundle, MinimumOSVersion 17.0, and the simulator ran it and returned its status 7"
 
+      # 0.11.0 (`options::info_plist`) on the iOS row: the project's entries
+      # join the simulator bundle's Info.plist, its `UIDeviceFamily` replaces
+      # the member's default, and the simulator installs and runs the bundle.
+      - name: dist-apple's iOS row carries a project's Info.plist entries, and the simulator runs the bundle
+        if: ${{ !cancelled() && runner.os == 'macOS' }}
+        working-directory: tests/ios-app-consumer
+        run: |
+          set -uo pipefail
+          if ! xcrun --sdk iphonesimulator --show-sdk-path >/dev/null 2>&1; then
+            echo "SKIP: no iphonesimulator SDK on this runner"; exit 0
+          fi
+          set -e
+          export IOS_APP_CONSUMER_INFO_PLIST="$PWD/info-plist/usage.plist"
+          "$MCPP" pack --target aarch64-ios-sim --format app | tee pack-info.log
+          app=$(find target -name '*.app' -type d | head -1)
+          test -n "$app" || { cat pack-info.log; echo "FAIL: no .app bundle"; exit 1; }
+          plist="$app/Info.plist"
+          plutil -lint "$plist"
+          pb() { /usr/libexec/PlistBuddy -c "Print :$1" "$plist"; }
+          [ "$(pb NSCameraUsageDescription)" = "Scans the codes a user points the camera at." ] \
+            || { echo "FAIL: the usage description did not reach the bundle"; cat "$plist"; exit 1; }
+          [ "$(pb CFBundleURLTypes:0:CFBundleURLSchemes:0)" = "mcpp-fixture" ] \
+            || { echo "FAIL: the URL type did not reach the bundle"; cat "$plist"; exit 1; }
+          [ "$(pb UIDeviceFamily:0)" = "1" ] && ! pb UIDeviceFamily:1 >/dev/null 2>&1 \
+            || { echo "FAIL: UIDeviceFamily is not the project's (1)"; cat "$plist"; exit 1; }
+          [ "$(pb CFBundleSupportedPlatforms:0)" = "iPhoneSimulator" ] \
+            || { echo "FAIL: CFBundleSupportedPlatforms is no longer the member's"; cat "$plist"; exit 1; }
+          out=$("$MCPP" run --target aarch64-ios-sim --format app 2>&1) && rc=0 || rc=$?
+          printf '%s\n' "$out" | tail -20
+          [ "$rc" -eq 7 ] \
+            || { echo "FAIL: mcpp run exited $rc with the project's entries, and the program exits 7"; exit 1; }
+          echo "ok: the simulator bundle carries the project's entries, and the simulator ran it and returned 7"
+
+      # NO dist-apk STEP ON THIS HOST, AND THE REASON IS THE ENGINE. The NDK,
+      # the build tools, the platform, the JDK, the Kotlin compiler and coursier
+      # all publish a macOS table, and `tests/apk-consumer` was packed here once
+      # (0.11.0's first run): `mcpp build --target x86_64-linux-android` failed
+      # at the application's own link with
+      #
+      #   ld64.lld: error: unknown argument '-soname'
+      #
+      # before any dist-apk step ran. On a macOS host mcpp 2026.9.14.2 composes
+      # the link line in its macOS branch, which states the target triple only
+      # for an Apple row, so `-fuse-ld=lld` picks the Mach-O flavour
+      # (mcpp-community/mcpp#647, E3). The steps return when an engine links
+      # that row; the Windows NDK has no libc++ module surface, so that host
+      # has no Android row at all.
+
       - name: the rule declared its own compiler
         working-directory: tests/spirv-consumer
         run: |