Skip to content

Commit 72466b1

Browse files
authored
Merge pull request #51 from nstack-io/develop
Develop -> Master for 4.1.0
2 parents 6b0e373 + da58213 commit 72466b1

File tree

229 files changed

+842
-15294
lines changed

Some content is hidden

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

229 files changed

+842
-15294
lines changed

.circleci/config.yml

Lines changed: 0 additions & 40 deletions
This file was deleted.

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Created by https://www.gitignore.io/api/git,swift,xcode,macos,swiftpm,carthage,cocoapods,objective-c
22

33
### Carthage ###
4-
# Carthage
4+
Carthage
55
#
66
# Add this line if you want to avoid checking in source code from Carthage dependencies.
77
Carthage/Checkouts

.swiftlint.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ file_length:
1818
error: 600
1919

2020
line_length:
21-
warning: 150
21+
warning: 180
2222
error: 250
2323

2424
type_body_length:
@@ -29,6 +29,10 @@ large_tuple: # warn user when using 3 values in tuple, give error if there are 4
2929
- 3
3030
- 4
3131

32+
nesting:
33+
type_level: 3
34+
statement_level: 7
35+
3236
type_name:
3337
min_length: 3 # only warning
3438
max_length: # warning and error

Carthage/Cachefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
--Swift version: Apple Swift version 5.1.3 (swiftlang-1100.0.282.1 clang-1100.0.33.15)
2+
Target: x86_64-apple-darwin19.3.0 --Swift version
3+
--Cartfile.resolved: github "nodes-ios/TranslationManager" "2.1.1"
4+
--Cartfile.resolved

NStackSDK/NStackSDK.xcodeproj/project.pbxproj renamed to NStackSDK.xcodeproj/project.pbxproj

Lines changed: 59 additions & 203 deletions
Large diffs are not rendered by default.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)