Skip to content
This repository was archived by the owner on Jan 27, 2020. It is now read-only.

Commit fdcb760

Browse files
authored
Merge pull request #18 from e-Sixt/feature/modernization
Add support for Carthage and SPM
2 parents 09bcb9d + 4baa6ac commit fdcb760

File tree

63 files changed

+610
-2206
lines changed

Some content is hidden

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

63 files changed

+610
-2206
lines changed

.circleci/config.yml

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

.gitignore

Lines changed: 94 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,45 @@
1-
# OS X
1+
2+
# Created by https://www.gitignore.io/api/swift,macos,swiftpm
3+
# Edit at https://www.gitignore.io/?templates=swift,macos,swiftpm
4+
5+
### macOS ###
6+
# General
27
.DS_Store
8+
.AppleDouble
9+
.LSOverride
10+
11+
# Icon must end with two \r
12+
Icon
13+
14+
# Thumbnails
15+
._*
316

17+
# Files that might appear in the root of a volume
18+
.DocumentRevisions-V100
19+
.fseventsd
20+
.Spotlight-V100
21+
.TemporaryItems
22+
.Trashes
23+
.VolumeIcon.icns
24+
.com.apple.timemachine.donotpresent
25+
26+
# Directories potentially created on remote AFP share
27+
.AppleDB
28+
.AppleDesktop
29+
Network Trash Folder
30+
Temporary Items
31+
.apdisk
32+
33+
### Swift ###
434
# Xcode
35+
#
36+
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
37+
38+
## Build generated
539
build/
40+
DerivedData/
41+
42+
## Various settings
643
*.pbxuser
744
!default.pbxuser
845
*.mode1v3
@@ -12,22 +49,67 @@ build/
1249
*.perspectivev3
1350
!default.perspectivev3
1451
xcuserdata/
15-
*.xccheckout
16-
profile
52+
53+
## Other
1754
*.moved-aside
18-
DerivedData
55+
*.xccheckout
56+
*.xcscmblueprint
57+
58+
## Obj-C/Swift specific
1959
*.hmap
2060
*.ipa
61+
*.dSYM.zip
62+
*.dSYM
2163

22-
# Bundler
23-
.bundle
64+
## Playgrounds
65+
timeline.xctimeline
66+
playground.xcworkspace
2467

25-
Carthage
68+
# Swift Package Manager
69+
# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
70+
# Packages/
71+
# Package.pins
72+
# Package.resolved
73+
.build/
74+
75+
# CocoaPods
2676
# We recommend against adding the Pods directory to your .gitignore. However
2777
# you should judge for yourself, the pros and cons are mentioned at:
28-
# http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control
29-
#
30-
# Note: if you ignore the Pods directory, make sure to uncomment
31-
# `pod install` in .travis.yml
32-
#
78+
# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
3379
# Pods/
80+
# Add this line if you want to avoid checking in source code from the Xcode workspace
81+
# *.xcworkspace
82+
83+
# Carthage
84+
# Add this line if you want to avoid checking in source code from Carthage dependencies.
85+
# Carthage/Checkouts
86+
87+
Carthage/Build
88+
89+
# Accio dependency management
90+
Dependencies/
91+
.accio/
92+
93+
# fastlane
94+
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
95+
# screenshots whenever they are needed.
96+
# For more information about the recommended setup visit:
97+
# https://docs.fastlane.tools/best-practices/source-control/#source-control
98+
99+
fastlane/report.xml
100+
fastlane/Preview.html
101+
fastlane/screenshots/**/*.png
102+
fastlane/test_output
103+
104+
# Code Injection
105+
# After new code Injection tools there's a generated folder /iOSInjectionProject
106+
# https://github.com/johnno1962/injectionforxcode
107+
108+
iOSInjectionProject/
109+
110+
### SwiftPM ###
111+
Packages
112+
xcuserdata
113+
114+
115+
# End of https://www.gitignore.io/api/swift,macos,swiftpm

.hound.yml

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

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ruby-2.6.3
1+
ruby-2.6.4

.swift-version

Lines changed: 0 additions & 1 deletion
This file was deleted.

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

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Example/Podfile

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

Example/Podfile.lock

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

Example/Pods/Local Podspecs/Swen.podspec.json

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

Example/Pods/Manifest.lock

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

0 commit comments

Comments
 (0)