From 46fe79c3c4d7c3c485d6adec4897c9028d16cf98 Mon Sep 17 00:00:00 2001 From: Michael Rebello Date: Fri, 30 Jun 2023 10:14:48 -0700 Subject: [PATCH 1/2] Add docs on updating dependencies --- .github/CONTRIBUTING.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 4dd0f05a..e0f76b1b 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -144,6 +144,17 @@ We're much more likely to approve your changes if you: * Write a [good commit message][commit-message]. * Maintain backward compatibility. +## Updating Dependencies + +To update dependencies such as `SwiftProtobuf` in this repository: + +1. Update the main [library's `Package.swift` file](../Package.swift). +2. Open the project to ensure the [`Package.resolved` file](../Package.resolved) gets updated by Xcode. +3. Update the dependencies in both the [`Connect-Swift.podspec`](../Connect-Swift.podspec) and + [`Connect-Swift-Mocks.podspec`](../Connect-Swift-Mocks.podspec) files. +4. Open the [Swift package example app](../Examples/ElizaSwiftPackageApp) to ensure its `Package.resolved` file gets updated. +5. Run `pod update` in the [CocoaPods example app's directory](../Examples/ElizaCocoaPodsApp). + ## Releasing Releases should be tagged in `x.y.z` SemVer format. From ac3dc468352e7051ce14a3f73e09212b874e55f2 Mon Sep 17 00:00:00 2001 From: Michael Rebello Date: Fri, 30 Jun 2023 10:15:57 -0700 Subject: [PATCH 2/2] fixup --- .github/CONTRIBUTING.md | 4 ++-- .../project.xcworkspace/xcshareddata/swiftpm/Package.resolved | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index e0f76b1b..982e4277 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -148,9 +148,9 @@ We're much more likely to approve your changes if you: To update dependencies such as `SwiftProtobuf` in this repository: -1. Update the main [library's `Package.swift` file](../Package.swift). +1. Update the main [library's `Package.swift` file](../Package.swift) with the new version. 2. Open the project to ensure the [`Package.resolved` file](../Package.resolved) gets updated by Xcode. -3. Update the dependencies in both the [`Connect-Swift.podspec`](../Connect-Swift.podspec) and +3. Update the versions in both the [`Connect-Swift.podspec`](../Connect-Swift.podspec) and [`Connect-Swift-Mocks.podspec`](../Connect-Swift-Mocks.podspec) files. 4. Open the [Swift package example app](../Examples/ElizaSwiftPackageApp) to ensure its `Package.resolved` file gets updated. 5. Run `pod update` in the [CocoaPods example app's directory](../Examples/ElizaCocoaPodsApp). diff --git a/Examples/ElizaSwiftPackageApp/ElizaSwiftPackageApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Examples/ElizaSwiftPackageApp/ElizaSwiftPackageApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 1c8f0bf9..3787a2c3 100644 --- a/Examples/ElizaSwiftPackageApp/ElizaSwiftPackageApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Examples/ElizaSwiftPackageApp/ElizaSwiftPackageApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -50,8 +50,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/apple/swift-protobuf.git", "state" : { - "revision" : "0af9125c4eae12a4973fb66574c53a54962a9e1e", - "version" : "1.21.0" + "revision" : "f25867a208f459d3c5a06935dceb9083b11cd539", + "version" : "1.22.0" } } ],