oficina / calendar Public

Pin the native apps to rastrillo/native main (offline K0)

Moves every Swift pin (Package.swift, project.yml, Package.resolved and,
where committed, the MacStore project) to rastrillo/native main 2a5d07b,
the merged native Apple chain. Bumps amadan.net/rastrillo/native/server off
33ffe99 to the same commit; existing native and web sign-in are unaffected.
Reviewed by GPT-6-Astra via Codex (Fable at its limit), on Paul's
instruction.

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

Squashed from chore/k0-native-pin into main.

Paul Campbell pushed by claude 3 weeks ago 4d2975d555ace06db7d26508a46622004335b44a parent f6aa41c

8 files changed, +9 −9

go.mod +1 −1
go.sum +2 −2
native/README.md +1 −1
native/apple/Package.resolved +1 −1
native/apple/Package.swift +1 −1
native/ios/project.yml +1 −1
native/macos/CalendarMacStore.xcodeproj/project.pbxproj +1 −1
native/macos/project.yml +1 −1

CI passed — run details

CI log

=== vet ===
go vet ./...
=== fmt ===
=== test ===
go test ./...
?   	amadan.net/oficina/calendar/cmd/calendar	[no test files]
ok  	amadan.net/oficina/calendar/internal/calendar	4.461s
?   	amadan.net/oficina/calendar/internal/calendar/icons	[no test files]
?   	amadan.net/oficina/calendar/internal/calendar/seal	[no test files]
ok  	amadan.net/oficina/calendar/internal/calendartest	2.170s
ok  	amadan.net/oficina/calendar/internal/guardstest	0.038s
=== migration-check ===
go run github.com/carlosframework/rastrillo/cmd/rastrillo migration check
rastrillo migration check: models and migrations agree

diff --git a/go.mod b/go.mod

index aeec6fd..a019e36 100644

--- a/go.mod

+++ b/go.mod

@@ -44,4 +44,4 @@ require (

tool github.com/carlosframework/rastrillo/cmd/rastrillo

-require amadan.net/rastrillo/native/server v0.0.0-20260912204600-33ffe9941734

+require amadan.net/rastrillo/native/server v0.0.0-20260923173546-2a5d07b2c8d3

diff --git a/go.sum b/go.sum

index 59b71e4..24f044d 100644

--- a/go.sum

+++ b/go.sum

@@ -4,8 +4,8 @@ amadan.net/oficina/home/connect v0.0.0-20260910000424-5b8d8410775f h1:lkw3tjzHfZ

amadan.net/oficina/home/connect v0.0.0-20260910000424-5b8d8410775f/go.mod h1:YroavXe43Wietec+po8mtSk4a9Bir2h31Q3iAf4MWxI=

amadan.net/oficina/home/handoff v0.0.0-20260908102137-481d2d57f489 h1:RPKtyry/71i06o8L+gjAaUyexbmG56kO1YPs601URAM=

amadan.net/oficina/home/handoff v0.0.0-20260908102137-481d2d57f489/go.mod h1:YISpzFJ+iMgrM0rUL032OSzsAQbP4/nozvXLCCOcn1k=

-amadan.net/rastrillo/native/server v0.0.0-20260912204600-33ffe9941734 h1:hI8/x1OEHCragb3bclo1X2bI6XCO1DDQ3plWcQPbI0g=

-amadan.net/rastrillo/native/server v0.0.0-20260912204600-33ffe9941734/go.mod h1:ZaaxeE278dJltdrLwmwpxUjQ5wuKzqDAVSNRet+WupY=

+amadan.net/rastrillo/native/server v0.0.0-20260923173546-2a5d07b2c8d3 h1:5EFx7BLJj/+G/rt8bTmeyMWVfF5s5Sns7ajTvX4w/I8=

+amadan.net/rastrillo/native/server v0.0.0-20260923173546-2a5d07b2c8d3/go.mod h1:ZaaxeE278dJltdrLwmwpxUjQ5wuKzqDAVSNRet+WupY=

amadan.net/rastrillo/rastrillo v0.26.1-0.20260908075707-29e4491631bd h1:jlFSt95M1ontOg+VePU+kIJpChtWqDQAbnmlxqCnbgc=

amadan.net/rastrillo/rastrillo v0.26.1-0.20260908075707-29e4491631bd/go.mod h1:RpyHVPD0udcSfHJroY0KZE/FUjgw6Tvfo8SJm2qeZGE=

github.com/BurntSushi/toml v1.6.0 h1:dRaEfpa2VI55EwlIW72hMRHdWouJeRF7TPYhI+AUQjk=

diff --git a/native/README.md b/native/README.md

index b19efc7..d6c2c1f 100644

--- a/native/README.md

+++ b/native/README.md

@@ -15,7 +15,7 @@ the iOS project with `xcodegen generate --spec native/ios/project.yml`, then bui

`CalendarPhone` in Xcode. Physical devices require your development team.

The generated projects and build products are ignored.

-The Swift and Go dependencies pin Rastrillo Native revision `33ffe994173438bbb45e88d16061eba2ac4f6d4c`.

+The Swift and Go dependencies pin Rastrillo Native main `2a5d07b2c8d3dfb3fd8526dc7e1c802f97865c67`.

Browser sign-in requires the new backend `/native/` routes. A server that has

not received this update reports that native support is unavailable.

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

index cf50d40..5660560 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" : "229525909e1d6ac3b6a353d1c4d022798b0e9a24"

+ "revision" : "2a5d07b2c8d3dfb3fd8526dc7e1c802f97865c67"

}

{

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

index 5c2847e..69bb145 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(name: "native", path: $0) }

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

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

let package = Package(name: "CalendarNative", platforms: [.macOS(.v14), .iOS(.v17)],

products: [.library(name: "CalendarKit", targets: ["CalendarKit"]), .executable(name: "CalendarMac", targets: ["CalendarMac"])],

diff --git a/native/ios/project.yml b/native/ios/project.yml

index 247ba91..5745b2c 100644

--- a/native/ios/project.yml

+++ b/native/ios/project.yml

@@ -8,7 +8,7 @@ packages:

path: ../apple

RastrilloNative:

url: https://amadan.net/rastrillo/native

- revision: 229525909e1d6ac3b6a353d1c4d022798b0e9a24

+ revision: 2a5d07b2c8d3dfb3fd8526dc7e1c802f97865c67

settings:

base:

SWIFT_VERSION: '5.0'

diff --git a/native/macos/CalendarMacStore.xcodeproj/project.pbxproj b/native/macos/CalendarMacStore.xcodeproj/project.pbxproj

index 7d85cf2..261aff9 100644

--- a/native/macos/CalendarMacStore.xcodeproj/project.pbxproj

+++ b/native/macos/CalendarMacStore.xcodeproj/project.pbxproj

@@ -366,7 +366,7 @@

repositoryURL = "https://amadan.net/rastrillo/native";

requirement = {

kind = revision;

- revision = 229525909e1d6ac3b6a353d1c4d022798b0e9a24;

+ revision = 2a5d07b2c8d3dfb3fd8526dc7e1c802f97865c67;

};

/* End XCRemoteSwiftPackageReference section */

diff --git a/native/macos/project.yml b/native/macos/project.yml

index f064a2e..7e8ae5f 100644

--- a/native/macos/project.yml

+++ b/native/macos/project.yml

@@ -7,7 +7,7 @@ packages: