Skip to content

Commit 116e7e6

Browse files
authored
Merge pull request #11 from mredig/master
Swift 5
2 parents 7c33058 + 17ad5cc commit 116e7e6

7 files changed

Lines changed: 205 additions & 54 deletions

File tree

.gitignore

Lines changed: 143 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,75 @@
1+
2+
# Created by https://www.gitignore.io/api/swift,linux,xcode,macos,carthage,cocoapods
3+
# Edit at https://www.gitignore.io/?templates=swift,linux,xcode,macos,carthage,cocoapods
4+
5+
### Carthage ###
6+
# Carthage
7+
#
8+
# Add this line if you want to avoid checking in source code from Carthage dependencies.
9+
# Carthage/Checkouts
10+
11+
Carthage/Build
12+
13+
### CocoaPods ###
14+
## CocoaPods GitIgnore Template
15+
16+
# CocoaPods - Only use to conserve bandwidth / Save time on Pushing
17+
# - Also handy if you have a large number of dependant pods
18+
# - AS PER https://guides.cocoapods.org/using/using-cocoapods.html NEVER IGNORE THE LOCK FILE
19+
Pods/
20+
21+
### Linux ###
22+
*~
23+
24+
# temporary files which can be created if a process still has a handle open of a deleted file
25+
.fuse_hidden*
26+
27+
# KDE directory preferences
28+
.directory
29+
30+
# Linux trash folder which might appear on any partition or disk
31+
.Trash-*
32+
33+
# .nfs files are created when an open file is removed but is still being accessed
34+
.nfs*
35+
36+
### macOS ###
37+
# General
138
.DS_Store
2-
__MACOSX
39+
.AppleDouble
40+
.LSOverride
41+
42+
# Icon must end with two \r
43+
Icon
44+
45+
# Thumbnails
46+
._*
47+
48+
# Files that might appear in the root of a volume
49+
.DocumentRevisions-V100
50+
.fseventsd
51+
.Spotlight-V100
52+
.TemporaryItems
53+
.Trashes
54+
.VolumeIcon.icns
55+
.com.apple.timemachine.donotpresent
56+
57+
# Directories potentially created on remote AFP share
58+
.AppleDB
59+
.AppleDesktop
60+
Network Trash Folder
61+
Temporary Items
62+
.apdisk
63+
64+
### Swift ###
65+
# Xcode
66+
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
67+
68+
## Build generated
69+
build/
70+
DerivedData/
71+
72+
## Various settings
373
*.pbxuser
474
!default.pbxuser
575
*.mode1v3
@@ -8,13 +78,76 @@ __MACOSX
878
!default.mode2v3
979
*.perspectivev3
1080
!default.perspectivev3
11-
*.xcworkspace
12-
!default.xcworkspace
13-
xcuserdata
14-
profile
81+
xcuserdata/
82+
83+
## Other
1584
*.moved-aside
16-
DerivedData
17-
.idea/
18-
Crashlytics.sh
19-
generatechangelog.sh
20-
Pods/
85+
*.xccheckout
86+
*.xcscmblueprint
87+
88+
## Obj-C/Swift specific
89+
*.hmap
90+
*.ipa
91+
*.dSYM.zip
92+
*.dSYM
93+
94+
## Playgrounds
95+
timeline.xctimeline
96+
playground.xcworkspace
97+
98+
# Swift Package Manager
99+
# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
100+
# Packages/
101+
# Package.pins
102+
# Package.resolved
103+
.build/
104+
105+
# CocoaPods
106+
# We recommend against adding the Pods directory to your .gitignore. However
107+
# you should judge for yourself, the pros and cons are mentioned at:
108+
# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
109+
# Pods/
110+
# Add this line if you want to avoid checking in source code from the Xcode workspace
111+
# *.xcworkspace
112+
113+
# Carthage
114+
# Add this line if you want to avoid checking in source code from Carthage dependencies.
115+
# Carthage/Checkouts
116+
117+
118+
# fastlane
119+
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
120+
# screenshots whenever they are needed.
121+
# For more information about the recommended setup visit:
122+
# https://docs.fastlane.tools/best-practices/source-control/#source-control
123+
124+
fastlane/report.xml
125+
fastlane/Preview.html
126+
fastlane/screenshots/**/*.png
127+
fastlane/test_output
128+
129+
# Code Injection
130+
# After new code Injection tools there's a generated folder /iOSInjectionProject
131+
# https://github.com/johnno1962/injectionforxcode
132+
133+
iOSInjectionProject/
134+
135+
### Xcode ###
136+
# Xcode
137+
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
138+
139+
## User settings
140+
141+
## compatibility with Xcode 8 and earlier (ignoring not required starting Xcode 9)
142+
143+
## compatibility with Xcode 3 and earlier (ignoring not required starting Xcode 4)
144+
145+
### Xcode Patch ###
146+
*.xcodeproj/*
147+
!*.xcodeproj/project.pbxproj
148+
!*.xcodeproj/xcshareddata/
149+
!*.xcworkspace/contents.xcworkspacedata
150+
/*.gcno
151+
**/xcshareddata/WorkspaceSettings.xcsettings
152+
153+
# End of https://www.gitignore.io/api/swift,linux,xcode,macos,carthage,cocoapods

PACore/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>FMWK</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>0.4</string>
18+
<string>0.5</string>
1919
<key>CFBundleVersion</key>
2020
<string>$(CURRENT_PROJECT_VERSION)</string>
2121
<key>NSHumanReadableCopyright</key>

0 commit comments

Comments
 (0)