Skip to content

Commit 3ab44e9

Browse files
uttamukkojiuttamukkoji
committed
2 parents 99ea407 + 6897900 commit 3ab44e9

File tree

6 files changed

+142
-22
lines changed

6 files changed

+142
-22
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ jobs:
2121
${{ runner.os }}-carthage-
2222
- name: Dependencies
2323
run: carthage bootstrap --no-use-binaries --platform macOS --cache-builds
24+
- name: Dependency libxml2
25+
run: brew install libxml2 && brew link --force libxml2
2426
- name: macOS
2527
run: set -o pipefail && env NSUnbufferedIO=YES xcodebuild -workspace "Contentstack.xcworkspace" -scheme "Contentstack macOS" SWIFT_ACTIVE_COMPILATION_CONDITIONS="NO_FATAL_TEST" -destination "platform=macOS" test | xcpretty
2628
iOS:

‎.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Contentstack.xcodeproj/project.pbxproj‎

Lines changed: 120 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 46;
6+
objectVersion = 52;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -182,6 +182,10 @@
182182
0FD39D4A24237A0400E34826 /* ContentTypeQueryTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0FD39D4924237A0400E34826 /* ContentTypeQueryTest.swift */; };
183183
0FD39D4B24237A0400E34826 /* ContentTypeQueryTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0FD39D4924237A0400E34826 /* ContentTypeQueryTest.swift */; };
184184
0FD39D4C24237A0400E34826 /* ContentTypeQueryTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0FD39D4924237A0400E34826 /* ContentTypeQueryTest.swift */; };
185+
0FD6F8F22620194100636504 /* ContentstackUtils in Frameworks */ = {isa = PBXBuildFile; productRef = 0FD6F8F12620194100636504 /* ContentstackUtils */; };
186+
0FD6F9102620194C00636504 /* ContentstackUtils in Frameworks */ = {isa = PBXBuildFile; productRef = 0FD6F90F2620194C00636504 /* ContentstackUtils */; };
187+
0FD6F9122620195300636504 /* ContentstackUtils in Frameworks */ = {isa = PBXBuildFile; productRef = 0FD6F9112620195300636504 /* ContentstackUtils */; };
188+
0FD6F9142620195800636504 /* ContentstackUtils in Frameworks */ = {isa = PBXBuildFile; productRef = 0FD6F9132620195800636504 /* ContentstackUtils */; };
185189
0FFA5D4A241F4DED003B3AF5 /* ContentstackConfigTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0FFA5D49241F4DED003B3AF5 /* ContentstackConfigTest.swift */; };
186190
0FFA5D4E241F4FAC003B3AF5 /* Contentstack.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FFA5D4B241F4FAC003B3AF5 /* Contentstack.h */; settings = {ATTRIBUTES = (Public, ); }; };
187191
0FFA5D4F241F4FAC003B3AF5 /* Contentstack.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FFA5D4B241F4FAC003B3AF5 /* Contentstack.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -386,6 +390,7 @@
386390
isa = PBXFrameworksBuildPhase;
387391
buildActionMask = 2147483647;
388392
files = (
393+
0FD6F8F22620194100636504 /* ContentstackUtils in Frameworks */,
389394
);
390395
runOnlyForDeploymentPostprocessing = 0;
391396
};
@@ -403,6 +408,7 @@
403408
isa = PBXFrameworksBuildPhase;
404409
buildActionMask = 2147483647;
405410
files = (
411+
0FD6F9102620194C00636504 /* ContentstackUtils in Frameworks */,
406412
);
407413
runOnlyForDeploymentPostprocessing = 0;
408414
};
@@ -420,6 +426,7 @@
420426
isa = PBXFrameworksBuildPhase;
421427
buildActionMask = 2147483647;
422428
files = (
429+
0FD6F9122620195300636504 /* ContentstackUtils in Frameworks */,
423430
);
424431
runOnlyForDeploymentPostprocessing = 0;
425432
};
@@ -437,6 +444,7 @@
437444
isa = PBXFrameworksBuildPhase;
438445
buildActionMask = 2147483647;
439446
files = (
447+
0FD6F9142620195800636504 /* ContentstackUtils in Frameworks */,
440448
);
441449
runOnlyForDeploymentPostprocessing = 0;
442450
};
@@ -751,6 +759,7 @@
751759
);
752760
name = "Contentstack iOS";
753761
packageProductDependencies = (
762+
0FD6F8F12620194100636504 /* ContentstackUtils */,
754763
);
755764
productName = "Contentstack iOS";
756765
productReference = 0F4A75CB241BAC4300E3A024 /* Contentstack.framework */;
@@ -789,6 +798,7 @@
789798
);
790799
name = "Contentstack macOS";
791800
packageProductDependencies = (
801+
0FD6F90F2620194C00636504 /* ContentstackUtils */,
792802
);
793803
productName = "Contentstack macOS";
794804
productReference = 0F4A75EB241BAE6C00E3A024 /* Contentstack.framework */;
@@ -827,6 +837,7 @@
827837
);
828838
name = "Contentstack tvOS";
829839
packageProductDependencies = (
840+
0FD6F9112620195300636504 /* ContentstackUtils */,
830841
);
831842
productName = "Contentstack tvOS";
832843
productReference = 0F4A7607241BAFE000E3A024 /* Contentstack.framework */;
@@ -865,6 +876,7 @@
865876
);
866877
name = "Contentstack watchOS";
867878
packageProductDependencies = (
879+
0FD6F9132620195800636504 /* ContentstackUtils */,
868880
);
869881
productName = "Contentstack watchOS";
870882
productReference = 0F4A7623241BB0A300E3A024 /* Contentstack.framework */;
@@ -923,6 +935,7 @@
923935
);
924936
mainGroup = OBJ_5;
925937
packageReferences = (
938+
0FD6F8F02620194100636504 /* XCRemoteSwiftPackageReference "contentstack-utils-swift" */,
926939
);
927940
productRefGroup = OBJ_14 /* Products */;
928941
projectDirPath = "";
@@ -1375,7 +1388,11 @@
13751388
INFOPLIST_FILE = "Supporting Files/Info.plist";
13761389
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
13771390
IPHONEOS_DEPLOYMENT_TARGET = 10.1;
1378-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
1391+
LD_RUNPATH_SEARCH_PATHS = (
1392+
"$(inherited)",
1393+
"@executable_path/Frameworks",
1394+
"@loader_path/Frameworks",
1395+
);
13791396
MARKETING_VERSION = 4.0.0;
13801397
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
13811398
MTL_FAST_MATH = YES;
@@ -1447,7 +1464,11 @@
14471464
INFOPLIST_FILE = "Supporting Files/Info.plist";
14481465
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
14491466
IPHONEOS_DEPLOYMENT_TARGET = 10.1;
1450-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
1467+
LD_RUNPATH_SEARCH_PATHS = (
1468+
"$(inherited)",
1469+
"@executable_path/Frameworks",
1470+
"@loader_path/Frameworks",
1471+
);
14511472
MARKETING_VERSION = 4.0.0;
14521473
MTL_ENABLE_DEBUG_INFO = NO;
14531474
MTL_FAST_MATH = YES;
@@ -1517,7 +1538,11 @@
15171538
GCC_WARN_UNUSED_VARIABLE = YES;
15181539
INFOPLIST_FILE = Tests/Info.plist;
15191540
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
1520-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
1541+
LD_RUNPATH_SEARCH_PATHS = (
1542+
"$(inherited)",
1543+
"@executable_path/Frameworks",
1544+
"@loader_path/Frameworks",
1545+
);
15211546
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
15221547
MTL_FAST_MATH = YES;
15231548
PRODUCT_BUNDLE_IDENTIFIER = "com.contentstack.Contentstack-iOSTests";
@@ -1577,7 +1602,11 @@
15771602
GCC_WARN_UNUSED_VARIABLE = YES;
15781603
INFOPLIST_FILE = Tests/Info.plist;
15791604
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
1580-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
1605+
LD_RUNPATH_SEARCH_PATHS = (
1606+
"$(inherited)",
1607+
"@executable_path/Frameworks",
1608+
"@loader_path/Frameworks",
1609+
);
15811610
MTL_ENABLE_DEBUG_INFO = NO;
15821611
MTL_FAST_MATH = YES;
15831612
PRODUCT_BUNDLE_IDENTIFIER = "com.contentstack.Contentstack-iOSTests";
@@ -1647,7 +1676,11 @@
16471676
INFOPLIST_FILE = "Supporting Files/Info.plist";
16481677
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
16491678
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
1650-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
1679+
LD_RUNPATH_SEARCH_PATHS = (
1680+
"$(inherited)",
1681+
"@executable_path/../Frameworks",
1682+
"@loader_path/Frameworks",
1683+
);
16511684
MACOSX_DEPLOYMENT_TARGET = 10.12;
16521685
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
16531686
MTL_FAST_MATH = YES;
@@ -1718,7 +1751,11 @@
17181751
INFOPLIST_FILE = "Supporting Files/Info.plist";
17191752
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
17201753
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
1721-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
1754+
LD_RUNPATH_SEARCH_PATHS = (
1755+
"$(inherited)",
1756+
"@executable_path/../Frameworks",
1757+
"@loader_path/Frameworks",
1758+
);
17221759
MACOSX_DEPLOYMENT_TARGET = 10.12;
17231760
MTL_ENABLE_DEBUG_INFO = NO;
17241761
MTL_FAST_MATH = YES;
@@ -1784,7 +1821,11 @@
17841821
GCC_WARN_UNUSED_FUNCTION = YES;
17851822
GCC_WARN_UNUSED_VARIABLE = YES;
17861823
INFOPLIST_FILE = Tests/Info.plist;
1787-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
1824+
LD_RUNPATH_SEARCH_PATHS = (
1825+
"$(inherited)",
1826+
"@executable_path/../Frameworks",
1827+
"@loader_path/../Frameworks",
1828+
);
17881829
MACOSX_DEPLOYMENT_TARGET = 10.15;
17891830
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
17901831
MTL_FAST_MATH = YES;
@@ -1842,7 +1883,11 @@
18421883
GCC_WARN_UNUSED_FUNCTION = YES;
18431884
GCC_WARN_UNUSED_VARIABLE = YES;
18441885
INFOPLIST_FILE = Tests/Info.plist;
1845-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
1886+
LD_RUNPATH_SEARCH_PATHS = (
1887+
"$(inherited)",
1888+
"@executable_path/../Frameworks",
1889+
"@loader_path/../Frameworks",
1890+
);
18461891
MACOSX_DEPLOYMENT_TARGET = 10.15;
18471892
MTL_ENABLE_DEBUG_INFO = NO;
18481893
MTL_FAST_MATH = YES;
@@ -1908,7 +1953,11 @@
19081953
INFOPLIST_FILE = "Supporting Files/Info.plist";
19091954
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
19101955
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
1911-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
1956+
LD_RUNPATH_SEARCH_PATHS = (
1957+
"$(inherited)",
1958+
"@executable_path/Frameworks",
1959+
"@loader_path/Frameworks",
1960+
);
19121961
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
19131962
MTL_FAST_MATH = YES;
19141963
PRODUCT_BUNDLE_IDENTIFIER = "com.contentstack.Contentstack-tvOS";
@@ -1978,7 +2027,11 @@
19782027
INFOPLIST_FILE = "Supporting Files/Info.plist";
19792028
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
19802029
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
1981-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
2030+
LD_RUNPATH_SEARCH_PATHS = (
2031+
"$(inherited)",
2032+
"@executable_path/Frameworks",
2033+
"@loader_path/Frameworks",
2034+
);
19822035
MTL_ENABLE_DEBUG_INFO = NO;
19832036
MTL_FAST_MATH = YES;
19842037
PRODUCT_BUNDLE_IDENTIFIER = "com.contentstack.Contentstack-tvOS";
@@ -2045,7 +2098,11 @@
20452098
GCC_WARN_UNUSED_FUNCTION = YES;
20462099
GCC_WARN_UNUSED_VARIABLE = YES;
20472100
INFOPLIST_FILE = Tests/Info.plist;
2048-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
2101+
LD_RUNPATH_SEARCH_PATHS = (
2102+
"$(inherited)",
2103+
"@executable_path/Frameworks",
2104+
"@loader_path/Frameworks",
2105+
);
20492106
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
20502107
MTL_FAST_MATH = YES;
20512108
PRODUCT_BUNDLE_IDENTIFIER = "com.contentstack.Contentstack-tvOSTests";
@@ -2104,7 +2161,11 @@
21042161
GCC_WARN_UNUSED_FUNCTION = YES;
21052162
GCC_WARN_UNUSED_VARIABLE = YES;
21062163
INFOPLIST_FILE = Tests/Info.plist;
2107-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
2164+
LD_RUNPATH_SEARCH_PATHS = (
2165+
"$(inherited)",
2166+
"@executable_path/Frameworks",
2167+
"@loader_path/Frameworks",
2168+
);
21082169
MTL_ENABLE_DEBUG_INFO = NO;
21092170
MTL_FAST_MATH = YES;
21102171
PRODUCT_BUNDLE_IDENTIFIER = "com.contentstack.Contentstack-tvOSTests";
@@ -2175,7 +2236,11 @@
21752236
INFOPLIST_FILE = "Supporting Files/Info.plist";
21762237
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
21772238
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
2178-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
2239+
LD_RUNPATH_SEARCH_PATHS = (
2240+
"$(inherited)",
2241+
"@executable_path/Frameworks",
2242+
"@loader_path/Frameworks",
2243+
);
21792244
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
21802245
MTL_FAST_MATH = YES;
21812246
PRODUCT_BUNDLE_IDENTIFIER = "com.contentstack.Contentstack-watchOS";
@@ -2247,7 +2312,11 @@
22472312
INFOPLIST_FILE = "Supporting Files/Info.plist";
22482313
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
22492314
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
2250-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
2315+
LD_RUNPATH_SEARCH_PATHS = (
2316+
"$(inherited)",
2317+
"@executable_path/Frameworks",
2318+
"@loader_path/Frameworks",
2319+
);
22512320
MTL_ENABLE_DEBUG_INFO = NO;
22522321
MTL_FAST_MATH = YES;
22532322
PRODUCT_BUNDLE_IDENTIFIER = "com.contentstack.Contentstack-watchOS";
@@ -2313,7 +2382,8 @@
23132382
SDKROOT = macosx;
23142383
SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator";
23152384
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) SWIFT_PACKAGE";
2316-
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
2385+
SWIFT_COMPILATION_MODE = wholemodule;
2386+
SWIFT_OPTIMIZATION_LEVEL = "-O";
23172387
USE_HEADERMAP = NO;
23182388
};
23192389
name = Release;
@@ -2394,6 +2464,40 @@
23942464
defaultConfigurationName = Debug;
23952465
};
23962466
/* End XCConfigurationList section */
2467+
2468+
/* Begin XCRemoteSwiftPackageReference section */
2469+
0FD6F8F02620194100636504 /* XCRemoteSwiftPackageReference "contentstack-utils-swift" */ = {
2470+
isa = XCRemoteSwiftPackageReference;
2471+
repositoryURL = "https://github.com/contentstack/contentstack-utils-swift.git";
2472+
requirement = {
2473+
kind = upToNextMajorVersion;
2474+
minimumVersion = 1.1.1;
2475+
};
2476+
};
2477+
/* End XCRemoteSwiftPackageReference section */
2478+
2479+
/* Begin XCSwiftPackageProductDependency section */
2480+
0FD6F8F12620194100636504 /* ContentstackUtils */ = {
2481+
isa = XCSwiftPackageProductDependency;
2482+
package = 0FD6F8F02620194100636504 /* XCRemoteSwiftPackageReference "contentstack-utils-swift" */;
2483+
productName = ContentstackUtils;
2484+
};
2485+
0FD6F90F2620194C00636504 /* ContentstackUtils */ = {
2486+
isa = XCSwiftPackageProductDependency;
2487+
package = 0FD6F8F02620194100636504 /* XCRemoteSwiftPackageReference "contentstack-utils-swift" */;
2488+
productName = ContentstackUtils;
2489+
};
2490+
0FD6F9112620195300636504 /* ContentstackUtils */ = {
2491+
isa = XCSwiftPackageProductDependency;
2492+
package = 0FD6F8F02620194100636504 /* XCRemoteSwiftPackageReference "contentstack-utils-swift" */;
2493+
productName = ContentstackUtils;
2494+
};
2495+
0FD6F9132620195800636504 /* ContentstackUtils */ = {
2496+
isa = XCSwiftPackageProductDependency;
2497+
package = 0FD6F8F02620194100636504 /* XCRemoteSwiftPackageReference "contentstack-utils-swift" */;
2498+
productName = ContentstackUtils;
2499+
};
2500+
/* End XCSwiftPackageProductDependency section */
23972501
};
23982502
rootObject = OBJ_1 /* Project object */;
23992503
}

‎Package.swift‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,21 @@ let package = Package(
1818
],
1919
dependencies: [
2020
// Dependencies declare other packages that this package depends on.
21-
.package(url: "https://github.com/contentstack/contentstack-utils-swift.git", from: "1.1.0"),
21+
.package(url: "https://github.com/contentstack/contentstack-utils-swift.git", from: "1.1.1"),
22+
// Dev dependencies
23+
.package(url: "https://github.com/venmo/DVR.git", from: "2.1.0")
2224
],
2325
targets: [
2426
// Targets are the basic building blocks of a package. A target can define a module or a test suite.
2527
// Targets can depend on other targets in this package,
2628
//and on products in packages which this package depends on.
2729
.target(
2830
name: "Contentstack",
29-
dependencies: [],
31+
dependencies: ["ContentstackUtils"],
3032
path: "Sources"),
3133
.testTarget(
3234
name: "ContentstackTests",
33-
dependencies: ["Contentstack"],
35+
dependencies: ["Contentstack", "DVR"],
3436
path: "Tests")
3537
]
3638
)

‎Scripts/run-test-cases.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ xcodebuild \
3737
-workspace Contentstack.xcworkspace \
3838
-scheme "Contentstack iOS" \
3939
test \
40-
-destination "id=18C1CD7D-CD1F-4EBC-A172-41B823B2168B" \
40+
-destination "OS=14.1,name=iPhone 11 Pro" \
4141
-resultBundlePath "$TEST_BUNDLE_PATH/$FILE_NAME-iOS.xcresult" \
4242
| xcpretty \
4343
--color \
@@ -53,7 +53,7 @@ xcodebuild \
5353
-workspace Contentstack.xcworkspace \
5454
-scheme "Contentstack tvOS" \
5555
test \
56-
-destination "OS=13.0,name=Apple TV 4K" \
56+
-destination "OS=14.0,name=Apple TV 4K" \
5757
-resultBundlePath "$TEST_BUNDLE_PATH/$FILE_NAME-tvOS.xcresult" \
5858
| xcpretty \
5959
--color \

0 commit comments

Comments
 (0)