oficina / meet Public

Merge origin/main (rastrillo/native pin 2a5d07b) into integrate/native-2026-09-23

Main moved while the gates ran: 8255e6d pins the native apps to
rastrillo/native 2a5d07b. It merged without conflict beside the LiveKit
and screen share changes to Package.swift and Package.resolved.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

Paul Campbell pushed by paul@keymail.dev 3 weeks ago 156d092af2d56da3ba189f40d4ac2a7e3bb58026 parent 1adc69eparent 8255e6d

2 files changed, +2 −2

native/apple/Package.resolved +1 −1
native/apple/Package.swift +1 −1

CI passed — run details

diff --git a/native/apple/Package.resolved b/native/apple/Package.resolved

index bc609ee..84e1d49 100644

--- a/native/apple/Package.resolved

+++ b/native/apple/Package.resolved

@@ -5,7 +5,7 @@

"kind" : "remoteSourceControl",

"location" : "https://amadan.net/rastrillo/native",

"state" : {

- "revision" : "4c61d6283a188c95647e1d0e609e69d29c2e7fa1"

+ "revision" : "2a5d07b2c8d3dfb3fd8526dc7e1c802f97865c67"

}

{

diff --git a/native/apple/Package.swift b/native/apple/Package.swift

index 53489c4..d87ec97 100644

--- a/native/apple/Package.swift

+++ b/native/apple/Package.swift

@@ -3,7 +3,7 @@ import PackageDescription

import Foundation

let sharedNative: Package.Dependency = ProcessInfo.processInfo.environment["OFICINA_NATIVE_PACKAGE_PATH"].map { .package(path: $0) }

- ?? .package(url: "https://amadan.net/rastrillo/native", revision: "4c61d6283a188c95647e1d0e609e69d29c2e7fa1")

+ ?? .package(url: "https://amadan.net/rastrillo/native", revision: "2a5d07b2c8d3dfb3fd8526dc7e1c802f97865c67")

let package = Package(

name: "CallsNative",