Skip to content

Commit ebcc8db

Browse files
bdrellingbdrelling
authored
IOS-1346: Xcode 11 support and SPM file reorganization (#18)
1 parent 2e032b7 commit ebcc8db

File tree

56 files changed

+1982
-992
lines changed

Some content is hidden

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

56 files changed

+1982
-992
lines changed

‎.github/CODEOWNERS‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# Lines starting with '#' are comments.
2+
# Each line is a file pattern followed by one or more owners.
3+
# Source: https://blog.github.com/2017-07-06-introducing-code-owners/
4+
# Source: https://help.github.com/articles/about-codeowners/
5+
6+
# These owners will be the default owners for everything in the repo.
7+
* @spothero/ios

‎.github/pull_request_template.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
**Issue Link**
2+
<!-- Link to the Jira ticket or GitHub issue -->
3+
4+
**Description**
5+
<!-- Describe what items this PR changes. -->

‎.gitignore‎

Lines changed: 74 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
11
# Xcode
2+
#
3+
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
4+
5+
## Exclude OS X folder attributes
26
.DS_Store
3-
*/build/*
7+
8+
## Build generated
9+
build/
10+
DerivedData/
11+
12+
## Various settings
413
*.pbxuser
514
!default.pbxuser
615
*.mode1v3
@@ -9,13 +18,70 @@
918
!default.mode2v3
1019
*.perspectivev3
1120
!default.perspectivev3
12-
xcuserdata
13-
profile
21+
xcuserdata/
22+
23+
## Other
1424
*.moved-aside
15-
DerivedData
16-
.idea/
17-
*.hmap
1825
*.xccheckout
26+
*.xcscmblueprint
27+
28+
## Obj-C/Swift specific
29+
*.hmap
30+
*.ipa
31+
*.dSYM.zip
32+
*.dSYM
33+
34+
## Playgrounds
35+
timeline.xctimeline
36+
playground.xcworkspace
37+
38+
# Swift Package Manager
39+
#
40+
# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
41+
# Packages/
42+
# Package.pins
43+
.build/
44+
45+
# .swiftpm/ is generated when editing a Swift package in Xcode 11
46+
.swiftpm/
47+
48+
# For SPM-only projects, .xcworkspace or .xcodeproj files should never be created or generated, except for use with versions earlier than Xcode 11
49+
# *.xcworkspace
50+
# *.xcodeproj
51+
52+
# CocoaPods
53+
#
54+
# We recommend against adding the Pods directory to your .gitignore. However
55+
# you should judge for yourself, the pros and cons are mentioned at:
56+
# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
57+
#
58+
# Pods/
59+
60+
# Carthage
61+
#
62+
# Add this line if you want to avoid checking in source code from Carthage dependencies.
63+
# Carthage/Checkouts
64+
Carthage/Build
65+
66+
# jazzy
67+
undocumented.json
68+
*.tgz
69+
70+
# fastlane
71+
#
72+
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
73+
# screenshots whenever they are needed.
74+
# For more information about the recommended setup visit:
75+
# https://docs.fastlane.tools/best-practices/source-control/#source-control
76+
77+
fastlane/test_output
78+
fastlane/[Pp]rovisioning
79+
fastlane/report.xml
80+
fastlane/[Bb]uild
81+
fastlane/DerivedData
82+
fastlane/screenshots
83+
fastlane/[Pp]review.html
1984

20-
#CocoaPods
21-
Pods
85+
# dotenv
86+
# A .env.local file contains keys that should never be checked into the repository
87+
.env.local

‎Config/SpotHeroEmailValidator-Info.plist‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>CFBundleDevelopmentRegion</key>
6+
<string>$(DEVELOPMENT_LANGUAGE)</string>
7+
<key>CFBundleExecutable</key>
8+
<string>$(EXECUTABLE_NAME)</string>
9+
<key>CFBundleIdentifier</key>
10+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
11+
<key>CFBundleInfoDictionaryVersion</key>
12+
<string>6.0</string>
13+
<key>CFBundleName</key>
14+
<string>$(PRODUCT_NAME)</string>
15+
<key>CFBundlePackageType</key>
16+
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
17+
<key>CFBundleShortVersionString</key>
18+
<string>1.0</string>
19+
<key>CFBundleVersion</key>
20+
<string>$(CURRENT_PROJECT_VERSION)</string>
21+
</dict>
22+
</plist>

‎Demo+Tests/SHEmailValidatorTests/EmailValidatorDemoTests-Info.plist‎ renamed to ‎Config/SpotHeroEmailValidatorTests-Info.plist‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,19 @@
33
<plist version="1.0">
44
<dict>
55
<key>CFBundleDevelopmentRegion</key>
6-
<string>en</string>
6+
<string>$(DEVELOPMENT_LANGUAGE)</string>
77
<key>CFBundleExecutable</key>
8-
<string>${EXECUTABLE_NAME}</string>
8+
<string>$(EXECUTABLE_NAME)</string>
99
<key>CFBundleIdentifier</key>
1010
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
1111
<key>CFBundleInfoDictionaryVersion</key>
1212
<string>6.0</string>
13+
<key>CFBundleName</key>
14+
<string>$(PRODUCT_NAME)</string>
1315
<key>CFBundlePackageType</key>
14-
<string>BNDL</string>
16+
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
1517
<key>CFBundleShortVersionString</key>
1618
<string>1.0</string>
17-
<key>CFBundleSignature</key>
18-
<string>????</string>
1919
<key>CFBundleVersion</key>
2020
<string>1</string>
2121
</dict>

‎Demo+Tests/EmailValidatorDemo.xcodeproj/project.pbxproj‎

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

‎Demo+Tests/EmailValidatorDemo.xcodeproj/project.xcworkspace/contents.xcworkspacedata‎

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

‎Demo+Tests/EmailValidatorDemo/AppDelegate.m‎

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

‎Demo+Tests/EmailValidatorDemo/EmailValidatorDemo-Prefix.pch‎

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

‎Demo+Tests/EmailValidatorDemo/Images.xcassets/AppIcon.appiconset/Contents.json‎

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

0 commit comments

Comments
 (0)