peachsim 0.1.829 → 0.1.831

package/dist-lib/skills.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.829 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.831 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 let __sootsim_import_meta_url = '', __sootsim_import_meta_dirname = ''; try { __sootsim_import_meta_url = require('url').pathToFileURL(__filename).href; __sootsim_import_meta_dirname = __dirname; } catch {}
 "use strict";
 var __create = Object.create;
@@ -4535,7 +4535,7 @@ var init_supported_native_packages = __esm({
       "@react-native-masked-view/masked-view",
       // seam+coverage
       "@react-native-menu/menu",
-      // coverage
+      // seam+coverage
       "@react-native-ml-kit/barcode-scanning",
       // seam
       "@react-native-picker/picker",
@@ -7827,9 +7827,9 @@ var init_registry = __esm({
           {
             range: ">=5.0.0",
             coverage: 0.9,
-            note: "native-seam only \u2014 the real package JS runs from the bundle; requireNativeComponent('RNDatePicker') resolves to the engine's UIDatePickerStyleWheels implementation (canvas wheel columns with drag/fling/snap physics, selection capsule, edge fade, locale-ordered date parts via Intl, light/dark/auto theme). onChange emits the upstream { timestamp: ms } contract on wheel settle.",
-            working: "DatePicker (inline), date, onDateChange, mode (date/time/datetime), locale (month names, y/m/d column order, 12/24h cycle, day-period labels), minimumDate, maximumDate (settle-clamp bounce), minuteInterval, timeZoneOffsetInMinutes, textColor, theme",
-            missing: "modal/open mode (NativeModules.RNDatePicker openPicker seam is a no-op; onConfirm/onCancel never fire), wheel wrap-around for month/day columns, cylindrical row compression (edge fade only), datetime day wheel spans min/max or \xB12 years instead of the UIKit range"
+            note: "the real package JS runs from the bundle; requireNativeComponent('RNDatePicker') resolves to the shared wheel picker. Inline changes emit the upstream timestamp event. The iOS modal presents those wheels through the native action sheet, with Confirm, Cancel and programmatic dismissal; the package converts the confirmed timestamp to Date.",
+            working: "DatePicker (inline), iOS modal/open with onConfirm/onCancel and closePicker, date, onDateChange, mode (date/time/datetime), locale (month names, y/m/d column order, 12/24h cycle, day-period labels), minimumDate, maximumDate (settle-clamp bounce), minuteInterval, timeZoneOffsetInMinutes, textColor, theme",
+            missing: "Android modal/open mode, wheel wrap-around for month/day columns, cylindrical row compression (edge fade only), datetime day wheel spans min/max or \xB12 years instead of the UIKit range"
           }
         ]
       },

package/dist-lib/swift-compile.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.829 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.831 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 let __sootsim_import_meta_url = '', __sootsim_import_meta_dirname = ''; try { __sootsim_import_meta_url = require('url').pathToFileURL(__filename).href; __sootsim_import_meta_dirname = __dirname; } catch {}
 "use strict";
 var __create = Object.create;

package/dist-lib/swift-compile.mjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.829 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.831 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 
 // src/swift-compile.ts
 import { execFile as execFile2, execFileSync } from "node:child_process";

package/dist-lib/swift-package.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.829 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.831 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 let __sootsim_import_meta_url = '', __sootsim_import_meta_dirname = ''; try { __sootsim_import_meta_url = require('url').pathToFileURL(__filename).href; __sootsim_import_meta_dirname = __dirname; } catch {}
 "use strict";
 var __defProp = Object.defineProperty;

package/dist-lib/swift-package.mjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.829 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.831 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 
 // src/swift-package.ts
 function isSwiftManifestFile(file) {

package/dist-lib/swift-submit.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.829 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.831 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 let __sootsim_import_meta_url = '', __sootsim_import_meta_dirname = ''; try { __sootsim_import_meta_url = require('url').pathToFileURL(__filename).href; __sootsim_import_meta_dirname = __dirname; } catch {}
 "use strict";
 var __defProp = Object.defineProperty;

package/dist-lib/swift-submit.mjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.829 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.831 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 
 // src/swift-submit.ts
 var SWIFT_COMPILE_PATH = "/api/swift-compile";

package/dist-lib/swift-toolchain.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.829 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.831 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 let __sootsim_import_meta_url = '', __sootsim_import_meta_dirname = ''; try { __sootsim_import_meta_url = require('url').pathToFileURL(__filename).href; __sootsim_import_meta_dirname = __dirname; } catch {}
 "use strict";
 var __create = Object.create;

package/dist-lib/swift.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.829 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.831 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 let __sootsim_import_meta_url = '', __sootsim_import_meta_dirname = ''; try { __sootsim_import_meta_url = require('url').pathToFileURL(__filename).href; __sootsim_import_meta_dirname = __dirname; } catch {}
 "use strict";
 var __defProp = Object.defineProperty;

package/dist-lib/vite-swift.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.829 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.831 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 let __sootsim_import_meta_url = '', __sootsim_import_meta_dirname = ''; try { __sootsim_import_meta_url = require('url').pathToFileURL(__filename).href; __sootsim_import_meta_dirname = __dirname; } catch {}
 "use strict";
 var __create = Object.create;

package/dist-lib/vite.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.829 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.831 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 let __sootsim_import_meta_url = '', __sootsim_import_meta_dirname = ''; try { __sootsim_import_meta_url = require('url').pathToFileURL(__filename).href; __sootsim_import_meta_dirname = __dirname; } catch {}
 "use strict";
 var __create = Object.create;

package/dist-lib/worklet-executable.cjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.829 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.831 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 let __sootsim_import_meta_url = '', __sootsim_import_meta_dirname = ''; try { __sootsim_import_meta_url = require('url').pathToFileURL(__filename).href; __sootsim_import_meta_dirname = __dirname; } catch {}
 "use strict";
 var __defProp = Object.defineProperty;

package/dist-lib/worklet-executable.mjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.829 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.831 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 
 // src/worklet-executable.ts
 import { parse } from "acorn";

package/kotlin/fork/NOTICE

@@ -1,7 +1,7 @@
 Peach's patched builds of JetBrains Compose Multiplatform UI and Skiko
 
-This directory records modified builds of two Apache License 2.0 projects.
-The license text is in LICENSE beside this file.
+This directory records modified Compose and Skiko builds under Apache License
+2.0 (LICENSE), and a modified Skia shaping unit under BSD-3-Clause (SKIA_LICENSE).
 
 - JetBrains/compose-multiplatform-core at tag v1.13.0-alpha01
   (commit a9e47e8aa04c95cfe572ab4297c770f3cbfb234e), a fork of the Android
@@ -16,6 +16,9 @@ The license text is in LICENSE beside this file.
 
     https://android.googlesource.com/platform/frameworks/base
 
+- JetBrains/skia at tag m152-2ca5fe6a81
+  (commit 2ca5fe6a8170e2f55f519d9de083be4dccc06e70). Copyright Google Inc. and respective authors.
+
 Modifications: compose-worker-globals.patch and skiko-worker-clock.patch
 change clock and clipboard reads to globalThis rather than window, and add an
 explicit ui-text locale provider and Skiko host OS provider whose defaults
@@ -30,3 +33,9 @@ material3-wasm-js 1.13.0-alpha01, navigation-compose-wasm-js 2.10.0-beta01,
 and skiko-wasm-js 0.152.0-alpha02 compiled from the patched sources.
 skiko-wasm-0.152.0-alpha02.jar contains that worker-safe loader and
 Skiko's own wasm runtime.
+
+The Compose patch also selects integer static glyph advances on Android and
+scales letter spacing to the integer shaping size, retaining fractional Animated
+text. skia-android-shaping.patch truncates only the measurement-font copy for
+non-subpixel, non-linear shaping. The original run font retains its painting
+size and metrics. The modified Skia unit compiles into the Skiko Wasm runtime.

package/kotlin/fork/README.md

@@ -5,7 +5,7 @@ Peach runs Compose in a React Native tenant worker, with no `window`,
 Compose UI 1.13.0-alpha01 and Skiko 0.152.0-alpha02 platform actuals assume
 browser globals that this native host does not publish. Peach carries patched
 builds until upstream supplies equivalent worker and native host hooks, and
-Android behavior for the three approved web differences below.
+Android behavior for the approved web differences and static text shaping below.
 
 | module | file | native host binding |
 | --- | --- | --- |
@@ -14,6 +14,8 @@ Android behavior for the three approved web differences below.
 | Compose `ui` | `SystemTheme.kt` | `LocalSystemTheme` visible to the host, which provides the device's night mode |
 | Compose `ui-text` | `PlatformLocale.web.kt` | explicit `setPlatformLocaleProvider`; its default keeps upstream navigator behavior |
 | Compose `ui-skiko` | `SkiaBackedPaint.nonAndroid.kt` | initial Miter join agrees with the backing paint and Android |
+| Compose `ui-skiko` | `SkikoText.nonAndroid.kt`, `SkikoParagraphBuilder.nonAndroid.kt` | Android static advances and letter-spacing scale; Animated text retains fractional shaping |
+| Skia shaper | `SkShaper_harfbuzz.cpp` | measurement-font copy truncates static shaping size; the painted run font retains the requested size |
 | Compose `material3` | `PlatformDateFormat.web.kt` | timestamp formatting uses UTC, as Android does |
 | Navigation `navigation-compose` | `DefaultNavTransitions.web.kt` | Android forward fades and predictive pop defaults |
 | Skiko | `OsArch.web.kt` | explicit `setHostOsProvider`; its default lazily retains upstream OS detection |
@@ -28,8 +30,12 @@ this contract.
 
 `fork.json` pins repositories, commits, patch hashes, JDK and Android tools.
 Every changed upstream file carries a modification notice. `LICENSE` and
-`NOTICE` travel with the patches. `build.sh` builds the changed KLIBs and Skiko
-runtime jar with the upstream Gradle builds on the Linux builder.
+`NOTICE` travel with the patches. `SKIA_LICENSE` records the shaping unit’s BSD license. `build.sh` builds the changed KLIBs and Skiko
+runtime jar with the upstream Gradle builds on the Linux builder. The Skia shaping
+unit is fetched at its pinned commit, patched, and compiled into Skiko; the linker
+uses it instead of the same unit in the pinned Skia archive. All other Skia
+objects retain their upstream build. This adds no allocation beyond the existing
+measurement-font copy, and truncates once per shaped font, outside the glyph loop.
 
 ```sh
 delivery="scripts/tmp/kotlin-fork-$(date +%s)-$$"
@@ -53,6 +59,11 @@ with an en-US browser.
 
 Delete the fork when official releases provide worker-safe clocks/clipboard,
 a location-independent loader and equivalent native locale/host OS provider hooks,
-plus UTC date formatting, Android navigation defaults and the correct initial paint join,
+plus UTC date formatting, Android navigation defaults, the correct initial paint join
+and Android static shaping size/advances,
 then rematch the Android pins in `plans/peach/kotlin-everywhere.md`. The prepared
 upstream issue names these hooks and the full guest regression vehicle.
+
+The static shaping correction is measured against the original `textwidth`
+fixture. Styled line-end letter spacing and Animated whole-width rounding
+remain open in the lane plan; the shaping correction does not close those grades.

package/kotlin/fork/SKIA_LICENSE

@@ -0,0 +1,29 @@
+Copyright (c) 2011 Google Inc. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+  * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.
+
+  * Neither the name of the copyright holder nor the names of its
+    contributors may be used to endorse or promote products derived
+    from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

package/kotlin/fork/build.sh

@@ -116,8 +116,14 @@ checkout 0
 )
 
 checkout 1
+SKIKO_SOURCE=${SOURCE}
+checkout 2
+# compile the patched shaping unit in Skiko so the linker uses it in place of
+# the upstream archive unit. all other Skia objects remain pinned upstream.
+cmp "${SOURCE}/LICENSE" "${FORK}/SKIA_LICENSE"
+cp "${SOURCE}/modules/skshaper/src/SkShaper_harfbuzz.cpp"   "${SKIKO_SOURCE}/skiko/src/nativeJsMain/cpp/AndroidShaper.cpp"
 (
-  cd "${SOURCE}/skiko"
+  cd "${SKIKO_SOURCE}/skiko"
   gradle -Pdeploy.version=0.152.0-alpha02 -Pdeploy.release=true \
     -Pskiko.wasm.enabled=true -Pskiko.awt.enabled=false \
     :publishWasmJsPublicationToMavenLocal :skikoWasmJar
@@ -133,5 +139,5 @@ cp "${M2}/org/jetbrains/compose/ui/ui-wasm-js/1.13.0-alpha01/ui-wasm-js-1.13.0-a
   "${DELIVER}/"
 # the record travels with the klibs it describes, so publishing attaches what
 # this build used, not whatever the checkout holds later
-cp "${FORK}/fork.json" "${FORK}/LICENSE" "${FORK}/NOTICE" "${FORK}"/*.patch "${DELIVER}/"
+cp "${FORK}/fork.json" "${FORK}/LICENSE" "${FORK}/NOTICE" "${FORK}/SKIA_LICENSE" "${FORK}"/*.patch "${DELIVER}/"
 (cd "${DELIVER}" && sha256sum -- *.klib *.jar > artifacts.sha256 && cat artifacts.sha256)

package/kotlin/fork/compose-worker-globals.patch

@@ -237,3 +237,95 @@ diff --git a/navigation/navigation-compose/src/webMain/kotlin/androidx/navigatio
  
  
      public actual val sizeTransform:
+diff --git a/compose/ui/ui-skiko/src/nonAndroidMain/kotlin/androidx/compose/ui/text/SkikoText.nonAndroid.kt b/compose/ui/ui-skiko/src/nonAndroidMain/kotlin/androidx/compose/ui/text/SkikoText.nonAndroid.kt
+--- a/compose/ui/ui-skiko/src/nonAndroidMain/kotlin/androidx/compose/ui/text/SkikoText.nonAndroid.kt
++++ b/compose/ui/ui-skiko/src/nonAndroidMain/kotlin/androidx/compose/ui/text/SkikoText.nonAndroid.kt
+@@ -1,3 +1,4 @@
++// modified for Peach: Android static text uses integer glyph advances.
+ /*
+  * Copyright 2026 The Android Open Source Project
+  *
+@@ -123,7 +124,7 @@
+             )
+ 
+             Platform.Android -> FontRasterizationSettings(
+-                subpixelPositioning = true,
++                subpixelPositioning = false,
+                 smoothing = FontSmoothing.AntiAlias,
+                 hinting = FontHinting.Slight,
+                 autoHintingForced = false,
+diff --git a/compose/ui/ui-skiko/src/nonAndroidMain/kotlin/androidx/compose/ui/text/platform/SkikoParagraphBuilder.nonAndroid.kt b/compose/ui/ui-skiko/src/nonAndroidMain/kotlin/androidx/compose/ui/text/platform/SkikoParagraphBuilder.nonAndroid.kt
+--- a/compose/ui/ui-skiko/src/nonAndroidMain/kotlin/androidx/compose/ui/text/platform/SkikoParagraphBuilder.nonAndroid.kt
++++ b/compose/ui/ui-skiko/src/nonAndroidMain/kotlin/androidx/compose/ui/text/platform/SkikoParagraphBuilder.nonAndroid.kt
+@@ -1,3 +1,4 @@
++// modified for Peach: Android static font sizes and advances follow the native paint.
+ /*
+  * Copyright 2020 The Android Open Source Project
+  *
+@@ -19,6 +20,10 @@
+ package androidx.compose.ui.text.platform
+ 
+ import androidx.compose.ui.InternalComposeUiApi
++import androidx.compose.ui.text.platform.Platform
++import androidx.compose.ui.text.platform.currentPlatform
++import androidx.compose.ui.text.style.TextMotion
++import kotlin.math.floor
+ import androidx.compose.ui.geometry.Size
+ import androidx.compose.ui.graphics.BlendMode
+ import androidx.compose.ui.graphics.Color
+@@ -163,6 +168,8 @@
+ 
+         fun toSkTextStyle(fontFamilyResolver: FontFamily.Resolver): SkTextStyle {
+             val res = SkTextStyle()
++            val resolvedFontSize = if (currentPlatform() == Platform.Android &&
++                !fontRasterizationSettings.subpixelPositioning) floor(fontSize) else fontSize
+             if (textForegroundStyle.color.isSpecified) {
+                 res.color = textForegroundStyle.color.toArgb()
+             }
+@@ -194,7 +201,7 @@
+             }
+ 
+             letterSpacing?.let {
+-                res.letterSpacing = it
++                res.letterSpacing = if (fontSize == 0f) it else it * resolvedFontSize / fontSize
+             }
+ 
+             res.addFontFeatures(FontFeature.parseW3(fontFeatureSettings.orEmpty()))
+@@ -338,6 +345,7 @@
+     blendMode: BlendMode = DrawScope.DefaultBlendMode,
+     lineHeight: TextUnit,
+     lineHeightStyle: LineHeightStyle?,
++    textMotion: TextMotion?,
+ ) = ComputedStyle.Mutable(
+     textForegroundStyle = spanStyle.toParagraphTextForegroundStyle(),
+     brushSize = brushSize,
+@@ -347,7 +355,10 @@
+     fontSynthesis = spanStyle.fontSynthesis,
+     fontFamily = spanStyle.fontFamily,
+     fontFeatureSettings = spanStyle.fontFeatureSettings,
+-    fontRasterizationSettings = platformParagraphStyle?.fontRasterizationSettings ?: FontRasterizationSettings.PlatformDefault,
++    fontRasterizationSettings = platformParagraphStyle?.fontRasterizationSettings ?:
++        if (currentPlatform() == Platform.Android && textMotion === TextMotion.Animated) {
++            FontRasterizationSettings(FontSmoothing.AntiAlias, FontHinting.Slight, true, false)
++        } else FontRasterizationSettings.PlatformDefault,
+     letterSpacing = if (spanStyle.letterSpacing.isSpecified) {
+         with(density) { spanStyle.letterSpacing.toPx() }
+     } else null,
+@@ -401,6 +412,7 @@
+             blendMode = blendMode,
+             lineHeight = textStyle.lineHeight,
+             lineHeightStyle = textStyle.lineHeightStyle,
++            textMotion = textStyle.textMotion,
+         ).toImmutable()
+     }
+ 
+@@ -609,7 +621,8 @@
+             brushSize = brushSize,
+             blendMode = blendMode,
+             lineHeight = textStyle.lineHeight,
+-            lineHeightStyle = textStyle.lineHeightStyle
++            lineHeightStyle = textStyle.lineHeightStyle,
++            textMotion = textStyle.textMotion,
+         )
+         for (i in 1 until activeStyles.size) {
+             style.merge(density, activeStyles[i])

package/kotlin/fork/fork.json

@@ -18,7 +18,7 @@
       "tag": "v1.13.0-alpha01",
       "commit": "a9e47e8aa04c95cfe572ab4297c770f3cbfb234e",
       "patch": "compose-worker-globals.patch",
-      "patchSha256": "1252368b10f9bb87f5f994d010aab47a35cfa9a97cf8cebdf36b88ae3b070f9e"
+      "patchSha256": "7a4002f6ea07fc78b23e8d16851b586521b221ba3e7a9690420b3c1d6be69cd9"
     },
     {
       "name": "skiko",
@@ -28,6 +28,15 @@
       "commit": "96378296bb23c23c5f30cd2b0d42d6f8fdeff730",
       "patch": "skiko-worker-clock.patch",
       "patchSha256": "735a42f7a9d3be1ab288f4d67bef44924ec2b6bbcd59f5a5f76edf22f912c347"
+    },
+    {
+      "name": "skia",
+      "repository": "https://github.com/JetBrains/skia",
+      "license": "BSD-3-Clause",
+      "tag": "m152-2ca5fe6a81",
+      "commit": "2ca5fe6a8170e2f55f519d9de083be4dccc06e70",
+      "patch": "skia-android-shaping.patch",
+      "patchSha256": "1f1b656d8ae1144e3599dd900859202003784d14a52b3bb1da9349f3f8a322df"
     }
   ]
 }

package/kotlin/fork/publish.ts

@@ -22,7 +22,7 @@ const files = readdirSync(delivered)
 const record = files.filter(
   (name) =>
     name.endsWith('.patch') ||
-    ['fork.json', 'LICENSE', 'NOTICE', 'artifacts.sha256'].includes(name),
+    ['fork.json', 'LICENSE', 'SKIA_LICENSE', 'NOTICE', 'artifacts.sha256'].includes(name),
 )
 if (
   record.length !==

package/kotlin/fork/skia-android-shaping.patch

@@ -0,0 +1,21 @@
+diff --git a/modules/skshaper/src/SkShaper_harfbuzz.cpp b/modules/skshaper/src/SkShaper_harfbuzz.cpp
+--- a/modules/skshaper/src/SkShaper_harfbuzz.cpp
++++ b/modules/skshaper/src/SkShaper_harfbuzz.cpp
+@@ -346,10 +346,15 @@
+     // Creating a sub font means that non-available functions
+     // are found from the parent.
+     HBFont skFont(hb_font_create_sub_font(typefaceFont.get()));
++    // modified for the Android host: truncate static shaping size, preserving the run font.
++    auto* measurementFont = new SkFont(font);
++    if (!font.isSubpixel() && !font.isLinearMetrics()) {
++        measurementFont->setSize(SkScalarFloorToScalar(font.getSize()));
++    }
+     hb_font_set_funcs(skFont.get(), skhb_get_font_funcs(),
+-                      reinterpret_cast<void *>(new SkFont(font)),
++                      reinterpret_cast<void *>(measurementFont),
+                       [](void* user_data){ delete reinterpret_cast<SkFont*>(user_data); });
+-    int scale = skhb_position(font.getSize());
++    int scale = skhb_position(measurementFont->getSize());
+     hb_font_set_scale(skFont.get(), scale, scale);
+ 
+     return skFont;

package/kotlin/toolchain.json

@@ -68,9 +68,9 @@
       "sha256": "63f16892ab6435778c60e217a0959516f4fcd46cad8862d6831f055ac30f09d8"
     },
     {
-      "name": "ui-skiko-wasm-js-1.13.0-alpha01-peach-f369d63a5e9f.klib",
-      "url": "https://r2.rnxsim.com/peach-kotlin-fork/f369d63a5e9f64e09a66fd0aa7b1c71be01699987502b8155ef8bc605313f754/ui-skiko-wasm-js-1.13.0-alpha01.klib",
-      "sha256": "f369d63a5e9f64e09a66fd0aa7b1c71be01699987502b8155ef8bc605313f754"
+      "name": "ui-skiko-wasm-js-1.13.0-alpha01-peach-1aa9f1b32539.klib",
+      "url": "https://r2.rnxsim.com/peach-kotlin-fork/1aa9f1b3253964ff20f60d6b057aa0ddaed0343e93d7b4defc613b3ed5b65c3d/ui-skiko-wasm-js-1.13.0-alpha01.klib",
+      "sha256": "1aa9f1b3253964ff20f60d6b057aa0ddaed0343e93d7b4defc613b3ed5b65c3d"
     },
     {
       "name": "ui-text-wasm-js-1.13.0-alpha01-peach-10c54ff0fa5f.klib",
@@ -325,9 +325,9 @@
     "skiko": "0.152.0-alpha02"
   },
   "composeRuntime": {
-    "name": "skiko-wasm-0.152.0-alpha02-peach-4814686165d0.jar",
-    "url": "https://r2.rnxsim.com/peach-kotlin-fork/4814686165d0ba869e605e661d0fb261ecc79f5e984ed6ae78dfe20300923c98/skiko-wasm-0.152.0-alpha02.jar",
-    "sha256": "4814686165d0ba869e605e661d0fb261ecc79f5e984ed6ae78dfe20300923c98"
+    "name": "skiko-wasm-0.152.0-alpha02-peach-637f2f8ae1fa.jar",
+    "url": "https://r2.rnxsim.com/peach-kotlin-fork/637f2f8ae1fa804fd5ef85259d7b45877b07dd98e439eb4f3cc9560db3eba651/skiko-wasm-0.152.0-alpha02.jar",
+    "sha256": "637f2f8ae1fa804fd5ef85259d7b45877b07dd98e439eb4f3cc9560db3eba651"
   },
   "composeJsLibraries": [
     {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "peachsim",
-  "version": "0.1.829",
+  "version": "0.1.831",
   "description": "Vite and Metro plugins, testing drivers, and SDK exports for peach.",
   "author": "Tamagui LLC",
   "license": "SEE LICENSE IN LICENSE",

package/src/native-app-identity.ts

@@ -23,6 +23,7 @@ export interface NativeAppIdentity {
   bundleIdentifier: string
   platform: NativeAppIdentityPlatform
   permissionUsageDescriptions?: Readonly<Record<string, unknown>>
+  urlQuerySchemes?: readonly unknown[]
 }
 
 export type NativeAppIdentityFiles = Record<string, string>
@@ -47,6 +48,8 @@ export function isNativeAppIdentity(value: unknown): value is NativeAppIdentity
   if (!isRecord(value)) return false
   const descriptions = value.permissionUsageDescriptions
   if (descriptions !== undefined && !isRecord(descriptions)) return false
+  if (value.urlQuerySchemes !== undefined && !Array.isArray(value.urlQuerySchemes))
+    return false
   const platform = value.platform
   if (platform !== 'ios' && platform !== 'android') return false
   const applicationName = value.applicationName
@@ -80,6 +83,9 @@ export function readNativeAppIdentity(value: unknown): NativeAppIdentity | null
       : {
           permissionUsageDescriptions: { ...value.permissionUsageDescriptions },
         }),
+    ...(value.urlQuerySchemes === undefined
+      ? {}
+      : { urlQuerySchemes: [...value.urlQuerySchemes] }),
   }
 }
 
@@ -372,11 +378,21 @@ function nativeAppIdentityFromIos(
     identityFieldFrom(settings, plistString(plist, 'CFBundleDisplayName'), undefined) ??
     bundleName
 
-  // only native privacy purpose strings travel here, not an invented Bundle
-  // dictionary. parse XML with the build-side parser so entities and empty
-  // strings survive; the browser identity transport has no XML dependency.
+  // native purpose strings and URL query declarations travel here. parse XML
+  // with the build-side parser; the browser transport has no XML dependency.
   const dictionary = parseInfoPlist(plist)
   if (!isRecord(dictionary)) throw new Error('native app Info.plist is not a dictionary')
+  const querySchemes = dictionary.LSApplicationQueriesSchemes
+  if (querySchemes !== undefined && !Array.isArray(querySchemes)) {
+    throw new Error('native app Info.plist LSApplicationQueriesSchemes is not an array')
+  }
+  const urlQuerySchemes = (querySchemes ?? []).map((value: unknown) => {
+    if (typeof value !== 'string') return value
+    const resolved = resolveBuildSetting(value, settings)
+    if (resolved === null)
+      throw new Error('native app Info.plist LSApplicationQueriesSchemes is unresolved')
+    return resolved
+  })
   const permissionUsageDescriptions: Record<string, unknown> = {}
   for (const [key, value] of Object.entries(dictionary)) {
     if (!/^NS.*UsageDescription$/.test(key)) continue
@@ -411,6 +427,7 @@ function nativeAppIdentityFromIos(
     bundleIdentifier,
     platform: 'ios',
     permissionUsageDescriptions,
+    urlQuerySchemes,
   }
 }