From fb371b10c8e2007aca43164e1b93b2d13afbe1bf Mon Sep 17 00:00:00 2001 From: null Date: Sat, 20 Jun 2026 23:05:43 -0500 Subject: [PATCH] fix(ios): register Closer source path in Package.swift and fix compile errors --- .gitignore | 4 ++++ iphone/Closer/Models/FirestoreModels.swift | 6 +++--- iphone/Package.swift | 11 +++++++---- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index bfd5ca1d..1918fab9 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,10 @@ .cxx local.properties +# iOS Swift Package Manager build artifacts +iphone/.build/ +iphone/Package.resolved + # Private project docs (agent-only, never commit) FUTURE.md HISTORY.md diff --git a/iphone/Closer/Models/FirestoreModels.swift b/iphone/Closer/Models/FirestoreModels.swift index d557fee4..1cdb4400 100644 --- a/iphone/Closer/Models/FirestoreModels.swift +++ b/iphone/Closer/Models/FirestoreModels.swift @@ -1,6 +1,6 @@ import Foundation -import FirebaseFirestoreSwift +import FirebaseFirestore struct User: Codable, Identifiable, Sendable { let id: String @@ -117,7 +117,7 @@ struct Entitlement: Codable, Identifiable, Sendable { } struct DailyQuestion: Codable, Identifiable, Sendable { - @DocumentID var id: String? + var id: String? var questionId: String var date: String // YYYY-MM-DD var assignedAt: Date @@ -125,7 +125,7 @@ struct DailyQuestion: Codable, Identifiable, Sendable { } struct DailyAnswer: Codable, Identifiable, Sendable { - @DocumentID var id: String? // = userId + var id: String? // = userId var sealedAnswer: String? // "sealed:v1:{base64}" var commitment: String? // "sha256:{urlsafe-base64}" var questionType: String // "text" | "multiple_choice" | "scale" diff --git a/iphone/Package.swift b/iphone/Package.swift index 1e495f8f..d22a0197 100644 --- a/iphone/Package.swift +++ b/iphone/Package.swift @@ -24,22 +24,25 @@ let package = Package( dependencies: [ .product(name: "FirebaseAuth", package: "firebase-ios-sdk"), .product(name: "FirebaseFirestore", package: "firebase-ios-sdk"), - .product(name: "FirebaseFirestoreSwift", package: "firebase-ios-sdk"), .product(name: "FirebaseFunctions", package: "firebase-ios-sdk"), .product(name: "FirebaseMessaging", package: "firebase-ios-sdk"), .product(name: "FirebaseStorage", package: "firebase-ios-sdk"), .product(name: "RevenueCat", package: "purchases-ios"), .product(name: "RevenueCatUI", package: "purchases-ios"), .product(name: "GoogleSignIn", package: "GoogleSignIn-iOS"), - ] + ], + path: "Closer", + exclude: ["Info.plist", "Closer.entitlements"] ), .testTarget( name: "CloserTests", - dependencies: ["Closer"] + dependencies: ["Closer"], + path: "CloserTests" ), .testTarget( name: "CloserUITests", - dependencies: ["Closer"] + dependencies: ["Closer"], + path: "CloserUITests" ), ] ) \ No newline at end of file