From 473b2f0599a1d4b6baca7d53a69bc13fa4431872 Mon Sep 17 00:00:00 2001 From: reeshika-h Date: Sun, 3 Nov 2024 11:45:44 +0530 Subject: [PATCH 01/22] changes made as suggested --- Package.swift | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Package.swift b/Package.swift index 5a30f24..4b7e076 100644 --- a/Package.swift +++ b/Package.swift @@ -16,7 +16,7 @@ let package = Package( // Products define the executables and libraries produced by a package, and make them visible to other packages. .library( name: "ContentstackSwift", - targets: ["Contentstack"]) + targets: ["ContentstackSwift"]) ], dependencies: [ // Dependencies declare other packages that this package depends on. @@ -29,12 +29,12 @@ let package = Package( // Targets can depend on other targets in this package, //and on products in packages which this package depends on. .target( - name: "Contentstack", + name: "ContentstackSwift", dependencies: ["ContentstackUtils"], path: "Sources"), .testTarget( name: "ContentstackTests", - dependencies: ["Contentstack", "DVR"], + dependencies: ["ContentstackSwift", "DVR"], path: "Tests") ] ) From c6262919c11b15f4bac967b165d3c89f6191f181 Mon Sep 17 00:00:00 2001 From: reeshika-h Date: Wed, 6 Nov 2024 14:54:55 +0530 Subject: [PATCH 02/22] minor changes --- .../xcshareddata/xcschemes/Contentstack iOS.xcscheme | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Contentstack.xcworkspace/xcshareddata/xcschemes/Contentstack iOS.xcscheme b/Contentstack.xcworkspace/xcshareddata/xcschemes/Contentstack iOS.xcscheme index 767a5b9..270ba1c 100644 --- a/Contentstack.xcworkspace/xcshareddata/xcschemes/Contentstack iOS.xcscheme +++ b/Contentstack.xcworkspace/xcshareddata/xcschemes/Contentstack iOS.xcscheme @@ -1,6 +1,6 @@ From 874255390ed7264702251d48c0df4c8451be37ff Mon Sep 17 00:00:00 2001 From: reeshika-h Date: Wed, 6 Nov 2024 15:01:10 +0530 Subject: [PATCH 03/22] minor changes --- .../xcshareddata/xcschemes/Contentstack iOS.xcscheme | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Contentstack.xcworkspace/xcshareddata/xcschemes/Contentstack iOS.xcscheme b/Contentstack.xcworkspace/xcshareddata/xcschemes/Contentstack iOS.xcscheme index 270ba1c..f9abf20 100644 --- a/Contentstack.xcworkspace/xcshareddata/xcschemes/Contentstack iOS.xcscheme +++ b/Contentstack.xcworkspace/xcshareddata/xcschemes/Contentstack iOS.xcscheme @@ -24,8 +24,8 @@ From 58a922381118055e2de722958bb5d1d9a3554d4c Mon Sep 17 00:00:00 2001 From: reeshika-h Date: Wed, 6 Nov 2024 15:04:24 +0530 Subject: [PATCH 04/22] minor change --- .../xcshareddata/xcschemes/Contentstack iOS.xcscheme | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Contentstack.xcworkspace/xcshareddata/xcschemes/Contentstack iOS.xcscheme b/Contentstack.xcworkspace/xcshareddata/xcschemes/Contentstack iOS.xcscheme index f9abf20..56849cf 100644 --- a/Contentstack.xcworkspace/xcshareddata/xcschemes/Contentstack iOS.xcscheme +++ b/Contentstack.xcworkspace/xcshareddata/xcschemes/Contentstack iOS.xcscheme @@ -25,7 +25,7 @@ From ceff54a939a44bd0926dd6f719c2137f8ffbc9eb Mon Sep 17 00:00:00 2001 From: reeshika-h Date: Fri, 3 Jan 2025 11:22:09 +0530 Subject: [PATCH 05/22] Contentstack-swift-dvr package has been added --- Cartfile | 2 - Cartfile.resolved | 2 - Contentstack.xcodeproj/project.pbxproj | 122 +++++++++++++++--- .../xcschemes/Contentstack iOS Tests.xcscheme | 2 +- .../xcschemes/Contentstack iOS.xcscheme | 2 +- .../Contentstack macOS Tests.xcscheme | 2 +- .../xcschemes/Contentstack macOS.xcscheme | 2 +- .../xcschemes/Contentstack tvOS.xcscheme | 2 +- .../xcschemes/Contentstack watchOS.xcscheme | 2 +- Package.swift | 2 +- 10 files changed, 108 insertions(+), 32 deletions(-) delete mode 100644 Cartfile delete mode 100644 Cartfile.resolved diff --git a/Cartfile b/Cartfile deleted file mode 100644 index 8284db3..0000000 --- a/Cartfile +++ /dev/null @@ -1,2 +0,0 @@ -github "venmo/DVR" -github "contentstack/contentstack-utils-swift.git" \ No newline at end of file diff --git a/Cartfile.resolved b/Cartfile.resolved deleted file mode 100644 index c2b588b..0000000 --- a/Cartfile.resolved +++ /dev/null @@ -1,2 +0,0 @@ -github "vkalta/DVR" "8bb79349473d1ff595f07d216662ee5163854f42" -github "vkalta/contentstack-utils-swift" "dacaf16bd8e4e182e0bef57df2957c7c8697082c" diff --git a/Contentstack.xcodeproj/project.pbxproj b/Contentstack.xcodeproj/project.pbxproj index 48534c4..bf9c97b 100644 --- a/Contentstack.xcodeproj/project.pbxproj +++ b/Contentstack.xcodeproj/project.pbxproj @@ -921,9 +921,10 @@ OBJ_1 /* Project object */ = { isa = PBXProject; attributes = { + BuildIndependentTargetsInParallel = YES; LastSwiftMigration = 9999; LastSwiftUpdateCheck = 1100; - LastUpgradeCheck = 9999; + LastUpgradeCheck = 1620; TargetAttributes = { 0F4A75CA241BAC4300E3A024 = { CreatedOnToolsVersion = 11.0; @@ -969,7 +970,7 @@ mainGroup = OBJ_5; packageReferences = ( 47D5614F2C9EF96D00DC085D /* XCRemoteSwiftPackageReference "contentstack-utils-swift" */, - 47D561532C9EFA1400DC085D /* XCRemoteSwiftPackageReference "DVR" */, + 47D561532C9EFA1400DC085D /* XCRemoteSwiftPackageReference "contentstack-swift-dvr" */, ); productRefGroup = OBJ_14 /* Products */; projectDirPath = ""; @@ -1389,8 +1390,7 @@ CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "Apple Development"; - "CODE_SIGN_IDENTITY[sdk=macosx*]" = "-"; + CODE_SIGN_IDENTITY = ""; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; DEFINES_MODULE = YES; @@ -1398,6 +1398,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_MODULE_VERIFIER = YES; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -1422,6 +1423,7 @@ "@loader_path/Frameworks", ); MARKETING_VERSION = 1.2.5; + MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++14"; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.contentstack.Contentstack; @@ -1433,7 +1435,7 @@ SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; - TVOS_DEPLOYMENT_TARGET = 9.0; + TVOS_DEPLOYMENT_TARGET = 12.0; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; WATCHOS_DEPLOYMENT_TARGET = 2.0; @@ -1472,8 +1474,7 @@ CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "Apple Development"; - "CODE_SIGN_IDENTITY[sdk=macosx*]" = "-"; + CODE_SIGN_IDENTITY = ""; CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1; @@ -1482,6 +1483,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_MODULE_VERIFIER = YES; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; @@ -1502,6 +1504,7 @@ "@loader_path/Frameworks", ); MARKETING_VERSION = 1.2.5; + MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++14"; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.contentstack.Contentstack; @@ -1511,7 +1514,7 @@ SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; - TVOS_DEPLOYMENT_TARGET = 9.0; + TVOS_DEPLOYMENT_TARGET = 12.0; VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -1691,10 +1694,12 @@ CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; CURRENT_PROJECT_VERSION = 1; + DEAD_CODE_STRIPPING = YES; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_MODULE_VERIFIER = YES; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -1712,7 +1717,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = "Supporting Files/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/../Frameworks", @@ -1720,6 +1725,7 @@ ); MACOSX_DEPLOYMENT_TARGET = 13.0; MARKETING_VERSION = 1.2.5; + MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++14"; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.contentstack.Contentstack; @@ -1729,7 +1735,7 @@ SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; - TVOS_DEPLOYMENT_TARGET = 9.0; + TVOS_DEPLOYMENT_TARGET = 12.0; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; WATCHOS_DEPLOYMENT_TARGET = 2.0; @@ -1772,10 +1778,12 @@ COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1; + DEAD_CODE_STRIPPING = YES; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_MODULE_VERIFIER = YES; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -1788,7 +1796,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = "Supporting Files/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/../Frameworks", @@ -1796,6 +1804,7 @@ ); MACOSX_DEPLOYMENT_TARGET = 13.0; MARKETING_VERSION = 1.2.5; + MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++14"; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.contentstack.Contentstack; @@ -1803,7 +1812,7 @@ SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = macosx; SWIFT_VERSION = 5.0; - TVOS_DEPLOYMENT_TARGET = 9.0; + TVOS_DEPLOYMENT_TARGET = 12.0; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; WATCHOS_DEPLOYMENT_TARGET = 2.0; @@ -1843,6 +1852,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; + DEAD_CODE_STRIPPING = YES; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -1909,6 +1919,7 @@ CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; + DEAD_CODE_STRIPPING = YES; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -1966,12 +1977,14 @@ CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_IDENTITY = ""; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_MODULE_VERIFIER = YES; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -1989,13 +2002,14 @@ GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = "Supporting Files/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", "@loader_path/Frameworks", ); MARKETING_VERSION = 1.2.5; + MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++14"; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = "com.contentstack.Contentstack-tvOS"; @@ -2045,6 +2059,7 @@ CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_IDENTITY = ""; CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1; @@ -2052,6 +2067,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_MODULE_VERIFIER = YES; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -2064,13 +2080,14 @@ GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = "Supporting Files/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", "@loader_path/Frameworks", ); MARKETING_VERSION = 1.2.5; + MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++14"; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = "com.contentstack.Contentstack-tvOS"; @@ -2249,12 +2266,14 @@ CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_IDENTITY = ""; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_MODULE_VERIFIER = YES; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -2272,13 +2291,14 @@ GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = "Supporting Files/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", "@loader_path/Frameworks", ); MARKETING_VERSION = 1.2.5; + MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++14"; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = "com.contentstack.Contentstack-watchOS"; @@ -2290,7 +2310,7 @@ SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 4; - TVOS_DEPLOYMENT_TARGET = 9.0; + TVOS_DEPLOYMENT_TARGET = 12.0; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; WATCHOS_DEPLOYMENT_TARGET = 6.0; @@ -2330,6 +2350,7 @@ CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_IDENTITY = ""; CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1; @@ -2337,6 +2358,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_MODULE_VERIFIER = YES; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -2349,13 +2371,14 @@ GCC_WARN_UNUSED_VARIABLE = YES; INFOPLIST_FILE = "Supporting Files/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", "@loader_path/Frameworks", ); MARKETING_VERSION = 1.2.5; + MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++14"; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = "com.contentstack.Contentstack-watchOS"; @@ -2365,7 +2388,7 @@ SUPPORTED_PLATFORMS = "watchsimulator watchos"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 4; - TVOS_DEPLOYMENT_TARGET = 9.0; + TVOS_DEPLOYMENT_TARGET = 12.0; VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -2380,18 +2403,47 @@ ARCHS = "$(ARCHS_STANDARD)"; "ARCHS[sdk=*]" = "$(ARCHS_STANDARD)"; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; + DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = dwarf; DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_NS_ASSERTIONS = YES; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + ENABLE_USER_SCRIPT_SANDBOXING = YES; "EXCLUDED_ARCHS[sdk=*]" = ""; + GCC_NO_COMMON_BLOCKS = YES; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", "SWIFT_PACKAGE=1", "DEBUG=1", ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 13.0; MACOSX_DEPLOYMENT_TARGET = 13.0; ONLY_ACTIVE_ARCH = YES; @@ -2413,15 +2465,43 @@ buildSettings = { ARCHS = "$(ARCHS_STANDARD)"; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = YES; + DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_USER_SCRIPT_SANDBOXING = YES; + GCC_NO_COMMON_BLOCKS = YES; GCC_OPTIMIZATION_LEVEL = s; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", "SWIFT_PACKAGE=1", ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 13.0; MACOSX_DEPLOYMENT_TARGET = 13.0; ONLY_ACTIVE_ARCH = YES; @@ -2524,9 +2604,9 @@ kind = branch; }; }; - 47D561532C9EFA1400DC085D /* XCRemoteSwiftPackageReference "DVR" */ = { + 47D561532C9EFA1400DC085D /* XCRemoteSwiftPackageReference "contentstack-swift-dvr" */ = { isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/vkalta/DVR.git"; + repositoryURL = "https://github.com/contentstack/contentstack-swift-dvr.git"; requirement = { branch = master; kind = branch; @@ -2547,7 +2627,7 @@ }; 47D561562C9EFA5900DC085D /* DVR */ = { isa = XCSwiftPackageProductDependency; - package = 47D561532C9EFA1400DC085D /* XCRemoteSwiftPackageReference "DVR" */; + package = 47D561532C9EFA1400DC085D /* XCRemoteSwiftPackageReference "contentstack-swift-dvr" */; productName = DVR; }; /* End XCSwiftPackageProductDependency section */ diff --git a/Contentstack.xcodeproj/xcshareddata/xcschemes/Contentstack iOS Tests.xcscheme b/Contentstack.xcodeproj/xcshareddata/xcschemes/Contentstack iOS Tests.xcscheme index ff8bf29..77a5e57 100644 --- a/Contentstack.xcodeproj/xcshareddata/xcschemes/Contentstack iOS Tests.xcscheme +++ b/Contentstack.xcodeproj/xcshareddata/xcschemes/Contentstack iOS Tests.xcscheme @@ -1,6 +1,6 @@ Date: Fri, 3 Jan 2025 11:38:10 +0530 Subject: [PATCH 06/22] Added a step to resolve dependencies before running snyk --- .github/workflows/sca-scan.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/sca-scan.yml b/.github/workflows/sca-scan.yml index 1280676..8edb078 100644 --- a/.github/workflows/sca-scan.yml +++ b/.github/workflows/sca-scan.yml @@ -8,6 +8,8 @@ jobs: steps: - uses: actions/checkout@master - uses: snyk/actions/setup@master + - name: Resolve Swift package dependencies + run: swift package resolve - name: Run Snyk to check for vulnerabilities run: snyk test --all-projects --fail-on=all env: From 1f4dbda9c031e400614755df5b7953a9dc5f7baa Mon Sep 17 00:00:00 2001 From: reeshika-h Date: Fri, 3 Jan 2025 12:30:54 +0530 Subject: [PATCH 07/22] Added pkg token for accessing private repos --- .github/workflows/sca-scan.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/sca-scan.yml b/.github/workflows/sca-scan.yml index 8edb078..9ca0e8d 100644 --- a/.github/workflows/sca-scan.yml +++ b/.github/workflows/sca-scan.yml @@ -8,6 +8,9 @@ jobs: steps: - uses: actions/checkout@master - uses: snyk/actions/setup@master + # Set up GitHub Token for authentication with private repos + - name: Set up GitHub Token + run: git config --global url."https://x-access-token:${{ secrets.PKG_TOKEN }}@github.com".insteadOf "https://github.com" - name: Resolve Swift package dependencies run: swift package resolve - name: Run Snyk to check for vulnerabilities From 21a58298fbf6b231a0aa879db7fe7db5e828cfa4 Mon Sep 17 00:00:00 2001 From: reeshika-h Date: Fri, 3 Jan 2025 12:35:00 +0530 Subject: [PATCH 08/22] changes made to handle git@github.com URLs --- .github/workflows/sca-scan.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/sca-scan.yml b/.github/workflows/sca-scan.yml index 9ca0e8d..4efa38c 100644 --- a/.github/workflows/sca-scan.yml +++ b/.github/workflows/sca-scan.yml @@ -10,7 +10,9 @@ jobs: - uses: snyk/actions/setup@master # Set up GitHub Token for authentication with private repos - name: Set up GitHub Token - run: git config --global url."https://x-access-token:${{ secrets.PKG_TOKEN }}@github.com".insteadOf "https://github.com" + run: | + git config --global url."https://x-access-token:${{ secrets.PKG_TOKEN }}@github.com".insteadOf "https://github.com" + git config --global url."https://x-access-token:${{ secrets.PKG_TOKEN }}@github.com".insteadOf "git@github.com:" - name: Resolve Swift package dependencies run: swift package resolve - name: Run Snyk to check for vulnerabilities From b138ad99e60f0f31e96121cba3aa152ee4fc64a0 Mon Sep 17 00:00:00 2001 From: reeshika-h Date: Fri, 3 Jan 2025 12:41:29 +0530 Subject: [PATCH 09/22] changes made since facing errors --- .github/workflows/sca-scan.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/sca-scan.yml b/.github/workflows/sca-scan.yml index 4efa38c..02214b3 100644 --- a/.github/workflows/sca-scan.yml +++ b/.github/workflows/sca-scan.yml @@ -15,7 +15,10 @@ jobs: git config --global url."https://x-access-token:${{ secrets.PKG_TOKEN }}@github.com".insteadOf "git@github.com:" - name: Resolve Swift package dependencies run: swift package resolve + env: + GITHUB_TOKEN: ${{ secrets.PKG_TOKEN }} - name: Run Snyk to check for vulnerabilities run: snyk test --all-projects --fail-on=all env: SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }} + GITHUB_TOKEN: ${{ secrets.PKG_TOKEN }} From 212a6eb23fed31c72eb293b2495cf064c98d383d Mon Sep 17 00:00:00 2001 From: reeshika-h Date: Mon, 6 Jan 2025 10:44:51 +0530 Subject: [PATCH 10/22] fix changes 1 --- .github/workflows/sca-scan.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/sca-scan.yml b/.github/workflows/sca-scan.yml index 02214b3..4d25d99 100644 --- a/.github/workflows/sca-scan.yml +++ b/.github/workflows/sca-scan.yml @@ -8,13 +8,13 @@ jobs: steps: - uses: actions/checkout@master - uses: snyk/actions/setup@master - # Set up GitHub Token for authentication with private repos - - name: Set up GitHub Token + - name: Set up GitHub Token for Swift Package Manager run: | - git config --global url."https://x-access-token:${{ secrets.PKG_TOKEN }}@github.com".insteadOf "https://github.com" - git config --global url."https://x-access-token:${{ secrets.PKG_TOKEN }}@github.com".insteadOf "git@github.com:" + git config --global url."https://x-access-token:${{ secrets.PKG_TOKEN }}@github.com".insteadOf "https://github.com" + + # Step 4: Resolve Swift package dependencies - name: Resolve Swift package dependencies - run: swift package resolve + run: swift package resolve env: GITHUB_TOKEN: ${{ secrets.PKG_TOKEN }} - name: Run Snyk to check for vulnerabilities From 2a1a5d6bff74c5712020e729f9586ef4e5d68489 Mon Sep 17 00:00:00 2001 From: reeshika-h Date: Mon, 6 Jan 2025 11:13:00 +0530 Subject: [PATCH 11/22] fix: changes 2 --- .github/workflows/sca-scan.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sca-scan.yml b/.github/workflows/sca-scan.yml index 4d25d99..dcc8485 100644 --- a/.github/workflows/sca-scan.yml +++ b/.github/workflows/sca-scan.yml @@ -10,7 +10,7 @@ jobs: - uses: snyk/actions/setup@master - name: Set up GitHub Token for Swift Package Manager run: | - git config --global url."https://x-access-token:${{ secrets.PKG_TOKEN }}@github.com".insteadOf "https://github.com" + git config --global url."https://x-access-token:${{ secrets.PKG_TOKEN }}@github.com/".insteadOf "https://github.com/" # Step 4: Resolve Swift package dependencies - name: Resolve Swift package dependencies From 78eb4805e73454feb599a7abf75e0cb56609c8f0 Mon Sep 17 00:00:00 2001 From: reeshika-h Date: Mon, 6 Jan 2025 11:16:40 +0530 Subject: [PATCH 12/22] fix: changes 3 --- .github/workflows/sca-scan.yml | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/.github/workflows/sca-scan.yml b/.github/workflows/sca-scan.yml index dcc8485..46d0f6c 100644 --- a/.github/workflows/sca-scan.yml +++ b/.github/workflows/sca-scan.yml @@ -8,15 +8,32 @@ jobs: steps: - uses: actions/checkout@master - uses: snyk/actions/setup@master - - name: Set up GitHub Token for Swift Package Manager + # - name: Set up GitHub Token for Swift Package Manager + # run: | + # git config --global url."https://x-access-token:${{ secrets.PKG_TOKEN }}@github.com/".insteadOf "https://github.com/" + + # # Step 4: Resolve Swift package dependencies + # - name: Resolve Swift package dependencies + # run: swift package resolve + # env: + # GITHUB_TOKEN: ${{ secrets.PKG_TOKEN }} + - name: Debug - Test Git Configuration + run: | + echo "Testing Git configuration..." + git config --global --list + # Test specific repo access (token will be masked in logs) + git ls-remote https://x-access-token:${{ secrets.PKG_TOKEN }}@github.com/contentstack/contentstack-swift-dvr.git + + - name: Configure Git credentials run: | git config --global url."https://x-access-token:${{ secrets.PKG_TOKEN }}@github.com/".insteadOf "https://github.com/" - # Step 4: Resolve Swift package dependencies - name: Resolve Swift package dependencies - run: swift package resolve + run: | + echo "Resolving packages..." + swift package resolve --verbose env: - GITHUB_TOKEN: ${{ secrets.PKG_TOKEN }} + GITHUB_TOKEN: ${{ secrets.PKG_TOKEN }} - name: Run Snyk to check for vulnerabilities run: snyk test --all-projects --fail-on=all env: From 0e086ec812becf7efa8f661e226a4e69fabe92b7 Mon Sep 17 00:00:00 2001 From: reeshika-h Date: Mon, 6 Jan 2025 11:22:42 +0530 Subject: [PATCH 13/22] fix : changes 4 --- .github/workflows/sca-scan.yml | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/.github/workflows/sca-scan.yml b/.github/workflows/sca-scan.yml index 46d0f6c..b54e15e 100644 --- a/.github/workflows/sca-scan.yml +++ b/.github/workflows/sca-scan.yml @@ -17,21 +17,13 @@ jobs: # run: swift package resolve # env: # GITHUB_TOKEN: ${{ secrets.PKG_TOKEN }} - - name: Debug - Test Git Configuration - run: | - echo "Testing Git configuration..." - git config --global --list - # Test specific repo access (token will be masked in logs) - git ls-remote https://x-access-token:${{ secrets.PKG_TOKEN }}@github.com/contentstack/contentstack-swift-dvr.git - - name: Configure Git credentials run: | + touch ~/.gitconfig git config --global url."https://x-access-token:${{ secrets.PKG_TOKEN }}@github.com/".insteadOf "https://github.com/" - + - name: Resolve Swift package dependencies - run: | - echo "Resolving packages..." - swift package resolve --verbose + run: swift package resolve env: GITHUB_TOKEN: ${{ secrets.PKG_TOKEN }} - name: Run Snyk to check for vulnerabilities @@ -39,3 +31,6 @@ jobs: env: SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }} GITHUB_TOKEN: ${{ secrets.PKG_TOKEN }} + - name: Cleanup credentials + if: always() + run: rm -f ~/.gitconfig From 4be65c943899dffa677ed03ce04d6c212944d979 Mon Sep 17 00:00:00 2001 From: Aravind Kumar Date: Tue, 7 Jan 2025 18:15:13 +0530 Subject: [PATCH 14/22] Update sca-scan.yml --- .github/workflows/sca-scan.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/sca-scan.yml b/.github/workflows/sca-scan.yml index b54e15e..73e27c6 100644 --- a/.github/workflows/sca-scan.yml +++ b/.github/workflows/sca-scan.yml @@ -19,18 +19,14 @@ jobs: # GITHUB_TOKEN: ${{ secrets.PKG_TOKEN }} - name: Configure Git credentials run: | - touch ~/.gitconfig git config --global url."https://x-access-token:${{ secrets.PKG_TOKEN }}@github.com/".insteadOf "https://github.com/" - name: Resolve Swift package dependencies run: swift package resolve - env: - GITHUB_TOKEN: ${{ secrets.PKG_TOKEN }} - name: Run Snyk to check for vulnerabilities run: snyk test --all-projects --fail-on=all env: SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }} - GITHUB_TOKEN: ${{ secrets.PKG_TOKEN }} - name: Cleanup credentials if: always() run: rm -f ~/.gitconfig From 47af1335879aaa49db28edcaa424b410942a624b Mon Sep 17 00:00:00 2001 From: Aravind Kumar Date: Tue, 7 Jan 2025 18:18:19 +0530 Subject: [PATCH 15/22] Update sca-scan.yml --- .github/workflows/sca-scan.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/.github/workflows/sca-scan.yml b/.github/workflows/sca-scan.yml index 73e27c6..927ff1d 100644 --- a/.github/workflows/sca-scan.yml +++ b/.github/workflows/sca-scan.yml @@ -8,15 +8,6 @@ jobs: steps: - uses: actions/checkout@master - uses: snyk/actions/setup@master - # - name: Set up GitHub Token for Swift Package Manager - # run: | - # git config --global url."https://x-access-token:${{ secrets.PKG_TOKEN }}@github.com/".insteadOf "https://github.com/" - - # # Step 4: Resolve Swift package dependencies - # - name: Resolve Swift package dependencies - # run: swift package resolve - # env: - # GITHUB_TOKEN: ${{ secrets.PKG_TOKEN }} - name: Configure Git credentials run: | git config --global url."https://x-access-token:${{ secrets.PKG_TOKEN }}@github.com/".insteadOf "https://github.com/" From d7ce3446cfca36467608887a148a82ffc1da9a25 Mon Sep 17 00:00:00 2001 From: reeshika-h Date: Tue, 7 Jan 2025 18:28:16 +0530 Subject: [PATCH 16/22] Adding the cartfile back, since certain workflows in the repo use Carthage command --- Cartfile | 2 ++ Cartfile.resolved | 2 ++ 2 files changed, 4 insertions(+) create mode 100644 Cartfile create mode 100644 Cartfile.resolved diff --git a/Cartfile b/Cartfile new file mode 100644 index 0000000..f587220 --- /dev/null +++ b/Cartfile @@ -0,0 +1,2 @@ +github "contentstack/contentstack-swift-dvr" "master" +github "contentstack/contentstack-utils-swift" diff --git a/Cartfile.resolved b/Cartfile.resolved new file mode 100644 index 0000000..861f978 --- /dev/null +++ b/Cartfile.resolved @@ -0,0 +1,2 @@ +github "contentstack/contentstack-swift-dvr" "65beaf91fc0d7a46d4860028d1087ee5dbb8e382" +github "contentstack/contentstack-utils-swift" "v1.3.3" From dbf9de4cd1a38f06aa44399139f06a2fbd2eef89 Mon Sep 17 00:00:00 2001 From: reeshika-h Date: Thu, 9 Jan 2025 16:39:56 +0530 Subject: [PATCH 17/22] added secrets in the workflow --- .github/workflows/ci.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ebf85c6..b06f65b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,6 +31,14 @@ jobs: with: xcode-version: '15.4.0' + - name: Create config file + run: | + echo '{ + "api_key": "${{ secrets.CS_API_KEY }}", + "delivery_token": "${{ secrets.CS_DELIVERY_TOKEN }}", + "environment": "${{ secrets.CS_ENVIRONMENT }}" + }' > Tests/config.json + - name: Build and run tests run: | xcodebuild test \ @@ -62,6 +70,14 @@ jobs: uses: maxim-lobanov/setup-xcode@v1 with: xcode-version: '15.4.0' + + - name: Create config file + run: | + echo '{ + "api_key": "${{ secrets.CS_API_KEY }}", + "delivery_token": "${{ secrets.CS_DELIVERY_TOKEN }}", + "environment": "${{ secrets.CS_ENVIRONMENT }}" + }' > Tests/config.json - name: Build and run tests run: | From 1fe95f332dea50a9f08fca75f7cfb83a671d80be Mon Sep 17 00:00:00 2001 From: reeshika-h Date: Thu, 9 Jan 2025 16:59:08 +0530 Subject: [PATCH 18/22] correction made --- .github/workflows/ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b06f65b..a680177 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,9 +34,9 @@ jobs: - name: Create config file run: | echo '{ - "api_key": "${{ secrets.CS_API_KEY }}", - "delivery_token": "${{ secrets.CS_DELIVERY_TOKEN }}", - "environment": "${{ secrets.CS_ENVIRONMENT }}" + "api_key": "${{ secrets.api_key }}", + "delivery_token": "${{ secrets.delivery_token }}", + "environment": "${{ secrets.environment }}" }' > Tests/config.json - name: Build and run tests @@ -74,9 +74,9 @@ jobs: - name: Create config file run: | echo '{ - "api_key": "${{ secrets.CS_API_KEY }}", - "delivery_token": "${{ secrets.CS_DELIVERY_TOKEN }}", - "environment": "${{ secrets.CS_ENVIRONMENT }}" + "api_key": "${{ secrets.api_key }}", + "delivery_token": "${{ secrets.delivery_token }}", + "environment": "${{ secrets.environment }}" }' > Tests/config.json - name: Build and run tests From 7a1447014cea90596f04eb544b63e9ebfc7093b0 Mon Sep 17 00:00:00 2001 From: reeshika-h Date: Fri, 10 Jan 2025 11:04:16 +0530 Subject: [PATCH 19/22] changes made in simulator configuration --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a680177..aba6770 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -84,7 +84,7 @@ jobs: xcodebuild test \ -workspace Contentstack.xcworkspace \ -scheme "Contentstack iOS Tests" \ - -destination 'platform=iOS Simulator,name=iPhone 14,OS=latest' \ + -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 From 34927185351eca52e228b88e5575cd52d44fb98b Mon Sep 17 00:00:00 2001 From: reeshika-h Date: Fri, 10 Jan 2025 11:15:53 +0530 Subject: [PATCH 20/22] changes 1 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index aba6770..3df81a8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -84,7 +84,7 @@ jobs: xcodebuild test \ -workspace Contentstack.xcworkspace \ -scheme "Contentstack iOS Tests" \ - -destination 'platform=iOS Simulator,name=iPhone 15,OS=17.2' \ + -destination 'platform=iOS Simulator,name=iPhone 14 Pro,OS=16.4' \ -sdk iphonesimulator \ ONLY_ACTIVE_ARCH=NO \ CODE_SIGNING_ALLOWED=NO \ No newline at end of file From 68a8ad85018ecba789b00471829953f34cc3ccd8 Mon Sep 17 00:00:00 2001 From: reeshika-h Date: Fri, 10 Jan 2025 15:18:45 +0530 Subject: [PATCH 21/22] changes 2 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3df81a8..aba6770 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -84,7 +84,7 @@ jobs: xcodebuild test \ -workspace Contentstack.xcworkspace \ -scheme "Contentstack iOS Tests" \ - -destination 'platform=iOS Simulator,name=iPhone 14 Pro,OS=16.4' \ + -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 From 7b8f2acbbf4010fe1d945d9a003d42306ec5bcc8 Mon Sep 17 00:00:00 2001 From: reeshika-h Date: Fri, 17 Jan 2025 17:54:36 +0530 Subject: [PATCH 22/22] updated the url for swift utils sdk --- Cartfile.resolved | 4 ++-- Contentstack.xcodeproj/project.pbxproj | 2 +- LICENSE | 2 +- Package.swift | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cartfile.resolved b/Cartfile.resolved index 861f978..a6fdcb9 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,2 +1,2 @@ -github "contentstack/contentstack-swift-dvr" "65beaf91fc0d7a46d4860028d1087ee5dbb8e382" -github "contentstack/contentstack-utils-swift" "v1.3.3" +github "contentstack/contentstack-swift-dvr" "c8040a2451e4bc2c312347531cac6c73f23ce50c" +github "contentstack/contentstack-utils-swift" "v1.3.4" diff --git a/Contentstack.xcodeproj/project.pbxproj b/Contentstack.xcodeproj/project.pbxproj index bf9c97b..adc56d8 100644 --- a/Contentstack.xcodeproj/project.pbxproj +++ b/Contentstack.xcodeproj/project.pbxproj @@ -2598,7 +2598,7 @@ /* Begin XCRemoteSwiftPackageReference section */ 47D5614F2C9EF96D00DC085D /* XCRemoteSwiftPackageReference "contentstack-utils-swift" */ = { isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/vkalta/contentstack-utils-swift"; + repositoryURL = "https://github.com/contentstack/contentstack-utils-swift"; requirement = { branch = master; kind = branch; diff --git a/LICENSE b/LICENSE index e17cc92..3851325 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2012-2024 Contentstack +Copyright (c) 2012-2025 Contentstack Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/Package.swift b/Package.swift index c3ac616..b0b9000 100644 --- a/Package.swift +++ b/Package.swift @@ -20,7 +20,7 @@ let package = Package( ], dependencies: [ // Dependencies declare other packages that this package depends on. - .package(url: "https://github.com/contentstack/contentstack-utils-swift.git", from: "1.3.0"), + .package(url: "https://github.com/contentstack/contentstack-utils-swift.git", .branch("master")), // Dev dependencies .package(url: "https://github.com/contentstack/contentstack-swift-dvr.git", .branch("master")) ],