Skip to content

Commit f0e8544

Browse files
authored
Merge pull request #38 from contentstack/feat/DX-201
feat: added support for taxonomy
2 parents a3fee41 + bc349c4 commit f0e8544

34 files changed

+932
-398
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: "Contentstack CI"
22

33
on:
44
push:
5-
branches: [ master, development ]
5+
branches: [ master, next ]
66
pull_request:
7-
branches: [ master ]
7+
branches: [ master, next ]
88

99
jobs:
1010
macOS:

.github/workflows/sca-scan.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ jobs:
1111
- name: Run Snyk to check for vulnerabilities
1212
run: snyk test --all-projects --fail-on=all
1313
env:
14-
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
14+
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,4 +73,7 @@ fastlane/screenshots/**/*.png
7373
fastlane/test_output
7474

7575
TestCase
76-
docs
76+
docs
77+
78+
fastlane/
79+
Gemfile
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>IDEWorkspaceSharedSettings_AutocreateContextsIfNeeded</key>
6+
<true/>
7+
</dict>
8+
</plist>
Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1500"
4+
version = "2.2">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "NO"
13+
buildForArchiving = "NO"
14+
buildForAnalyzing = "YES">
15+
<AutocreatedTestPlanReference>
16+
</AutocreatedTestPlanReference>
17+
</BuildActionEntry>
18+
</BuildActionEntries>
19+
</BuildAction>
20+
<TestAction
21+
buildConfiguration = "Debug"
22+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
23+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
24+
shouldUseLaunchSchemeArgsEnv = "YES"
25+
shouldAutocreateTestPlan = "YES">
26+
<Testables>
27+
<TestableReference
28+
skipped = "NO">
29+
<BuildableReference
30+
BuildableIdentifier = "primary"
31+
BlueprintIdentifier = "ContentstackTests"
32+
BuildableName = "ContentstackTests"
33+
BlueprintName = "ContentstackTests"
34+
ReferencedContainer = "container:">
35+
</BuildableReference>
36+
</TestableReference>
37+
</Testables>
38+
</TestAction>
39+
<LaunchAction
40+
buildConfiguration = "Debug"
41+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
42+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
43+
launchStyle = "0"
44+
useCustomWorkingDirectory = "NO"
45+
ignoresPersistentStateOnLaunch = "NO"
46+
debugDocumentVersioning = "YES"
47+
debugServiceExtension = "internal"
48+
allowLocationSimulation = "YES">
49+
</LaunchAction>
50+
<ProfileAction
51+
buildConfiguration = "Release"
52+
shouldUseLaunchSchemeArgsEnv = "YES"
53+
savedToolIdentifier = ""
54+
useCustomWorkingDirectory = "NO"
55+
debugDocumentVersioning = "YES">
56+
<MacroExpansion>
57+
<BuildableReference
58+
BuildableIdentifier = "primary"
59+
BlueprintIdentifier = "ContentstackTests"
60+
BuildableName = "ContentstackTests"
61+
BlueprintName = "ContentstackTests"
62+
ReferencedContainer = "container:">
63+
</BuildableReference>
64+
</MacroExpansion>
65+
</ProfileAction>
66+
<AnalyzeAction
67+
buildConfiguration = "Debug">
68+
</AnalyzeAction>
69+
<ArchiveAction
70+
buildConfiguration = "Release"
71+
revealArchiveInOrganizer = "YES">
72+
</ArchiveAction>
73+
</Scheme>

.talismanrc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,11 @@ fileignoreconfig:
1717
checksum: a1c17f932d0b00df127851f50456923546ee912ba9b4d60d1f244768d61b858d
1818
- filename: Tests/DVRRecordings/SyncTest.json
1919
checksum: e5148d9f58da7689f249969c25a0c36d6d9f26be062a2c6bd9aaf389118f0039
20+
- filename: Contentstack.xcodeproj/xcshareddata/xcschemes/Contentstack iOS.xcscheme
21+
checksum: 10ca4b0b986ae6166f69d7f985ca5b06238ac70dac3dd378fbf3dbdfd966afff
22+
- filename: Contentstack.xcodeproj/xcshareddata/xcschemes/Contentstack iOS Tests.xcscheme
23+
checksum: c439f6d268ae2ea0af023daeffdff2af5928d0610f90fa14c9e6e6ce7e4b3fad
24+
version: ""
2025

2126

2227

Contentstack.xcodeproj/project.pbxproj

Lines changed: 173 additions & 118 deletions
Large diffs are not rendered by default.
Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1520"
4+
version = "1.7">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
</BuildAction>
9+
<TestAction
10+
buildConfiguration = "Debug"
11+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
12+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
13+
shouldUseLaunchSchemeArgsEnv = "YES"
14+
shouldAutocreateTestPlan = "YES">
15+
<Testables>
16+
<TestableReference
17+
skipped = "NO">
18+
<BuildableReference
19+
BuildableIdentifier = "primary"
20+
BlueprintIdentifier = "0F4A75D2241BAC4300E3A024"
21+
BuildableName = "Contentstack iOS Tests.xctest"
22+
BlueprintName = "Contentstack iOS Tests"
23+
ReferencedContainer = "container:Contentstack.xcodeproj">
24+
</BuildableReference>
25+
</TestableReference>
26+
</Testables>
27+
</TestAction>
28+
<LaunchAction
29+
buildConfiguration = "Debug"
30+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
31+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
32+
launchStyle = "0"
33+
useCustomWorkingDirectory = "NO"
34+
ignoresPersistentStateOnLaunch = "NO"
35+
debugDocumentVersioning = "YES"
36+
debugServiceExtension = "internal"
37+
allowLocationSimulation = "YES"
38+
consoleMode = "0"
39+
structuredConsoleMode = "1">
40+
<LocationScenarioReference
41+
identifier = "com.apple.dt.IDEFoundation.CurrentLocationScenarioIdentifier"
42+
referenceType = "1">
43+
</LocationScenarioReference>
44+
</LaunchAction>
45+
<ProfileAction
46+
buildConfiguration = "Release"
47+
shouldUseLaunchSchemeArgsEnv = "YES"
48+
savedToolIdentifier = ""
49+
useCustomWorkingDirectory = "NO"
50+
debugDocumentVersioning = "YES">
51+
</ProfileAction>
52+
<AnalyzeAction
53+
buildConfiguration = "Debug">
54+
</AnalyzeAction>
55+
<ArchiveAction
56+
buildConfiguration = "Release"
57+
revealArchiveInOrganizer = "YES">
58+
</ArchiveAction>
59+
</Scheme>

Contentstack.xcworkspace/xcshareddata/xcschemes/Contentstack iOS.xcscheme

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
</BuildAction>
2525
<TestAction
2626
buildConfiguration = "Debug"
27-
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28-
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
27+
selectedDebuggerIdentifier = ""
28+
selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
2929
shouldUseLaunchSchemeArgsEnv = "YES"
3030
codeCoverageEnabled = "YES">
3131
<Testables>

Package.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ import PackageDescription
77

88
let package = Package(
99
name: "ContentstackSwift",
10-
platforms: [.macOS(.v10_13),
11-
.iOS(.v11),
12-
.tvOS(.v11),
13-
.watchOS(.v4)],
10+
platforms: [.macOS(.v10_15),
11+
.iOS(.v13),
12+
.tvOS(.v13),
13+
.watchOS(.v6)],
1414

1515
products: [
1616
// Products define the executables and libraries produced by a package, and make them visible to other packages.

0 commit comments

Comments
 (0)