From 37c0aba94bfb3dcc6f93eb2010562a404b441a25 Mon Sep 17 00:00:00 2001 From: Vlad Velicu Date: Wed, 26 Jul 2023 11:27:53 +0100 Subject: [PATCH 1/4] update package --- Package.swift | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Package.swift b/Package.swift index 0147b67b1..a8248776a 100644 --- a/Package.swift +++ b/Package.swift @@ -4,7 +4,7 @@ import PackageDescription let package = Package( name: "CouchbaseLiteSwift", platforms: [ - .iOS(.v10), .macOS(.v10_12) + .iOS(.v11), .macOS(.v10_14) ], products: [ .library( @@ -14,8 +14,8 @@ let package = Package( targets: [ .binaryTarget( name: "CouchbaseLiteSwift", - url: "https://packages.couchbase.com/releases/couchbase-lite-ios/3.1.0/couchbase-lite-swift_xc_community_3.1.0.zip", - checksum: "556d6ae41df3b5ebf91dbe45d38214dd7032f97ac1b132f925356d20e3b9ada5" + url: "https://packages.couchbase.com/releases/couchbase-lite-ios/3.1.1/couchbase-lite-swift_xc_community_3.1.1.zip", + checksum: "bbee6e7f554285ed58dfee06122ba4124b11e7188ce0271db440c253ba278163" ) ] ) From b954ff7bcf3c4d78ca9f29c356ff3dfdc2bf3a25 Mon Sep 17 00:00:00 2001 From: Vlad Velicu Date: Wed, 26 Jul 2023 11:28:00 +0100 Subject: [PATCH 2/4] port validation --- .github/workflows/check_package.yml | 46 +++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 .github/workflows/check_package.yml diff --git a/.github/workflows/check_package.yml b/.github/workflows/check_package.yml new file mode 100644 index 000000000..0e6a00f1f --- /dev/null +++ b/.github/workflows/check_package.yml @@ -0,0 +1,46 @@ +name: Swift Package + +on: + pull_request: + paths: Package.swift + +jobs: + build-5_7: + name: Swift 5.7 + runs-on: macos-latest + steps: + - uses: actions/checkout@v2 + - uses: webfactory/ssh-agent@v0.7.0 + with: + ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }} + log-public-key: false + - name: Setup Swift 5.7 + uses: swift-actions/setup-swift@v1.23.0 + with: + swift-version: "5.7" + - name: Checkout couchbase-lite-ios-release-verify + run: | + git clone https://github.com/couchbaselabs/couchbase-lite-ios-release-verify.git + - name: Validate + run: | + ./couchbase-lite-ios-release-verify/Scripts/verify_spm.sh -b ${{ github.head_ref }} -ce + + build-5_8: + name: Swift 5.8 + runs-on: macos-latest + steps: + - uses: actions/checkout@v2 + - uses: webfactory/ssh-agent@v0.7.0 + with: + ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }} + log-public-key: false + - name: Setup Swift 5.8 + uses: swift-actions/setup-swift@v1.23.0 + with: + swift-version: "5.8" + - name: Checkout couchbase-lite-ios-release-verify + run: | + git clone https://github.com/couchbaselabs/couchbase-lite-ios-release-verify.git + - name: Validate + run: | + ./couchbase-lite-ios-release-verify/Scripts/verify_spm.sh -b ${{ github.head_ref }} -ce \ No newline at end of file From 3fd0e9ac8a365afbae34a7c5805a109e8bca886b Mon Sep 17 00:00:00 2001 From: Vlad Velicu Date: Wed, 26 Jul 2023 15:09:34 +0100 Subject: [PATCH 3/4] readme and project version --- README.md | 4 ++-- xcconfigs/Project.xcconfig | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index a5ca3d733..e61c7c329 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Couchbase Lite implementation is on top of [Couchbase Lite Core](https://github. dependencies: [ .package(name: "CouchbaseLiteSwift", url: "https://github.com/couchbase/couchbase-lite-ios.git", - from: "3.1.0"), + from: "3.1.1"), ], ``` @@ -31,7 +31,7 @@ dependencies: [ dependencies: [ .package(name: "CouchbaseLiteSwift", url: "https://github.com/couchbase/couchbase-lite-swift-ee.git", - from: "3.1.0"), + from: "3.1.1"), ], ``` diff --git a/xcconfigs/Project.xcconfig b/xcconfigs/Project.xcconfig index 419eddfa0..103a60e86 100644 --- a/xcconfigs/Project.xcconfig +++ b/xcconfigs/Project.xcconfig @@ -17,7 +17,7 @@ // limitations under the License. // -CBL_VERSION_STRING = 3.1.0 +CBL_VERSION_STRING = 3.1.1 CBL_BUILD_NUMBER = 0 CBL_EXPORTED_SYMBOLS_FILE = Objective-C/CouchbaseLite.exp CBL_SWIFT_MODULEMAP_FILE = Swift/CouchbaseLiteSwift.modulemap From eeb314190b35bdd9f1cbfe47b8025b97c4b16da8 Mon Sep 17 00:00:00 2001 From: Vlad Velicu Date: Wed, 26 Jul 2023 15:22:48 +0100 Subject: [PATCH 4/4] revert --- xcconfigs/Project.xcconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xcconfigs/Project.xcconfig b/xcconfigs/Project.xcconfig index 103a60e86..419eddfa0 100644 --- a/xcconfigs/Project.xcconfig +++ b/xcconfigs/Project.xcconfig @@ -17,7 +17,7 @@ // limitations under the License. // -CBL_VERSION_STRING = 3.1.1 +CBL_VERSION_STRING = 3.1.0 CBL_BUILD_NUMBER = 0 CBL_EXPORTED_SYMBOLS_FILE = Objective-C/CouchbaseLite.exp CBL_SWIFT_MODULEMAP_FILE = Swift/CouchbaseLiteSwift.modulemap