Skip to content
This repository has been archived by the owner on Jul 30, 2019. It is now read-only.

Feature/v3 #86

Merged
merged 42 commits into from
Jul 12, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
719c525
Update project to recommended settings
dominik-hadl Sep 11, 2018
ac41323
Update to Swift 4.2
dominik-hadl Sep 11, 2018
5398fdd
Change models to Codable
dominik-hadl Sep 24, 2018
6f80fa0
Update ConnectionManager for response codable
dominik-hadl Sep 25, 2018
d2c3e64
Support dictionaries in models
dominik-hadl Sep 25, 2018
f698a3d
WIP migrating away from Alamofre, Cashier, Serpent
dominik-hadl Sep 25, 2018
884c158
WIP fix translations
dominik-hadl Oct 12, 2018
a77545e
Update gitignore
dominik-hadl Oct 12, 2018
791020c
Implement Quick and Nimble for testing
dominik-hadl Oct 12, 2018
b52e694
Upgade to Swift5
Mar 27, 2019
bce2a74
Merge pull request #83 from nodes-ios/feature/v3Swift5
NickSkull Jun 27, 2019
3e67c46
Update pods
dominik-hadl Jun 27, 2019
e779ef5
Modified gitignore to not ignore xcode project
dominik-hadl Jun 27, 2019
3ead699
added swiftlint, added Translation manager
andrewlloyd100 Jun 28, 2019
e935a95
start of translationmanager implementation
andrewlloyd100 Jun 28, 2019
d1c9f44
Merge branch 'feature/v3' of github.com:nodes-ios/NStackSDK into feat…
andrewlloyd100 Jun 28, 2019
b44e930
merge
andrewlloyd100 Jun 28, 2019
accce83
Create .swiftlint.yml
andrewlloyd100 Jun 28, 2019
277d440
split up of nstack into separate managers, app open data updated for …
andrewlloyd100 Jun 28, 2019
6d0349d
Merge branch 'feature/v3' of github.com:nodes-ios/NStackSDK into feat…
andrewlloyd100 Jun 28, 2019
494d80c
swiftlint fix
andrewlloyd100 Jun 28, 2019
b0f8b73
swift lint, some warnings and all errors fixed
andrewlloyd100 Jun 28, 2019
c1a2dc9
Update .swiftlint.yml
andrewlloyd100 Jun 28, 2019
c4d290f
swift lint fixes
andrewlloyd100 Jun 28, 2019
cbd8aee
Merge branch 'feature/v3' of github.com:nodes-ios/NStackSDK into feat…
andrewlloyd100 Jun 28, 2019
c8468c2
swift lint warning removal
andrewlloyd100 Jun 28, 2019
3beadd4
start on some sort of tests for new Nstack, refactor ConnectionManage…
andrewlloyd100 Jul 4, 2019
4638fcb
added mock for getting translations with tests, fixed to send correct…
andrewlloyd100 Jul 4, 2019
3b16faf
fix to framework search paths
andrewlloyd100 Jul 4, 2019
66554ad
try putting carthage in root
andrewlloyd100 Jul 4, 2019
bc3bfbd
Fixing app open connectionmanager details
Jul 11, 2019
3fc1eec
Updating models to match API responses
Jul 11, 2019
be8c851
Moving alert manager to main thread
Jul 11, 2019
da19ad2
Fixing swiftlint warnings
Jul 12, 2019
f9127e1
More swiftlint fixes
Jul 12, 2019
bf271e1
Using TranslationManager model instead of duplicate in NStackSDK
Jul 12, 2019
ab47fae
Added configuration options for nmeta
Jul 12, 2019
1c75908
Current environment now required, fatalError if missing
Jul 12, 2019
ee0a6af
Change environments fatalError to assertionFailure
Jul 12, 2019
0d953e4
Update podfile.lock version
Jul 12, 2019
d4ff97d
Merge branch 'develop' into feature/v3
Jul 12, 2019
4823f8b
Fixing project file
Jul 12, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added .DS_Store
Binary file not shown.
136 changes: 126 additions & 10 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,10 +1,71 @@
# Created by https://www.gitignore.io/api/git,swift,xcode,macos,swiftpm,carthage,cocoapods,objective-c

### Carthage ###
# Carthage
#
# Add this line if you want to avoid checking in source code from Carthage dependencies.
Carthage/Checkouts
Carthage/Build

### CocoaPods ###
## CocoaPods GitIgnore Template

# CocoaPods - Only use to conserve bandwidth / Save time on Pushing
# - Also handy if you have a large number of dependant pods
# - AS PER https://guides.cocoapods.org/using/using-cocoapods.html NEVER IGNORE THE LOCK FILE
Pods/

### Git ###
# Created by git for backups. To disable backups in Git:
# $ git config --global mergetool.keepBackup false
*.orig

# Created by git when using merge tools for conflicts
*.BACKUP.*
*.BASE.*
*.LOCAL.*
*.REMOTE.*
*_BACKUP_*.txt
*_BASE_*.txt
*_LOCAL_*.txt
*_REMOTE_*.txt

### macOS ###
# General
.DS_Store
.AppleDouble
.LSOverride

# Icon must end with two \r
Icon

# Thumbnails
._*

# Files that might appear in the root of a volume
.DocumentRevisions-V100
.fseventsd
.Spotlight-V100
.TemporaryItems
.Trashes
.VolumeIcon.icns
.com.apple.timemachine.donotpresent

# Directories potentially created on remote AFP share
.AppleDB
.AppleDesktop
Network Trash Folder
Temporary Items
.apdisk

### Objective-C ###
# Xcode
#
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore

## Build generated
build/
DerivedData
DerivedData/

## Various settings
*.pbxuser
Expand All @@ -15,20 +76,71 @@ DerivedData
!default.mode2v3
*.perspectivev3
!default.perspectivev3
xcuserdata
.DS_Store
xcuserdata/

.DS_Store

## Other
*.xccheckout
*.moved-aside
*.xcuserstate
*.xccheckout
*.xcscmblueprint

## Obj-C/Swift specific
*.hmap
*.ipa
*.dSYM.zip
*.dSYM

# CocoaPods
#
# We recommend against adding the Pods directory to your .gitignore. However
# you should judge for yourself, the pros and cons are mentioned at:
# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
#
# Pods/
#
# Add this line if you want to avoid checking in source code from the Xcode workspace
# *.xcworkspace

# Carthage
#
# Add this line if you want to avoid checking in source code from Carthage dependencies.
# Carthage/Checkouts


# fastlane
#
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
# screenshots whenever they are needed.
# For more information about the recommended setup visit:
# https://docs.fastlane.tools/best-practices/source-control/#source-control

fastlane/report.xml
fastlane/Preview.html
fastlane/screenshots/**/*.png
fastlane/test_output

# Code Injection
#
# After new code Injection tools there's a generated folder /iOSInjectionProject
# https://github.com/johnno1962/injectionforxcode

iOSInjectionProject/

### Objective-C Patch ###

### Swift ###
# Xcode
#
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore

## Build generated

## Various settings

## Other

## Obj-C/Swift specific

## Playgrounds
timeline.xctimeline
Expand All @@ -38,6 +150,8 @@ playground.xcworkspace
#
# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
# Packages/
# Package.pins
# Package.resolved
.build/

# CocoaPods
Expand All @@ -47,20 +161,22 @@ playground.xcworkspace
# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
#
# Pods/
#
# Add this line if you want to avoid checking in source code from the Xcode workspace
# *.xcworkspace

# Carthage
#
# Add this line if you want to avoid checking in source code from Carthage dependencies.
# Carthage/Checkouts
Carthage/
#Carthage/Build


# fastlane
#
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
# screenshots whenever they are needed.
# For more information about the recommended setup visit:
# https://github.com/fastlane/fastlane/blob/master/docs/Gitignore.md
# https://docs.fastlane.tools/best-practices/source-control/#source-control

fastlane/report.xml
fastlane/screenshots

# End of https://www.gitignore.io/api/git,swift,xcode,macos,swiftpm,carthage,cocoapods,objective-c
74 changes: 74 additions & 0 deletions .swiftlint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
opt_in_rules: # some rules are only opt-in
- control_statement
- empty_count
- colon
- comma
- todo
- fatal_error_message

disabled_rules:
- force_cast

excluded: # paths to ignore during linting. Takes precedence over `included`.
- Pods/
- Carthage/

file_length:
warning: 400
error: 600

line_length:
warning: 150
error: 250

type_body_length:
- 300 # warning
- 400 # error

large_tuple: # warn user when using 3 values in tuple, give error if there are 4
- 3
- 4

type_name:
min_length: 3 # only warning
max_length: # warning and error
warning: 40
error: 45

identifier_name:
min_length: # only min_length
error: 2 # only error
excluded: # excluded via string array
- id
- key
- URL
- url
- ids
- put
- get
- sdk
- now
- csv
- int
- vc
- to
- tab
- nib
- tr
- ok
- lat
- lng
- up
- no
- me
- h1
- h2
- h3
- h4
- h5
- h6
- h7

function_parameter_count:
warning: 8
error: 15
5 changes: 1 addition & 4 deletions Cartfile
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
github "Alamofire/Alamofire" ~> 4.0
github "nodes-ios/Serpent" ~> 2.0
github "nodes-ios/Cashier" ~> 2.0

github "nodes-ios/TranslationManager" "feature/v2_update"
4 changes: 1 addition & 3 deletions Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
github "Alamofire/Alamofire" "4.8.1"
github "nodes-ios/Cashier" "1.3"
github "nodes-ios/Serpent" "1.2.0"
github "nodes-ios/TranslationManager" "80ef3cf2e46d874c691797a25c7c809adfa68900"
10 changes: 10 additions & 0 deletions NStackSDK.xcworkspace/contents.xcworkspacedata

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions NStackSDK.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
Loading