Skip to content

Commit 06277d8

Browse files
mhdostalmhdostal
authored
Merge pull request #207 from Esri/v.next
Merge V.next into Main for release
2 parents bee1832 + 370161e commit 06277d8

File tree

197 files changed

+18066
-22
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

197 files changed

+18066
-22
lines changed

Diff for: ‎.gitignore

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
.DS_Store
2+
/.build
3+
/Packages
4+
xcuserdata/
5+
/*.xcodeproj
6+
DerivedData/
7+
.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata

Diff for: ‎.swiftlint.yml

+86
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
custom_rules:
2+
spatial_reference_web_mercator:
3+
name: Web Mercator Spatial Reference
4+
regex: SpatialReference\(wkid:\s*(3857|102100)\)
5+
message: "Use 'SpatialReference.webMercator' instead."
6+
spatial_reference_wgs84:
7+
name: WGS84 Spatial Reference
8+
regex: SpatialReference\(wkid:\s*(4326)\)
9+
message: "Use 'SpatialReference.wgs84' instead."
10+
simple_closure:
11+
name: Simple Closure
12+
regex: (-> Void in)|(\(\) in)
13+
message: "Void return and empty arguments should be avoided in closures."
14+
closure_opening_space:
15+
name: Closure Opening Space
16+
regex: \{\[|\{\s{2,}\[
17+
message: "Use one space between the brace and bracket."
18+
19+
# Rule identifiers to exclude from running
20+
disabled_rules:
21+
- file_length
22+
- for_where
23+
- force_cast
24+
- line_length
25+
- notification_center_detachment
26+
- type_body_length
27+
- type_name
28+
29+
# Some rules are only opt-in
30+
opt_in_rules:
31+
- anyobject_protocol
32+
- array_init
33+
- attributes
34+
- closure_end_indentation
35+
- closure_spacing
36+
- collection_alignment
37+
- contains_over_first_not_nil
38+
- convenience_type
39+
- discouraged_direct_init
40+
- discouraged_optional_boolean
41+
- empty_count
42+
- empty_string
43+
- empty_xctest_method
44+
- explicit_init
45+
- extension_access_modifier
46+
- fatal_error_message
47+
- first_where
48+
- function_default_parameter_at_end
49+
- identical_operands
50+
- joined_default_parameter
51+
- legacy_random
52+
- let_var_whitespace
53+
- literal_expression_end_indentation
54+
- lower_acl_than_parent
55+
- missing_docs
56+
- modifier_order
57+
- multiline_arguments
58+
- multiline_function_chains
59+
- multiline_parameters
60+
- operator_usage_whitespace
61+
- operator_whitespace
62+
- overridden_super_call
63+
- override_in_extension
64+
- prohibited_super_call
65+
- redundant_nil_coalescing
66+
- redundant_type_annotation
67+
- sorted_first_last
68+
- static_operator
69+
- toggle_bool
70+
- trailing_closure
71+
- untyped_error_in_catch
72+
- vertical_parameter_alignment_on_call
73+
- vertical_whitespace_closing_braces
74+
- vertical_whitespace_opening_braces
75+
- yoda_condition
76+
77+
identifier_name:
78+
min_length:
79+
# Do not flag short identifiers
80+
warning: 0
81+
trailing_closure:
82+
only_single_muted_parameter: true
83+
trailing_whitespace:
84+
ignores_empty_lines: true
85+
multiline_arguments:
86+
only_enforce_after_first_closure_on_first_line: true

Diff for: ‎.swiftpm/xcode/xcshareddata/xcschemes/arcgis-runtime-toolkit-swift.xcscheme

+119
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,119 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1250"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "ArcGISToolkit-Swift"
18+
BuildableName = "ArcGISToolkit-Swift"
19+
BlueprintName = "ArcGISToolkit-Swift"
20+
ReferencedContainer = "container:">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
<BuildActionEntry
24+
buildForTesting = "YES"
25+
buildForRunning = "YES"
26+
buildForProfiling = "NO"
27+
buildForArchiving = "NO"
28+
buildForAnalyzing = "YES">
29+
<BuildableReference
30+
BuildableIdentifier = "primary"
31+
BlueprintIdentifier = "ArcGISToolkit-SwiftTests"
32+
BuildableName = "ArcGISToolkit-SwiftTests"
33+
BlueprintName = "ArcGISToolkit-SwiftTests"
34+
ReferencedContainer = "container:">
35+
</BuildableReference>
36+
</BuildActionEntry>
37+
<BuildActionEntry
38+
buildForTesting = "YES"
39+
buildForRunning = "YES"
40+
buildForProfiling = "YES"
41+
buildForArchiving = "YES"
42+
buildForAnalyzing = "YES">
43+
<BuildableReference
44+
BuildableIdentifier = "primary"
45+
BlueprintIdentifier = "ArcGISToolkitSwift"
46+
BuildableName = "ArcGISToolkitSwift"
47+
BlueprintName = "ArcGISToolkitSwift"
48+
ReferencedContainer = "container:">
49+
</BuildableReference>
50+
</BuildActionEntry>
51+
<BuildActionEntry
52+
buildForTesting = "YES"
53+
buildForRunning = "YES"
54+
buildForProfiling = "YES"
55+
buildForArchiving = "YES"
56+
buildForAnalyzing = "YES">
57+
<BuildableReference
58+
BuildableIdentifier = "primary"
59+
BlueprintIdentifier = "ArcGISToolkit"
60+
BuildableName = "ArcGISToolkit"
61+
BlueprintName = "ArcGISToolkit"
62+
ReferencedContainer = "container:">
63+
</BuildableReference>
64+
</BuildActionEntry>
65+
</BuildActionEntries>
66+
</BuildAction>
67+
<TestAction
68+
buildConfiguration = "Debug"
69+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
70+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
71+
shouldUseLaunchSchemeArgsEnv = "YES">
72+
<Testables>
73+
<TestableReference
74+
skipped = "NO">
75+
<BuildableReference
76+
BuildableIdentifier = "primary"
77+
BlueprintIdentifier = "ArcGISToolkitTests"
78+
BuildableName = "ArcGISToolkitTests"
79+
BlueprintName = "ArcGISToolkitTests"
80+
ReferencedContainer = "container:">
81+
</BuildableReference>
82+
</TestableReference>
83+
</Testables>
84+
</TestAction>
85+
<LaunchAction
86+
buildConfiguration = "Debug"
87+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
88+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
89+
launchStyle = "0"
90+
useCustomWorkingDirectory = "NO"
91+
ignoresPersistentStateOnLaunch = "NO"
92+
debugDocumentVersioning = "YES"
93+
debugServiceExtension = "internal"
94+
allowLocationSimulation = "YES">
95+
</LaunchAction>
96+
<ProfileAction
97+
buildConfiguration = "Release"
98+
shouldUseLaunchSchemeArgsEnv = "YES"
99+
savedToolIdentifier = ""
100+
useCustomWorkingDirectory = "NO"
101+
debugDocumentVersioning = "YES">
102+
<MacroExpansion>
103+
<BuildableReference
104+
BuildableIdentifier = "primary"
105+
BlueprintIdentifier = "ArcGISToolkit-Swift"
106+
BuildableName = "ArcGISToolkit-Swift"
107+
BlueprintName = "ArcGISToolkit-Swift"
108+
ReferencedContainer = "container:">
109+
</BuildableReference>
110+
</MacroExpansion>
111+
</ProfileAction>
112+
<AnalyzeAction
113+
buildConfiguration = "Debug">
114+
</AnalyzeAction>
115+
<ArchiveAction
116+
buildConfiguration = "Release"
117+
revealArchiveInOrganizer = "YES">
118+
</ArchiveAction>
119+
</Scheme>

0 commit comments

Comments
 (0)