Skip to content

DX | 12-05-2025 | Release #70

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 20 commits into from
May 12, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
60c2652
Merge pull request #63 from contentstack/staging
reeshika-h Jan 20, 2025
027f890
Merge pull request #65 from contentstack/master
reeshika-h Feb 7, 2025
41eae33
Merge pull request #66 from contentstack/staging
reeshika-h Feb 7, 2025
a707ed1
feat: Update project structure and dependencies
reeshika-h Apr 29, 2025
a6f46bf
Merge pull request #68 from contentstack/fix/DX-2761-renaming-Content…
reeshika-h Apr 30, 2025
aa3edb7
Merge pull request #69 from contentstack/development
cs-raj Apr 30, 2025
7a61e15
Merge branch 'master' into staging
cs-raj Apr 30, 2025
a369ca6
Remove deprecated workspace and scheme files from Contentstack project
reeshika-h Apr 30, 2025
47e798e
Merge pull request #71 from contentstack/fix/stage
reeshika-h May 6, 2025
79e2d3a
Merge pull request #73 from contentstack/staging
reeshika-h May 6, 2025
f886005
Update CI workflow to use 'staging' branch and adjust iOS test destin…
reeshika-h May 6, 2025
7953a1c
Add dynamic iOS simulator selection to CI workflow
reeshika-h May 6, 2025
1496eea
Update macOS test destination in CI workflow to remove architecture s…
reeshika-h May 6, 2025
f3f00b7
Fix CI workflow: update macOS and iOS test schemes and destinations
reeshika-h May 6, 2025
df66077
Merge pull request #74 from contentstack/fix-workflows
reeshika-h May 6, 2025
245ddf5
Merge pull request #75 from contentstack/master
reeshika-h May 6, 2025
e4c64e0
Update branch restriction messages in CI workflow to reference stagin…
reeshika-h May 7, 2025
4c35c07
Merge pull request #76 from contentstack/fix/check-branch-workflow
reeshika-h May 7, 2025
a51525f
Remove unused workspace configuration file from the project
reeshika-h May 7, 2025
6b5898d
Merge pull request #78 from contentstack/fix/workspace
harshithad0703 May 8, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
@@ -1 +1 @@
CONTENTSTACK_SDK_VERSION=1.5.1
CONTENTSTACK_SDK_VERSION=2.0.0
8 changes: 4 additions & 4 deletions .github/workflows/check-branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
24 changes: 12 additions & 12 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion Cartfile
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
github "contentstack/contentstack-swift-dvr" "master"
github "contentstack/contentstack-swift-dvr"
github "contentstack/contentstack-utils-swift"
2 changes: 1 addition & 1 deletion Config.xcconfig
Original file line number Diff line number Diff line change
@@ -1 +1 @@
CONTENTSTACK_SDK_VERSION = 1.5.1
CONTENTSTACK_SDK_VERSION = 2.0.0
19 changes: 9 additions & 10 deletions ContentstackSwift.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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/**/*'
Expand Down
Loading