oficina / memoria 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 f3e8c37dd2eda1f828dc53a804eeafb091ca06e7 parent 02cb530

8 files changed, +11 −12

go.mod +1 −1
go.sum +2 −2
native/README.md +3 −4
native/apple/Package.resolved +1 −1
native/apple/Package.swift +1 −1
native/ios/project.yml +1 −1
native/macos/MemoriaMacStore.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/memoria/cmd/memoria	[no test files]
ok  	amadan.net/oficina/memoria/internal/memoria	0.720s
ok  	amadan.net/oficina/memoria/internal/memoria/chunk	(cached)
?   	amadan.net/oficina/memoria/internal/memoria/icons	[no test files]
ok  	amadan.net/oficina/memoria/internal/memoria/index	(cached)
ok  	amadan.net/oficina/memoria/internal/memoria/notion	(cached)
ok  	amadan.net/oficina/memoria/internal/memoria/query	(cached)
ok  	amadan.net/oficina/memoria/internal/memoria/seal	(cached)
ok  	amadan.net/oficina/memoria/internal/memoria/sibling	(cached)
ok  	amadan.net/oficina/memoria/internal/memoriatest	1.362s
?   	amadan.net/oficina/memoria/tools/bench	[no test files]
?   	amadan.net/oficina/memoria/tools/drive	[no test files]
?   	amadan.net/oficina/memoria/tools/seed	[no test files]
?   	amadan.net/oficina/memoria/tools/vendorassets	[no test files]
=== 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 76b6613..30c18e9 100644

--- a/go.mod

+++ b/go.mod

@@ -9,7 +9,7 @@ require (

amadan.net/oficina/home/connect v0.0.0-20260910000424-5b8d8410775f

amadan.net/oficina/home/handoff v0.0.0-20260908102137-481d2d57f489

amadan.net/oficina/suite v0.0.0-20260905215529-60b01a8a0d6d

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

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

github.com/carlosframework/rastrillo v0.23.0

github.com/go-chi/chi/v5 v5.3.2

github.com/google/uuid v1.6.0

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

index 480ad59..68d79d3 100644

--- a/go.sum

+++ b/go.sum

@@ -6,8 +6,8 @@ amadan.net/oficina/home/handoff v0.0.0-20260908102137-481d2d57f489 h1:RPKtyry/71

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

amadan.net/oficina/suite v0.0.0-20260905215529-60b01a8a0d6d h1:x6Bq9+QzpFYAyV+zRzgyHwD/RmZ4Hy4biwtxK7CdaSs=

amadan.net/oficina/suite v0.0.0-20260905215529-60b01a8a0d6d/go.mod h1:Xgw0N+DBiDzkhQHm/nIhgumfaiMElDg/KIFD1OxTm5w=

-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 3296646..79d5f81 100644

--- a/native/README.md

+++ b/native/README.md

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

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

The generated projects and build products are ignored.

-The Swift package pins Rastrillo Native revision `229525909e1d6ac3b6a353d1c4d022798b0e9a24`

-(`native/apple/Package.swift`); the Go server module pins `33ffe994173438bbb45e88d16061eba2ac4f6d4c`

-(`go.mod`, `amadan.net/rastrillo/native/server`). `2295259` is five commits past `33ffe99`

-and carries the saved-accounts refresh the recent-accounts client needs.

+The Swift package and the Go server module (`go.mod`,

+`amadan.net/rastrillo/native/server`) both pin Rastrillo Native main

+`2a5d07b2c8d3dfb3fd8526dc7e1c802f97865c67` (`native/apple/Package.swift`).

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 56441a4..947328f 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: "MemoriaNative", platforms: [.macOS(.v14), .iOS(.v17)],

products: [.library(name: "MemoriaKit", targets: ["MemoriaKit"]), .executable(name: "MemoriaMac", targets: ["MemoriaMac"])],

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

index 024fa6d..8c86003 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/MemoriaMacStore.xcodeproj/project.pbxproj b/native/macos/MemoriaMacStore.xcodeproj/project.pbxproj

index 9f24de4..2cec874 100644

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

+++ b/native/macos/MemoriaMacStore.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 2988187..43de2da 100644

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

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

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