Merge pull request #70 from contentstack/staging

DX | 12-05-2025 | Release

Author: harshithad0703

.env

@@ -1 +1 @@
-CONTENTSTACK_SDK_VERSION=1.5.1
+CONTENTSTACK_SDK_VERSION=2.0.0

.github/workflows/check-branch.yml

@@ -8,13 +8,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Comment PR
-        if: github.base_ref == 'master' && github.head_ref != 'next'
+        if: github.base_ref == 'master' && github.head_ref != 'staging'
         uses: thollander/actions-comment-pull-request@v2
         with:
           message: |
-            We regret to inform you that you are currently not able to merge your changes into the master branch due to restrictions applied by our SRE team. To proceed with merging your changes, we kindly request that you create a pull request from the next branch. Our team will then review the changes and work with you to ensure a successful merge into the master branch.
+            We regret to inform you that you are currently not able to merge your changes into the master branch due to restrictions applied by our SRE team. To proceed with merging your changes, we kindly request that you create a pull request from the staging branch. Our team will then review the changes and work with you to ensure a successful merge into the master branch.
       - name: Check branch
-        if: github.base_ref == 'master' && github.head_ref != 'next'
+        if: github.base_ref == 'master' && github.head_ref != 'staging'
         run: |
-          echo "ERROR: We regret to inform you that you are currently not able to merge your changes into the master branch due to restrictions applied by our SRE team. To proceed with merging your changes, we kindly request that you create a pull request from the next branch. Our team will then review the changes and work with you to ensure a successful merge into the master branch."
+          echo "ERROR: We regret to inform you that you are currently not able to merge your changes into the master branch due to restrictions applied by our SRE team. To proceed with merging your changes, we kindly request that you create a pull request from the staging branch. Our team will then review the changes and work with you to ensure a successful merge into the master branch."
           exit 1

.github/workflows/ci.yml

@@ -2,9 +2,9 @@ name: "Contentstack CI"
 
 on:
   push:
-    branches: [ master, next ]
+    branches: [ master, staging ]
   pull_request:
-    branches: [ master, next ]
+    branches: [ master, staging ]
 
 jobs:
   macOS:
@@ -46,8 +46,8 @@ jobs:
     - name: Build and run tests
       run: |
         xcodebuild test \
-          -workspace Contentstack.xcworkspace \
-          -scheme "Contentstack macOS Tests" \
+          -workspace ContentstackSwift.xcworkspace \
+          -scheme "ContentstackSwift macOS Tests" \
           -destination 'platform=macOS,arch=arm64' \
           ONLY_ACTIVE_ARCH=NO \
           CODE_SIGNING_ALLOWED=NO
@@ -86,13 +86,13 @@ jobs:
             "delivery_token": "${{ secrets.delivery_token }}",
             "environment": "${{ secrets.environment }}"
           }' > Tests/config.json
-
+        
     - name: Build and run tests
       run: |
-        xcodebuild test \
-          -workspace Contentstack.xcworkspace \
-          -scheme "Contentstack iOS Tests" \
-          -destination 'platform=iOS Simulator,name=iPhone 15,OS=17.2' \
-          -sdk iphonesimulator \
-          ONLY_ACTIVE_ARCH=NO \
-          CODE_SIGNING_ALLOWED=NO
+            xcodebuild test \
+              -workspace ContentstackSwift.xcworkspace \
+              -scheme "ContentstackSwift iOS Tests" \
+              -destination 'platform=iOS Simulator,name=iPhone 15,OS=17.5' \
+              -sdk iphonesimulator \
+              ONLY_ACTIVE_ARCH=NO \
+              CODE_SIGNING_ALLOWED=NO

Cartfile

@@ -1,2 +1,2 @@
-github "contentstack/contentstack-swift-dvr" "master"
+github "contentstack/contentstack-swift-dvr" 
 github "contentstack/contentstack-utils-swift"

Config.xcconfig

@@ -1 +1 @@
-CONTENTSTACK_SDK_VERSION = 1.5.1
+CONTENTSTACK_SDK_VERSION = 2.0.0

ContentstackSwift.podspec

@@ -7,11 +7,10 @@
 #
 #!/usr/bin/ruby
 
-require 'dotenv/load'
 
 Pod::Spec.new do |s|
   s.name             = 'ContentstackSwift'
-  s.version          = ENV['CONTENTSTACK_SDK_VERSION']
+  s.version          = '2.0.0'
   s.summary          = 'Contentstack is a headless CMS with an API-first approach that puts content at the centre.'
 
   s.description      = <<-DESC
@@ -29,14 +28,14 @@ Pod::Spec.new do |s|
     'uttamukkoji' => '[email protected]',
     'Contentstack' => '[email protected]'
   }
-  s.source           = { :git => 'https://github.com/contentstack/contentstack-swift.git', :tag => s.version.to_s }
-  s.social_media_url = 'https://twitter.com/Contentstack'
-  s.swift_version             = '5'
-
-  s.ios.deployment_target = '11.0'
-  s.osx.deployment_target     = '10.13'
-  s.watchos.deployment_target = '4.0'
-  s.tvos.deployment_target    = '11.0'
+  s.source           = { :git => 'https://github.com/contentstack/contentstack-swift.git', :tag => s.version }
+  s.social_media_url = 'https://x.com/Contentstack'
+  s.swift_version             = '5.6'
+
+  s.ios.deployment_target = '13.0'
+  s.osx.deployment_target     = '10.15'
+  s.watchos.deployment_target = '6.0'
+  s.tvos.deployment_target    = '13.0'
 
 
   s.source_files = 'Sources/**/*'