From a686012e0f881f9a6cdf1390141bacaa2cd23f4a Mon Sep 17 00:00:00 2001 From: reeshika-h Date: Fri, 5 Sep 2025 15:56:41 +0530 Subject: [PATCH 1/3] Update CHANGELOG and add support for AU and GCP-EU regions in Contentstack SDK --- CHANGELOG.md | 3 ++- Sources/CSDefinitions.swift | 4 ++++ Tests/ContentstackTests.swift | 7 +++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e9c17f45..fd010954 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,9 +2,10 @@ ## v2.2.0 -### Date: 01-Sep-2025 +### Date: 15-Sep-2025 - Async/await support added +- Added AU and GCP-EU region support ## v2.1.0 diff --git a/Sources/CSDefinitions.swift b/Sources/CSDefinitions.swift index 0966345b..e38ea86b 100644 --- a/Sources/CSDefinitions.swift +++ b/Sources/CSDefinitions.swift @@ -40,6 +40,10 @@ public enum ContentstackRegion: String { case azure_eu = "azure-eu" /// This region is for GCP-NA Cloud case gcp_na = "gcp-na" + /// This region is for GCP-EU Cloud + case gcp_eu = "gcp-eu" + /// Australia (AU) region + case au = "au" } /// The cache policies allow you to define the source from where the SDK will retrieve the content. public enum CachePolicy { diff --git a/Tests/ContentstackTests.swift b/Tests/ContentstackTests.swift index 32d8307d..aa8aeac9 100644 --- a/Tests/ContentstackTests.swift +++ b/Tests/ContentstackTests.swift @@ -42,6 +42,13 @@ final class ContentstackTests: XCTestCase { XCTAssertEqual(stack.region, ContentstackRegion.gcp_na) XCTAssertNil(stack.branch) } + + func testStack_AUHostRegion_ReturnStackWithAUValue () { + let stack = makeStackSut(region: .au) + XCTAssertEqual(stack.host, "au-cdn.contentstack.com") + XCTAssertEqual(stack.region, ContentstackRegion.au) + XCTAssertNil(stack.branch) + } func testStack_NewHost_ReturnStackWithNewHost () { let host = "api.contentstack.com" From abed20835100ca86dd011fc142f74f9888ad16be Mon Sep 17 00:00:00 2001 From: reeshika-h Date: Fri, 26 Sep 2025 11:05:26 +0530 Subject: [PATCH 2/3] chore: verison bump --- CHANGELOG.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fd010954..2eb7f167 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,16 @@ # CHANGELOG +## v2.3.0 + +### Date: 29-Sep-2025 + +- Added AU and GCP-EU region support + ## v2.2.0 -### Date: 15-Sep-2025 +### Date: 22-Sep-2025 - Async/await support added -- Added AU and GCP-EU region support ## v2.1.0 From a28fc7cd440be2291cb1c234c97d28c9f1cde669 Mon Sep 17 00:00:00 2001 From: reeshika-h Date: Mon, 29 Sep 2025 12:55:52 +0530 Subject: [PATCH 3/3] chore: comment out iOS CI steps in workflow --- .github/workflows/ci.yml | 76 ++++++++++++++++++++-------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 40447708..f8281dc4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -51,47 +51,47 @@ jobs: -destination 'platform=macOS,arch=arm64' \ ONLY_ACTIVE_ARCH=NO \ CODE_SIGNING_ALLOWED=NO - iOS: - name: Test iOS - runs-on: macos-latest - steps: - - name: Checkout repository - uses: actions/checkout@v3 + # iOS: + # name: Test iOS + # runs-on: macos-latest + # steps: + # - name: Checkout repository + # uses: actions/checkout@v3 - - name: Configure Git credentials - run: | - git config --global url."https://x-access-token:${{ secrets.PKG_TOKEN }}@github.com/".insteadOf "https://github.com/" + # - name: Configure Git credentials + # run: | + # git config --global url."https://x-access-token:${{ secrets.PKG_TOKEN }}@github.com/".insteadOf "https://github.com/" - - name: Set up Ruby (for installing Bundler and Fastlane) - uses: ruby/setup-ruby@v1 - with: - ruby-version: '3.0' + # - name: Set up Ruby (for installing Bundler and Fastlane) + # uses: ruby/setup-ruby@v1 + # with: + # ruby-version: '3.0' - - name: Install dep via Carthage - run: | - carthage bootstrap --platform iOS --use-xcframeworks --cache-builds + # - name: Install dep via Carthage + # run: | + # carthage bootstrap --platform iOS --use-xcframeworks --cache-builds - - name: Install dependencies via Swift Package Manager - run: swift package resolve + # - name: Install dependencies via Swift Package Manager + # run: swift package resolve - - name: Set up Xcode - uses: maxim-lobanov/setup-xcode@v1 - with: - xcode-version: '16.4.0' - - name: Create config file - run: | - echo '{ - "api_key": "${{ secrets.api_key }}", - "delivery_token": "${{ secrets.delivery_token }}", - "environment": "${{ secrets.environment }}" - }' > Tests/config.json + # - name: Set up Xcode + # uses: maxim-lobanov/setup-xcode@v1 + # with: + # xcode-version: '16.4.0' + # - name: Create config file + # run: | + # echo '{ + # "api_key": "${{ secrets.api_key }}", + # "delivery_token": "${{ secrets.delivery_token }}", + # "environment": "${{ secrets.environment }}" + # }' > Tests/config.json - - name: Build and run tests - run: | - xcodebuild test \ - -workspace ContentstackSwift.xcworkspace \ - -scheme "ContentstackSwift iOS Tests" \ - -destination "platform=iOS Simulator,name=iPhone 16,OS=18.5" \ - -sdk iphonesimulator \ - ONLY_ACTIVE_ARCH=NO \ - CODE_SIGNING_ALLOWED=NO + # - name: Build and run tests + # run: | + # xcodebuild test \ + # -workspace ContentstackSwift.xcworkspace \ + # -scheme "ContentstackSwift iOS Tests" \ + # -destination "platform=iOS Simulator,name=iPhone 16,OS=18.5" \ + # -sdk iphonesimulator \ + # ONLY_ACTIVE_ARCH=NO \ + # CODE_SIGNING_ALLOWED=NO