diff --git a/.env b/.env index d08b999c..6ddbb366 100644 --- a/.env +++ b/.env @@ -1 +1 @@ -CONTENTSTACK_SDK_VERSION=1.5.1 +CONTENTSTACK_SDK_VERSION=2.0.0 diff --git a/.github/workflows/check-branch.yml b/.github/workflows/check-branch.yml index 1e2d24a5..8a3a32ab 100644 --- a/.github/workflows/check-branch.yml +++ b/.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 \ No newline at end of file diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 60ed4786..8a4b32ca 100644 --- a/.github/workflows/ci.yml +++ b/.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 \ No newline at end of file + 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 diff --git a/Cartfile b/Cartfile index f587220f..d017a110 100644 --- a/Cartfile +++ b/Cartfile @@ -1,2 +1,2 @@ -github "contentstack/contentstack-swift-dvr" "master" +github "contentstack/contentstack-swift-dvr" github "contentstack/contentstack-utils-swift" diff --git a/Config.xcconfig b/Config.xcconfig index b8ab6e29..b6d3d38d 100644 --- a/Config.xcconfig +++ b/Config.xcconfig @@ -1 +1 @@ -CONTENTSTACK_SDK_VERSION = 1.5.1 +CONTENTSTACK_SDK_VERSION = 2.0.0 diff --git a/ContentstackSwift.podspec b/ContentstackSwift.podspec index 7b45e6bf..c78d360b 100644 --- a/ContentstackSwift.podspec +++ b/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' => 'uttamukkoji@gmail.com', 'Contentstack' => 'support@contentstack.io' } - 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/**/*' diff --git a/Contentstack.xcodeproj/ContentstackTests_Info.plist b/ContentstackSwift.xcodeproj/ContentstackTests_Info.plist similarity index 100% rename from Contentstack.xcodeproj/ContentstackTests_Info.plist rename to ContentstackSwift.xcodeproj/ContentstackTests_Info.plist diff --git a/Contentstack.xcodeproj/Contentstack_Info.plist b/ContentstackSwift.xcodeproj/Contentstack_Info.plist similarity index 100% rename from Contentstack.xcodeproj/Contentstack_Info.plist rename to ContentstackSwift.xcodeproj/Contentstack_Info.plist diff --git a/Contentstack.xcodeproj/project.pbxproj b/ContentstackSwift.xcodeproj/project.pbxproj similarity index 95% rename from Contentstack.xcodeproj/project.pbxproj rename to ContentstackSwift.xcodeproj/project.pbxproj index d0959aae..b13dd221 100644 --- a/Contentstack.xcodeproj/project.pbxproj +++ b/ContentstackSwift.xcodeproj/project.pbxproj @@ -70,9 +70,9 @@ 0F4A245D24224D3100159C24 /* ContentstackResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0F4A245B24224D3100159C24 /* ContentstackResponse.swift */; }; 0F4A245E24224D3100159C24 /* ContentstackResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0F4A245B24224D3100159C24 /* ContentstackResponse.swift */; }; 0F4A245F24224D3100159C24 /* ContentstackResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0F4A245B24224D3100159C24 /* ContentstackResponse.swift */; }; - 0F4A75D4241BAC4300E3A024 /* Contentstack.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0F4A75CB241BAC4300E3A024 /* Contentstack.framework */; }; - 0F4A75F4241BAE6C00E3A024 /* Contentstack.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0F4A75EB241BAE6C00E3A024 /* Contentstack.framework */; }; - 0F4A7610241BAFE000E3A024 /* Contentstack.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0F4A7607241BAFE000E3A024 /* Contentstack.framework */; }; + 0F4A75D4241BAC4300E3A024 /* ContentstackSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0F4A75CB241BAC4300E3A024 /* ContentstackSwift.framework */; }; + 0F4A75F4241BAE6C00E3A024 /* ContentstackSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0F4A75EB241BAE6C00E3A024 /* ContentstackSwift.framework */; }; + 0F4A7610241BAFE000E3A024 /* ContentstackSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0F4A7607241BAFE000E3A024 /* ContentstackSwift.framework */; }; 0F4A762C241BB0D200E3A024 /* Contentstack.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0F4A762B241BB0D200E3A024 /* Contentstack.swift */; }; 0F4A762D241BB0D200E3A024 /* Contentstack.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0F4A762B241BB0D200E3A024 /* Contentstack.swift */; }; 0F4A762E241BB0D200E3A024 /* Contentstack.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0F4A762B241BB0D200E3A024 /* Contentstack.swift */; }; @@ -314,13 +314,13 @@ 0F38D7E3242C831300232D7F /* AssetTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AssetTest.swift; sourceTree = ""; }; 0F463112243B044F001CE1FA /* SyncTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SyncTest.swift; sourceTree = ""; }; 0F4A245B24224D3100159C24 /* ContentstackResponse.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentstackResponse.swift; sourceTree = ""; }; - 0F4A75CB241BAC4300E3A024 /* Contentstack.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Contentstack.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 0F4A75D3241BAC4300E3A024 /* Contentstack iOS Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Contentstack iOS Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; - 0F4A75EB241BAE6C00E3A024 /* Contentstack.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Contentstack.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 0F4A75F3241BAE6C00E3A024 /* Contentstack macOS Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Contentstack macOS Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; - 0F4A7607241BAFE000E3A024 /* Contentstack.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Contentstack.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 0F4A760F241BAFE000E3A024 /* Contentstack tvOS Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Contentstack tvOS Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; - 0F4A7623241BB0A300E3A024 /* Contentstack.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Contentstack.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 0F4A75CB241BAC4300E3A024 /* ContentstackSwift.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ContentstackSwift.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 0F4A75D3241BAC4300E3A024 /* ContentstackSwift iOS Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "ContentstackSwift iOS Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; + 0F4A75EB241BAE6C00E3A024 /* ContentstackSwift.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ContentstackSwift.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 0F4A75F3241BAE6C00E3A024 /* ContentstackSwift macOS Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "ContentstackSwift macOS Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; + 0F4A7607241BAFE000E3A024 /* ContentstackSwift.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ContentstackSwift.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 0F4A760F241BAFE000E3A024 /* ContentstackSwift tvOS Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "ContentstackSwift tvOS Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; + 0F4A7623241BB0A300E3A024 /* ContentstackSwift.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ContentstackSwift.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 0F4A762B241BB0D200E3A024 /* Contentstack.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Contentstack.swift; sourceTree = ""; }; 0F4A763C241BB38C00E3A024 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 0F4A7641241BB3C600E3A024 /* ContentstackTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ContentstackTests.swift; sourceTree = ""; }; @@ -412,7 +412,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 0F4A75D4241BAC4300E3A024 /* Contentstack.framework in Frameworks */, + 0F4A75D4241BAC4300E3A024 /* ContentstackSwift.framework in Frameworks */, 47D561572C9EFA5900DC085D /* DVR in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -430,7 +430,7 @@ buildActionMask = 2147483647; files = ( 6750778E2D3E256A0076A066 /* DVR in Frameworks */, - 0F4A75F4241BAE6C00E3A024 /* Contentstack.framework in Frameworks */, + 0F4A75F4241BAE6C00E3A024 /* ContentstackSwift.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -445,7 +445,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 0F4A7610241BAFE000E3A024 /* Contentstack.framework in Frameworks */, + 0F4A7610241BAFE000E3A024 /* ContentstackSwift.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -674,13 +674,13 @@ OBJ_14 /* Products */ = { isa = PBXGroup; children = ( - 0F4A75CB241BAC4300E3A024 /* Contentstack.framework */, - 0F4A75D3241BAC4300E3A024 /* Contentstack iOS Tests.xctest */, - 0F4A75EB241BAE6C00E3A024 /* Contentstack.framework */, - 0F4A75F3241BAE6C00E3A024 /* Contentstack macOS Tests.xctest */, - 0F4A7607241BAFE000E3A024 /* Contentstack.framework */, - 0F4A760F241BAFE000E3A024 /* Contentstack tvOS Tests.xctest */, - 0F4A7623241BB0A300E3A024 /* Contentstack.framework */, + 0F4A75CB241BAC4300E3A024 /* ContentstackSwift.framework */, + 0F4A75D3241BAC4300E3A024 /* ContentstackSwift iOS Tests.xctest */, + 0F4A75EB241BAE6C00E3A024 /* ContentstackSwift.framework */, + 0F4A75F3241BAE6C00E3A024 /* ContentstackSwift macOS Tests.xctest */, + 0F4A7607241BAFE000E3A024 /* ContentstackSwift.framework */, + 0F4A760F241BAFE000E3A024 /* ContentstackSwift tvOS Tests.xctest */, + 0F4A7623241BB0A300E3A024 /* ContentstackSwift.framework */, ); name = Products; sourceTree = BUILT_PRODUCTS_DIR; @@ -760,9 +760,9 @@ /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ - 0F4A75CA241BAC4300E3A024 /* Contentstack iOS */ = { + 0F4A75CA241BAC4300E3A024 /* ContentstackSwift iOS */ = { isa = PBXNativeTarget; - buildConfigurationList = 0F4A75E0241BAC4300E3A024 /* Build configuration list for PBXNativeTarget "Contentstack iOS" */; + buildConfigurationList = 0F4A75E0241BAC4300E3A024 /* Build configuration list for PBXNativeTarget "ContentstackSwift iOS" */; buildPhases = ( 0F4A75C6241BAC4300E3A024 /* Headers */, 0F4A75C7241BAC4300E3A024 /* Sources */, @@ -773,17 +773,17 @@ ); dependencies = ( ); - name = "Contentstack iOS"; + name = "ContentstackSwift iOS"; packageProductDependencies = ( 47D561502C9EF97D00DC085D /* ContentstackUtils */, ); productName = "Contentstack iOS"; - productReference = 0F4A75CB241BAC4300E3A024 /* Contentstack.framework */; + productReference = 0F4A75CB241BAC4300E3A024 /* ContentstackSwift.framework */; productType = "com.apple.product-type.framework"; }; - 0F4A75D2241BAC4300E3A024 /* Contentstack iOS Tests */ = { + 0F4A75D2241BAC4300E3A024 /* ContentstackSwift iOS Tests */ = { isa = PBXNativeTarget; - buildConfigurationList = 0F4A75E1241BAC4300E3A024 /* Build configuration list for PBXNativeTarget "Contentstack iOS Tests" */; + buildConfigurationList = 0F4A75E1241BAC4300E3A024 /* Build configuration list for PBXNativeTarget "ContentstackSwift iOS Tests" */; buildPhases = ( 0F4A75CF241BAC4300E3A024 /* Sources */, 0F4A75D0241BAC4300E3A024 /* Frameworks */, @@ -794,17 +794,17 @@ dependencies = ( 0F4A764D241BB42100E3A024 /* PBXTargetDependency */, ); - name = "Contentstack iOS Tests"; + name = "ContentstackSwift iOS Tests"; packageProductDependencies = ( 47D561562C9EFA5900DC085D /* DVR */, ); productName = "Contentstack iOSTests"; - productReference = 0F4A75D3241BAC4300E3A024 /* Contentstack iOS Tests.xctest */; + productReference = 0F4A75D3241BAC4300E3A024 /* ContentstackSwift iOS Tests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; - 0F4A75EA241BAE6C00E3A024 /* Contentstack macOS */ = { + 0F4A75EA241BAE6C00E3A024 /* ContentstackSwift macOS */ = { isa = PBXNativeTarget; - buildConfigurationList = 0F4A75FC241BAE6C00E3A024 /* Build configuration list for PBXNativeTarget "Contentstack macOS" */; + buildConfigurationList = 0F4A75FC241BAE6C00E3A024 /* Build configuration list for PBXNativeTarget "ContentstackSwift macOS" */; buildPhases = ( 0F4A75E6241BAE6C00E3A024 /* Headers */, 0F4A75E7241BAE6C00E3A024 /* Sources */, @@ -815,17 +815,17 @@ ); dependencies = ( ); - name = "Contentstack macOS"; + name = "ContentstackSwift macOS"; packageProductDependencies = ( 47B09C282CA9530100B8AB41 /* ContentstackUtils */, ); productName = "Contentstack macOS"; - productReference = 0F4A75EB241BAE6C00E3A024 /* Contentstack.framework */; + productReference = 0F4A75EB241BAE6C00E3A024 /* ContentstackSwift.framework */; productType = "com.apple.product-type.framework"; }; - 0F4A75F2241BAE6C00E3A024 /* Contentstack macOS Tests */ = { + 0F4A75F2241BAE6C00E3A024 /* ContentstackSwift macOS Tests */ = { isa = PBXNativeTarget; - buildConfigurationList = 0F4A75FF241BAE6C00E3A024 /* Build configuration list for PBXNativeTarget "Contentstack macOS Tests" */; + buildConfigurationList = 0F4A75FF241BAE6C00E3A024 /* Build configuration list for PBXNativeTarget "ContentstackSwift macOS Tests" */; buildPhases = ( 0F4A75EF241BAE6C00E3A024 /* Sources */, 0F4A75F0241BAE6C00E3A024 /* Frameworks */, @@ -836,14 +836,14 @@ dependencies = ( 0F4A75F6241BAE6C00E3A024 /* PBXTargetDependency */, ); - name = "Contentstack macOS Tests"; + name = "ContentstackSwift macOS Tests"; productName = "Contentstack macOSTests"; - productReference = 0F4A75F3241BAE6C00E3A024 /* Contentstack macOS Tests.xctest */; + productReference = 0F4A75F3241BAE6C00E3A024 /* ContentstackSwift macOS Tests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; - 0F4A7606241BAFE000E3A024 /* Contentstack tvOS */ = { + 0F4A7606241BAFE000E3A024 /* ContentstackSwift tvOS */ = { isa = PBXNativeTarget; - buildConfigurationList = 0F4A7618241BAFE000E3A024 /* Build configuration list for PBXNativeTarget "Contentstack tvOS" */; + buildConfigurationList = 0F4A7618241BAFE000E3A024 /* Build configuration list for PBXNativeTarget "ContentstackSwift tvOS" */; buildPhases = ( 0F4A7602241BAFE000E3A024 /* Headers */, 0F4A7603241BAFE000E3A024 /* Sources */, @@ -854,16 +854,16 @@ ); dependencies = ( ); - name = "Contentstack tvOS"; + name = "ContentstackSwift tvOS"; packageProductDependencies = ( ); productName = "Contentstack tvOS"; - productReference = 0F4A7607241BAFE000E3A024 /* Contentstack.framework */; + productReference = 0F4A7607241BAFE000E3A024 /* ContentstackSwift.framework */; productType = "com.apple.product-type.framework"; }; - 0F4A760E241BAFE000E3A024 /* Contentstack tvOS Tests */ = { + 0F4A760E241BAFE000E3A024 /* ContentstackSwift tvOS Tests */ = { isa = PBXNativeTarget; - buildConfigurationList = 0F4A761B241BAFE000E3A024 /* Build configuration list for PBXNativeTarget "Contentstack tvOS Tests" */; + buildConfigurationList = 0F4A761B241BAFE000E3A024 /* Build configuration list for PBXNativeTarget "ContentstackSwift tvOS Tests" */; buildPhases = ( 0F4A760B241BAFE000E3A024 /* Sources */, 0F4A760C241BAFE000E3A024 /* Frameworks */, @@ -874,14 +874,14 @@ dependencies = ( 0F4A7612241BAFE000E3A024 /* PBXTargetDependency */, ); - name = "Contentstack tvOS Tests"; + name = "ContentstackSwift tvOS Tests"; productName = "Contentstack tvOSTests"; - productReference = 0F4A760F241BAFE000E3A024 /* Contentstack tvOS Tests.xctest */; + productReference = 0F4A760F241BAFE000E3A024 /* ContentstackSwift tvOS Tests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; - 0F4A7622241BB0A300E3A024 /* Contentstack watchOS */ = { + 0F4A7622241BB0A300E3A024 /* ContentstackSwift watchOS */ = { isa = PBXNativeTarget; - buildConfigurationList = 0F4A7628241BB0A300E3A024 /* Build configuration list for PBXNativeTarget "Contentstack watchOS" */; + buildConfigurationList = 0F4A7628241BB0A300E3A024 /* Build configuration list for PBXNativeTarget "ContentstackSwift watchOS" */; buildPhases = ( 0F4A761E241BB0A300E3A024 /* Headers */, 0F4A761F241BB0A300E3A024 /* Sources */, @@ -892,11 +892,11 @@ ); dependencies = ( ); - name = "Contentstack watchOS"; + name = "ContentstackSwift watchOS"; packageProductDependencies = ( ); productName = "Contentstack watchOS"; - productReference = 0F4A7623241BB0A300E3A024 /* Contentstack.framework */; + productReference = 0F4A7623241BB0A300E3A024 /* ContentstackSwift.framework */; productType = "com.apple.product-type.framework"; }; /* End PBXNativeTarget section */ @@ -908,7 +908,7 @@ BuildIndependentTargetsInParallel = YES; LastSwiftMigration = 9999; LastSwiftUpdateCheck = 1100; - LastUpgradeCheck = 1620; + LastUpgradeCheck = 1630; TargetAttributes = { 0F4A75CA241BAC4300E3A024 = { CreatedOnToolsVersion = 11.0; @@ -944,29 +944,30 @@ }; }; }; - buildConfigurationList = OBJ_2 /* Build configuration list for PBXProject "Contentstack" */; + buildConfigurationList = OBJ_2 /* Build configuration list for PBXProject "ContentstackSwift" */; compatibilityVersion = "Xcode 3.2"; developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( en, + Base, ); mainGroup = OBJ_5; packageReferences = ( 47D5614F2C9EF96D00DC085D /* XCRemoteSwiftPackageReference "contentstack-utils-swift" */, - 47D561532C9EFA1400DC085D /* XCRemoteSwiftPackageReference "contentstack-swift-dvr" */, + 6700D9E32DAE76ED00D9B55C /* XCRemoteSwiftPackageReference "contentstack-swift-dvr" */, ); productRefGroup = OBJ_14 /* Products */; projectDirPath = ""; projectRoot = ""; targets = ( - 0F4A75CA241BAC4300E3A024 /* Contentstack iOS */, - 0F4A75D2241BAC4300E3A024 /* Contentstack iOS Tests */, - 0F4A75EA241BAE6C00E3A024 /* Contentstack macOS */, - 0F4A75F2241BAE6C00E3A024 /* Contentstack macOS Tests */, - 0F4A7606241BAFE000E3A024 /* Contentstack tvOS */, - 0F4A760E241BAFE000E3A024 /* Contentstack tvOS Tests */, - 0F4A7622241BB0A300E3A024 /* Contentstack watchOS */, + 0F4A75CA241BAC4300E3A024 /* ContentstackSwift iOS */, + 0F4A75D2241BAC4300E3A024 /* ContentstackSwift iOS Tests */, + 0F4A75EA241BAE6C00E3A024 /* ContentstackSwift macOS */, + 0F4A75F2241BAE6C00E3A024 /* ContentstackSwift macOS Tests */, + 0F4A7606241BAFE000E3A024 /* ContentstackSwift tvOS */, + 0F4A760E241BAFE000E3A024 /* ContentstackSwift tvOS Tests */, + 0F4A7622241BB0A300E3A024 /* ContentstackSwift watchOS */, ); }; /* End PBXProject section */ @@ -1326,17 +1327,17 @@ /* Begin PBXTargetDependency section */ 0F4A75F6241BAE6C00E3A024 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 0F4A75EA241BAE6C00E3A024 /* Contentstack macOS */; + target = 0F4A75EA241BAE6C00E3A024 /* ContentstackSwift macOS */; targetProxy = 0F4A75F5241BAE6C00E3A024 /* PBXContainerItemProxy */; }; 0F4A7612241BAFE000E3A024 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 0F4A7606241BAFE000E3A024 /* Contentstack tvOS */; + target = 0F4A7606241BAFE000E3A024 /* ContentstackSwift tvOS */; targetProxy = 0F4A7611241BAFE000E3A024 /* PBXContainerItemProxy */; }; 0F4A764D241BB42100E3A024 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 0F4A75CA241BAC4300E3A024 /* Contentstack iOS */; + target = 0F4A75CA241BAC4300E3A024 /* ContentstackSwift iOS */; targetProxy = 0F4A764C241BB42100E3A024 /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ @@ -1411,7 +1412,7 @@ MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.contentstack.Contentstack; - PRODUCT_NAME = Contentstack; + PRODUCT_NAME = ContentstackSwift; SDKROOT = iphoneos; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; @@ -1492,7 +1493,7 @@ MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.contentstack.Contentstack; - PRODUCT_NAME = Contentstack; + PRODUCT_NAME = ContentstackSwift; SDKROOT = iphoneos; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; @@ -1541,7 +1542,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=macosx*]" = "-"; CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = SMAKUMV86W; + DEVELOPMENT_TEAM = FLVTD4X723; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -1611,7 +1612,7 @@ "CODE_SIGN_IDENTITY[sdk=macosx*]" = "-"; CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; - DEVELOPMENT_TEAM = SMAKUMV86W; + DEVELOPMENT_TEAM = FLVTD4X723; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; @@ -1713,7 +1714,7 @@ MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.contentstack.Contentstack; - PRODUCT_NAME = Contentstack; + PRODUCT_NAME = ContentstackSwift; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = macosx; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; @@ -1792,7 +1793,7 @@ MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.contentstack.Contentstack; - PRODUCT_NAME = Contentstack; + PRODUCT_NAME = ContentstackSwift; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = macosx; SWIFT_VERSION = 5.0; @@ -1997,7 +1998,7 @@ MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = "com.contentstack.Contentstack-tvOS"; - PRODUCT_NAME = Contentstack; + PRODUCT_NAME = ContentstackSwift; SDKROOT = appletvos; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "appletvsimulator appletvos"; @@ -2075,7 +2076,7 @@ MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = "com.contentstack.Contentstack-tvOS"; - PRODUCT_NAME = Contentstack; + PRODUCT_NAME = ContentstackSwift; SDKROOT = appletvos; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "appletvsimulator appletvos"; @@ -2286,7 +2287,7 @@ MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = "com.contentstack.Contentstack-watchOS"; - PRODUCT_NAME = Contentstack; + PRODUCT_NAME = ContentstackSwift; SDKROOT = watchos; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "watchsimulator watchos"; @@ -2366,7 +2367,7 @@ MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = "com.contentstack.Contentstack-watchOS"; - PRODUCT_NAME = Contentstack; + PRODUCT_NAME = ContentstackSwift; SDKROOT = watchos; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "watchsimulator watchos"; @@ -2386,6 +2387,7 @@ buildSettings = { ARCHS = "$(ARCHS_STANDARD)"; "ARCHS[sdk=*]" = "$(ARCHS_STANDARD)"; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; CLANG_ENABLE_OBJC_ARC = YES; CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; @@ -2448,6 +2450,7 @@ baseConfigurationReference = 0F4FBC9A2420A17F007B8CAE /* Config.xcconfig */; buildSettings = { ARCHS = "$(ARCHS_STANDARD)"; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; CLANG_ENABLE_OBJC_ARC = YES; CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; @@ -2505,7 +2508,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 0F4A75E0241BAC4300E3A024 /* Build configuration list for PBXNativeTarget "Contentstack iOS" */ = { + 0F4A75E0241BAC4300E3A024 /* Build configuration list for PBXNativeTarget "ContentstackSwift iOS" */ = { isa = XCConfigurationList; buildConfigurations = ( 0F4A75DC241BAC4300E3A024 /* Debug */, @@ -2514,7 +2517,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; }; - 0F4A75E1241BAC4300E3A024 /* Build configuration list for PBXNativeTarget "Contentstack iOS Tests" */ = { + 0F4A75E1241BAC4300E3A024 /* Build configuration list for PBXNativeTarget "ContentstackSwift iOS Tests" */ = { isa = XCConfigurationList; buildConfigurations = ( 0F4A75DE241BAC4300E3A024 /* Debug */, @@ -2523,7 +2526,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; }; - 0F4A75FC241BAE6C00E3A024 /* Build configuration list for PBXNativeTarget "Contentstack macOS" */ = { + 0F4A75FC241BAE6C00E3A024 /* Build configuration list for PBXNativeTarget "ContentstackSwift macOS" */ = { isa = XCConfigurationList; buildConfigurations = ( 0F4A75FD241BAE6C00E3A024 /* Debug */, @@ -2532,7 +2535,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; }; - 0F4A75FF241BAE6C00E3A024 /* Build configuration list for PBXNativeTarget "Contentstack macOS Tests" */ = { + 0F4A75FF241BAE6C00E3A024 /* Build configuration list for PBXNativeTarget "ContentstackSwift macOS Tests" */ = { isa = XCConfigurationList; buildConfigurations = ( 0F4A7600241BAE6C00E3A024 /* Debug */, @@ -2541,7 +2544,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; }; - 0F4A7618241BAFE000E3A024 /* Build configuration list for PBXNativeTarget "Contentstack tvOS" */ = { + 0F4A7618241BAFE000E3A024 /* Build configuration list for PBXNativeTarget "ContentstackSwift tvOS" */ = { isa = XCConfigurationList; buildConfigurations = ( 0F4A7619241BAFE000E3A024 /* Debug */, @@ -2550,7 +2553,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; }; - 0F4A761B241BAFE000E3A024 /* Build configuration list for PBXNativeTarget "Contentstack tvOS Tests" */ = { + 0F4A761B241BAFE000E3A024 /* Build configuration list for PBXNativeTarget "ContentstackSwift tvOS Tests" */ = { isa = XCConfigurationList; buildConfigurations = ( 0F4A761C241BAFE000E3A024 /* Debug */, @@ -2559,7 +2562,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; }; - 0F4A7628241BB0A300E3A024 /* Build configuration list for PBXNativeTarget "Contentstack watchOS" */ = { + 0F4A7628241BB0A300E3A024 /* Build configuration list for PBXNativeTarget "ContentstackSwift watchOS" */ = { isa = XCConfigurationList; buildConfigurations = ( 0F4A7629241BB0A300E3A024 /* Debug */, @@ -2568,7 +2571,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; }; - OBJ_2 /* Build configuration list for PBXProject "Contentstack" */ = { + OBJ_2 /* Build configuration list for PBXProject "ContentstackSwift" */ = { isa = XCConfigurationList; buildConfigurations = ( OBJ_3 /* Debug */, @@ -2584,11 +2587,11 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/contentstack/contentstack-utils-swift"; requirement = { - branch = master; - kind = branch; + kind = exactVersion; + version = 1.3.4; }; }; - 47D561532C9EFA1400DC085D /* XCRemoteSwiftPackageReference "contentstack-swift-dvr" */ = { + 6700D9E32DAE76ED00D9B55C /* XCRemoteSwiftPackageReference "contentstack-swift-dvr" */ = { isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/contentstack/contentstack-swift-dvr.git"; requirement = { @@ -2611,12 +2614,12 @@ }; 47D561562C9EFA5900DC085D /* DVR */ = { isa = XCSwiftPackageProductDependency; - package = 47D561532C9EFA1400DC085D /* XCRemoteSwiftPackageReference "contentstack-swift-dvr" */; + package = 6700D9E32DAE76ED00D9B55C /* XCRemoteSwiftPackageReference "contentstack-swift-dvr" */; productName = DVR; }; 6750778D2D3E256A0076A066 /* DVR */ = { isa = XCSwiftPackageProductDependency; - package = 47D561532C9EFA1400DC085D /* XCRemoteSwiftPackageReference "contentstack-swift-dvr" */; + package = 6700D9E32DAE76ED00D9B55C /* XCRemoteSwiftPackageReference "contentstack-swift-dvr" */; productName = DVR; }; /* End XCSwiftPackageProductDependency section */ diff --git a/Contentstack.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/ContentstackSwift.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from Contentstack.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to ContentstackSwift.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/Contentstack.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/ContentstackSwift.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from Contentstack.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to ContentstackSwift.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/Contentstack.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/ContentstackSwift.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings similarity index 100% rename from Contentstack.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings rename to ContentstackSwift.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings diff --git a/Contentstack.xcodeproj/xcshareddata/xcschemes/Contentstack iOS Tests.xcscheme b/ContentstackSwift.xcodeproj/xcshareddata/xcschemes/Contentstack iOS Tests.xcscheme similarity index 98% rename from Contentstack.xcodeproj/xcshareddata/xcschemes/Contentstack iOS Tests.xcscheme rename to ContentstackSwift.xcodeproj/xcshareddata/xcschemes/Contentstack iOS Tests.xcscheme index 77a5e57d..8b63b939 100644 --- a/Contentstack.xcodeproj/xcshareddata/xcschemes/Contentstack iOS Tests.xcscheme +++ b/ContentstackSwift.xcodeproj/xcshareddata/xcschemes/Contentstack iOS Tests.xcscheme @@ -1,6 +1,6 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Contentstack.xcworkspace/contents.xcworkspacedata b/ContentstackSwift.xcworkspace/contents.xcworkspacedata similarity index 85% rename from Contentstack.xcworkspace/contents.xcworkspacedata rename to ContentstackSwift.xcworkspace/contents.xcworkspacedata index f320bd8d..bba964bc 100644 --- a/Contentstack.xcworkspace/contents.xcworkspacedata +++ b/ContentstackSwift.xcworkspace/contents.xcworkspacedata @@ -2,7 +2,7 @@ + location = "group:ContentstackSwift.xcodeproj"> diff --git a/Contentstack.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/ContentstackSwift.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from Contentstack.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to ContentstackSwift.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/Contentstack.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/ContentstackSwift.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings similarity index 100% rename from Contentstack.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings rename to ContentstackSwift.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings diff --git a/Contentstack.xcworkspace/xcshareddata/xcschemes/Contentstack iOS.xcscheme b/ContentstackSwift.xcworkspace/xcshareddata/xcschemes/Contentstack iOS.xcscheme similarity index 100% rename from Contentstack.xcworkspace/xcshareddata/xcschemes/Contentstack iOS.xcscheme rename to ContentstackSwift.xcworkspace/xcshareddata/xcschemes/Contentstack iOS.xcscheme diff --git a/Contentstack.xcworkspace/xcshareddata/xcschemes/Contentstack macOS Tests.xcscheme b/ContentstackSwift.xcworkspace/xcshareddata/xcschemes/Contentstack macOS Tests.xcscheme similarity index 100% rename from Contentstack.xcworkspace/xcshareddata/xcschemes/Contentstack macOS Tests.xcscheme rename to ContentstackSwift.xcworkspace/xcshareddata/xcschemes/Contentstack macOS Tests.xcscheme diff --git a/Contentstack.xcworkspace/xcshareddata/xcschemes/Contentstack macOS.xcscheme b/ContentstackSwift.xcworkspace/xcshareddata/xcschemes/Contentstack macOS.xcscheme similarity index 100% rename from Contentstack.xcworkspace/xcshareddata/xcschemes/Contentstack macOS.xcscheme rename to ContentstackSwift.xcworkspace/xcshareddata/xcschemes/Contentstack macOS.xcscheme diff --git a/Contentstack.xcworkspace/xcshareddata/xcschemes/Contentstack tvOS.xcscheme b/ContentstackSwift.xcworkspace/xcshareddata/xcschemes/Contentstack tvOS.xcscheme similarity index 100% rename from Contentstack.xcworkspace/xcshareddata/xcschemes/Contentstack tvOS.xcscheme rename to ContentstackSwift.xcworkspace/xcshareddata/xcschemes/Contentstack tvOS.xcscheme diff --git a/Contentstack.xcworkspace/xcshareddata/xcschemes/Contentstack watchOS.xcscheme b/ContentstackSwift.xcworkspace/xcshareddata/xcschemes/Contentstack watchOS.xcscheme similarity index 100% rename from Contentstack.xcworkspace/xcshareddata/xcschemes/Contentstack watchOS.xcscheme rename to ContentstackSwift.xcworkspace/xcshareddata/xcschemes/Contentstack watchOS.xcscheme diff --git a/Package.swift b/Package.swift index b0b90004..1240f5bb 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.1 +// swift-tools-version:5.6 // The swift-tools-version declares the minimum version of Swift required to build this package. import PackageDescription @@ -20,9 +20,9 @@ let package = Package( ], dependencies: [ // Dependencies declare other packages that this package depends on. - .package(url: "https://github.com/contentstack/contentstack-utils-swift.git", .branch("master")), + .package(url: "https://github.com/contentstack/contentstack-utils-swift.git", exact:"1.3.4"), // Dev dependencies - .package(url: "https://github.com/contentstack/contentstack-swift-dvr.git", .branch("master")) + .package(url: "https://github.com/contentstack/contentstack-swift-dvr.git", branch:"master") ], targets: [ // Targets are the basic building blocks of a package. A target can define a module or a test suite. @@ -30,11 +30,14 @@ let package = Package( //and on products in packages which this package depends on. .target( name: "ContentstackSwift", - dependencies: ["ContentstackUtils"], + dependencies: [ + .product(name: "ContentstackUtils", package: "contentstack-utils-swift"), + .product(name: "DVR", package: "contentstack-swift-dvr")], path: "Sources"), .testTarget( name: "ContentstackTests", - dependencies: ["ContentstackSwift", "DVR"], + dependencies: ["ContentstackSwift", + .product(name: "DVR", package: "contentstack-swift-dvr")], path: "Tests") ] ) diff --git a/Scripts/.env b/Scripts/.env index 5f935edd..6ddbb366 100644 --- a/Scripts/.env +++ b/Scripts/.env @@ -1 +1 @@ -CONTENTSTACK_SDK_VERSION=1.4.0 +CONTENTSTACK_SDK_VERSION=2.0.0 diff --git a/Tests/AssetQueryAPITest.swift b/Tests/AssetQueryAPITest.swift index 5538eeed..89217aed 100644 --- a/Tests/AssetQueryAPITest.swift +++ b/Tests/AssetQueryAPITest.swift @@ -7,7 +7,7 @@ import XCTest -@testable import Contentstack +@testable import ContentstackSwift import DVR class AssetQueryAPITest: XCTestCase { diff --git a/Tests/AssetQueryTest.swift b/Tests/AssetQueryTest.swift index ed31859d..1acd767c 100644 --- a/Tests/AssetQueryTest.swift +++ b/Tests/AssetQueryTest.swift @@ -6,7 +6,7 @@ // import XCTest -@testable import Contentstack +@testable import ContentstackSwift class AssetQueryTest: XCTestCase { let testStringValue = "TESTVALUE" diff --git a/Tests/AssetTest.swift b/Tests/AssetTest.swift index 164f7497..f7c567fd 100644 --- a/Tests/AssetTest.swift +++ b/Tests/AssetTest.swift @@ -6,7 +6,7 @@ // import XCTest -@testable import Contentstack +@testable import ContentstackSwift class AssetTest: XCTestCase { func testEndPoint() { diff --git a/Tests/ContentStackLogTest.swift b/Tests/ContentStackLogTest.swift index a4769053..fc8007be 100644 --- a/Tests/ContentStackLogTest.swift +++ b/Tests/ContentStackLogTest.swift @@ -6,7 +6,7 @@ // import XCTest -@testable import Contentstack +@testable import ContentstackSwift class CustomeLogMessage: CustomLogger { diff --git a/Tests/ContentTypeQueryAPITest.swift b/Tests/ContentTypeQueryAPITest.swift index 59df46da..662ce2e1 100644 --- a/Tests/ContentTypeQueryAPITest.swift +++ b/Tests/ContentTypeQueryAPITest.swift @@ -6,7 +6,7 @@ // import XCTest -@testable import Contentstack +@testable import ContentstackSwift import DVR class ContentTypeQueryAPITest: XCTestCase { diff --git a/Tests/ContentTypeQueryTest.swift b/Tests/ContentTypeQueryTest.swift index 5b6da6b1..e9081886 100644 --- a/Tests/ContentTypeQueryTest.swift +++ b/Tests/ContentTypeQueryTest.swift @@ -6,7 +6,7 @@ // import XCTest -@testable import Contentstack +@testable import ContentstackSwift class ContentTypeQueryTest: XCTestCase { let testStringValue = "TESTVALUE" let testIntValue = 100 diff --git a/Tests/ContentTypeTest.swift b/Tests/ContentTypeTest.swift index 1a0c092b..d3a4f1a7 100644 --- a/Tests/ContentTypeTest.swift +++ b/Tests/ContentTypeTest.swift @@ -6,7 +6,7 @@ // import XCTest -@testable import Contentstack +@testable import ContentstackSwift final class ContentTypeTests: XCTestCase { let uid = "testUID" diff --git a/Tests/ContentstackConfigTest.swift b/Tests/ContentstackConfigTest.swift index 54c859eb..ca88f31f 100644 --- a/Tests/ContentstackConfigTest.swift +++ b/Tests/ContentstackConfigTest.swift @@ -6,7 +6,7 @@ // import XCTest -@testable import Contentstack +@testable import ContentstackSwift class ContentstackConfigTest: XCTestCase { func testUserAgent() { diff --git a/Tests/ContentstackTest.swift b/Tests/ContentstackTest.swift index cad82273..406e0f51 100644 --- a/Tests/ContentstackTest.swift +++ b/Tests/ContentstackTest.swift @@ -6,7 +6,7 @@ // import XCTest -@testable import Contentstack +@testable import ContentstackSwift import DVR private var _stackSharedInstance: Stack? diff --git a/Tests/ContentstackTests.swift b/Tests/ContentstackTests.swift index 4a1b29a3..32d8307d 100644 --- a/Tests/ContentstackTests.swift +++ b/Tests/ContentstackTests.swift @@ -1,5 +1,5 @@ import XCTest -@testable import Contentstack +@testable import ContentstackSwift final class ContentstackTests: XCTestCase { diff --git a/Tests/DateTest.swift b/Tests/DateTest.swift index 2f6e7129..dfa74c36 100644 --- a/Tests/DateTest.swift +++ b/Tests/DateTest.swift @@ -6,7 +6,7 @@ // import XCTest -@testable import Contentstack +@testable import ContentstackSwift class DateTest: XCTestCase { func testDateFormatter_withMultipleDateFormat() { diff --git a/Tests/EntryAPITest.swift b/Tests/EntryAPITest.swift index 8fa9b970..d7711fb2 100644 --- a/Tests/EntryAPITest.swift +++ b/Tests/EntryAPITest.swift @@ -6,7 +6,7 @@ // import XCTest -@testable import Contentstack +@testable import ContentstackSwift import DVR class EntryAPITest: XCTestCase { diff --git "a/Tests/EntryQueriable\020\020Test.swift" "b/Tests/EntryQueriable\020\020Test.swift" index fcaa6ab3..912574ad 100644 --- "a/Tests/EntryQueriable\020\020Test.swift" +++ "b/Tests/EntryQueriable\020\020Test.swift" @@ -6,7 +6,7 @@ // import XCTest -@testable import Contentstack +@testable import ContentstackSwift class EntryQueriableTest: XCTestCase { let refUID = "reference_uid" diff --git a/Tests/EntryTest.swift b/Tests/EntryTest.swift index c67805e1..aec4d3b2 100644 --- a/Tests/EntryTest.swift +++ b/Tests/EntryTest.swift @@ -6,7 +6,7 @@ // import XCTest -@testable import Contentstack +@testable import ContentstackSwift class EntryTest: XCTestCase { func testEntry_EndPoint() { diff --git a/Tests/ImageTransformEquatableTest.swift b/Tests/ImageTransformEquatableTest.swift index d3e3908a..f4f195d4 100644 --- a/Tests/ImageTransformEquatableTest.swift +++ b/Tests/ImageTransformEquatableTest.swift @@ -6,7 +6,7 @@ // import XCTest -@testable import Contentstack +@testable import ContentstackSwift class ImageTransformEquatableTest: XCTestCase { let urlString = "https://images.contentstack.io/v3/assets/uid_136download" diff --git a/Tests/ImageTransformTest.swift b/Tests/ImageTransformTest.swift index 63b91dbe..b66b4117 100644 --- a/Tests/ImageTransformTest.swift +++ b/Tests/ImageTransformTest.swift @@ -6,7 +6,7 @@ // import XCTest -@testable import Contentstack +@testable import ContentstackSwift #if os(iOS) || os(tvOS) || os(watchOS) import UIKit #endif diff --git a/Tests/ImageTransformTestAdditional.swift b/Tests/ImageTransformTestAdditional.swift index 073c5ff7..ba020333 100644 --- a/Tests/ImageTransformTestAdditional.swift +++ b/Tests/ImageTransformTestAdditional.swift @@ -6,7 +6,7 @@ // import XCTest -@testable import Contentstack +@testable import ContentstackSwift #if os(iOS) || os(tvOS) || os(watchOS) import UIKit #endif diff --git a/Tests/Product.swift b/Tests/Product.swift index 8fe17c5a..a010a382 100644 --- a/Tests/Product.swift +++ b/Tests/Product.swift @@ -6,7 +6,7 @@ // import Foundation -import Contentstack +import ContentstackSwift class Product: EntryDecodable { public enum FieldKeys: String, CodingKey { diff --git a/Tests/QueryEntryType.swift b/Tests/QueryEntryType.swift index bed5ad14..4cc2adbd 100644 --- a/Tests/QueryEntryType.swift +++ b/Tests/QueryEntryType.swift @@ -6,7 +6,7 @@ // import XCTest -@testable import Contentstack +@testable import ContentstackSwift class QueryEntryType: XCTestCase { diff --git a/Tests/QueryOnAPITest.swift b/Tests/QueryOnAPITest.swift index d5d9b39b..4be35ab1 100644 --- a/Tests/QueryOnAPITest.swift +++ b/Tests/QueryOnAPITest.swift @@ -6,7 +6,7 @@ // import XCTest -@testable import Contentstack +@testable import ContentstackSwift import DVR class QueryOnAPITest: XCTestCase { diff --git a/Tests/QueryTest.swift b/Tests/QueryTest.swift index 12620983..d0695839 100644 --- a/Tests/QueryTest.swift +++ b/Tests/QueryTest.swift @@ -6,7 +6,7 @@ // import XCTest -@testable import Contentstack +@testable import ContentstackSwift class QueryTest: XCTestCase { let testStringValue = "TESTVALUE" diff --git a/Tests/Session.swift b/Tests/Session.swift index 9a6ccdd7..fc90d806 100644 --- a/Tests/Session.swift +++ b/Tests/Session.swift @@ -6,7 +6,7 @@ // import Foundation -import Contentstack +import ContentstackSwift class Session: EntryDecodable { public enum FieldKeys: String, CodingKey { case title, uid, locale, type, room, speakers, track diff --git a/Tests/StackCacheAPITest.swift b/Tests/StackCacheAPITest.swift index 20d7604d..0b7f491b 100644 --- a/Tests/StackCacheAPITest.swift +++ b/Tests/StackCacheAPITest.swift @@ -6,7 +6,7 @@ // import XCTest -@testable import Contentstack +@testable import ContentstackSwift import DVR #if (os(iOS) || os(tvOS) || os(watchOS)) && API_TEST class StackCacheAPITest: XCTestCase { diff --git a/Tests/StackTest.swift b/Tests/StackTest.swift index 5e436f46..7d9eef7e 100644 --- a/Tests/StackTest.swift +++ b/Tests/StackTest.swift @@ -6,7 +6,7 @@ // import XCTest -@testable import Contentstack +@testable import ContentstackSwift final class StackTests: XCTestCase { let uid = "testUID" diff --git a/Tests/SutBuilder.swift b/Tests/SutBuilder.swift index f3b0e832..223c4fce 100644 --- a/Tests/SutBuilder.swift +++ b/Tests/SutBuilder.swift @@ -6,7 +6,7 @@ // import Foundation -import Contentstack +import ContentstackSwift func makeEntrySut(contentTypeuid: String? = nil, entryUid: String? = nil) -> Entry { let stack = Contentstack.stack(apiKey: "api_key", diff --git a/Tests/SyncAPITest.swift b/Tests/SyncAPITest.swift index a5e2e2dc..4d4e49bc 100644 --- a/Tests/SyncAPITest.swift +++ b/Tests/SyncAPITest.swift @@ -6,7 +6,7 @@ // import XCTest -@testable import Contentstack +@testable import ContentstackSwift import DVR class SyncAPITest: XCTestCase { diff --git a/Tests/SyncTest.swift b/Tests/SyncTest.swift index 1b5fb5b7..5ca810d0 100644 --- a/Tests/SyncTest.swift +++ b/Tests/SyncTest.swift @@ -6,7 +6,7 @@ // import XCTest -@testable import Contentstack +@testable import ContentstackSwift class SyncTest: XCTestCase { let paginationToken = "uid_138" let syncToken = "uid_138" diff --git a/Tests/TaxonomyTest.swift b/Tests/TaxonomyTest.swift index 90e15678..f9551166 100644 --- a/Tests/TaxonomyTest.swift +++ b/Tests/TaxonomyTest.swift @@ -6,7 +6,7 @@ // import XCTest -@testable import Contentstack +@testable import ContentstackSwift import DVR class TaxonomyTest: XCTestCase { diff --git a/Tests/UtilsTest.swift b/Tests/UtilsTest.swift index 2d35ad48..ae4c44ae 100644 --- a/Tests/UtilsTest.swift +++ b/Tests/UtilsTest.swift @@ -6,7 +6,7 @@ // import XCTest -@testable import Contentstack +@testable import ContentstackSwift class UtilsTest: XCTestCase { let urlString = "https://images.contentstack.io/v3/assets/uid_136download" diff --git a/Tests/XCTestCase+Extension.swift b/Tests/XCTestCase+Extension.swift index f9865cec..8ec948c9 100644 --- a/Tests/XCTestCase+Extension.swift +++ b/Tests/XCTestCase+Extension.swift @@ -7,7 +7,7 @@ import Foundation import XCTest -@testable import Contentstack +@testable import ContentstackSwift extension XCTestCase { func expectFatalError(expectedMessage: String, testcase: @escaping () -> Void) { let expectation = self.expectation(description: "expectingFatalError")