Skip to content
This repository was archived by the owner on Feb 15, 2022. It is now read-only.

Commit c3bbb00

Browse files
mbbischoffmbbischoff
authored
Merge pull request #203 from Lickability/develop
Merges `develop` into `master`
2 parents 76f06b7 + 19b6f1a commit c3bbb00

File tree

91 files changed

+3049
-2390
lines changed

Some content is hidden

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

91 files changed

+3049
-2390
lines changed

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
Closes #
2+
3+
## What It Does
4+
5+
## How to Test
6+
7+
## Notes

‎Assets/screenshots.png‎

682 KB
Loading

‎Example/Gemfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
source 'https://rubygems.org'
22

3-
gem 'cocoapods', '1.0.0'
3+
gem 'cocoapods', '1.0.1'

‎Example/Gemfile.lock‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ GEM
88
thread_safe (~> 0.3, >= 0.3.4)
99
tzinfo (~> 1.1)
1010
claide (1.0.0)
11-
cocoapods (1.0.0)
11+
cocoapods (1.0.1)
1212
activesupport (>= 4.0.2)
1313
claide (>= 1.0.0, < 2.0)
14-
cocoapods-core (= 1.0.0)
14+
cocoapods-core (= 1.0.1)
1515
cocoapods-deintegrate (>= 1.0.0, < 2.0)
1616
cocoapods-downloader (>= 1.0.0, < 2.0)
1717
cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -24,8 +24,8 @@ GEM
2424
fourflusher (~> 0.3.0)
2525
molinillo (~> 0.4.5)
2626
nap (~> 1.0)
27-
xcodeproj (>= 1.0.0, < 2.0)
28-
cocoapods-core (1.0.0)
27+
xcodeproj (>= 1.1.0, < 2.0)
28+
cocoapods-core (1.0.1)
2929
activesupport (>= 4.0.2)
3030
fuzzy_match (~> 2.0.4)
3131
nap (~> 1.0)
@@ -41,18 +41,18 @@ GEM
4141
cocoapods-try (1.0.0)
4242
colored (1.2)
4343
escape (0.0.4)
44-
fourflusher (0.3.0)
44+
fourflusher (0.3.1)
4545
fuzzy_match (2.0.4)
4646
i18n (0.7.0)
4747
json (1.8.3)
48-
minitest (5.8.4)
48+
minitest (5.9.0)
4949
molinillo (0.4.5)
5050
nap (1.1.0)
5151
netrc (0.7.8)
5252
thread_safe (0.3.5)
5353
tzinfo (1.2.2)
5454
thread_safe (~> 0.1)
55-
xcodeproj (1.0.0)
55+
xcodeproj (1.1.0)
5656
activesupport (>= 3)
5757
claide (>= 1.0.0, < 2.0)
5858
colored (~> 1.2)
@@ -61,7 +61,7 @@ PLATFORMS
6161
ruby
6262

6363
DEPENDENCIES
64-
cocoapods (= 1.0.0)
64+
cocoapods (= 1.0.1)
6565

6666
BUNDLED WITH
67-
1.11.2
67+
1.12.5

‎Example/PinpointKitExample.xcodeproj/project.pbxproj‎

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -97,12 +97,12 @@
9797
isa = PBXNativeTarget;
9898
buildConfigurationList = DA19C3F61C67D4420016861F /* Build configuration list for PBXNativeTarget "PinpointKitExample" */;
9999
buildPhases = (
100-
072623A5468F27A0975A871A /* 📦 Check Pods Manifest.lock */,
100+
072623A5468F27A0975A871A /* [CP] Check Pods Manifest.lock */,
101101
DA19C3E01C67D4420016861F /* Sources */,
102102
DA19C3E11C67D4420016861F /* Frameworks */,
103103
DA19C3E21C67D4420016861F /* Resources */,
104-
E9FAB3019A9E163A9B828A51 /* 📦 Embed Pods Frameworks */,
105-
8B1639EE38352A1103B1DD1B /* 📦 Copy Pods Resources */,
104+
E9FAB3019A9E163A9B828A51 /* [CP] Embed Pods Frameworks */,
105+
8B1639EE38352A1103B1DD1B /* [CP] Copy Pods Resources */,
106106
F2ACE9C71CEF90FD00A461E5 /* Swiftlint */,
107107
);
108108
buildRules = (
@@ -121,11 +121,12 @@
121121
isa = PBXProject;
122122
attributes = {
123123
LastSwiftUpdateCheck = 0720;
124-
LastUpgradeCheck = 0720;
124+
LastUpgradeCheck = 0820;
125125
ORGANIZATIONNAME = Lickability;
126126
TargetAttributes = {
127127
DA19C3E31C67D4420016861F = {
128128
CreatedOnToolsVersion = 7.2.1;
129+
LastSwiftMigration = 0800;
129130
};
130131
};
131132
};
@@ -161,44 +162,44 @@
161162
/* End PBXResourcesBuildPhase section */
162163

163164
/* Begin PBXShellScriptBuildPhase section */
164-
072623A5468F27A0975A871A /* 📦 Check Pods Manifest.lock */ = {
165+
072623A5468F27A0975A871A /* [CP] Check Pods Manifest.lock */ = {
165166
isa = PBXShellScriptBuildPhase;
166167
buildActionMask = 2147483647;
167168
files = (
168169
);
169170
inputPaths = (
170171
);
171-
name = "📦 Check Pods Manifest.lock";
172+
name = "[CP] Check Pods Manifest.lock";
172173
outputPaths = (
173174
);
174175
runOnlyForDeploymentPostprocessing = 0;
175176
shellPath = /bin/sh;
176177
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
177178
showEnvVarsInLog = 0;
178179
};
179-
8B1639EE38352A1103B1DD1B /* 📦 Copy Pods Resources */ = {
180+
8B1639EE38352A1103B1DD1B /* [CP] Copy Pods Resources */ = {
180181
isa = PBXShellScriptBuildPhase;
181182
buildActionMask = 2147483647;
182183
files = (
183184
);
184185
inputPaths = (
185186
);
186-
name = "📦 Copy Pods Resources";
187+
name = "[CP] Copy Pods Resources";
187188
outputPaths = (
188189
);
189190
runOnlyForDeploymentPostprocessing = 0;
190191
shellPath = /bin/sh;
191192
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-PinpointKitExample/Pods-PinpointKitExample-resources.sh\"\n";
192193
showEnvVarsInLog = 0;
193194
};
194-
E9FAB3019A9E163A9B828A51 /* 📦 Embed Pods Frameworks */ = {
195+
E9FAB3019A9E163A9B828A51 /* [CP] Embed Pods Frameworks */ = {
195196
isa = PBXShellScriptBuildPhase;
196197
buildActionMask = 2147483647;
197198
files = (
198199
);
199200
inputPaths = (
200201
);
201-
name = "📦 Embed Pods Frameworks";
202+
name = "[CP] Embed Pods Frameworks";
202203
outputPaths = (
203204
);
204205
runOnlyForDeploymentPostprocessing = 0;
@@ -267,8 +268,10 @@
267268
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
268269
CLANG_WARN_EMPTY_BODY = YES;
269270
CLANG_WARN_ENUM_CONVERSION = YES;
271+
CLANG_WARN_INFINITE_RECURSION = YES;
270272
CLANG_WARN_INT_CONVERSION = YES;
271273
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
274+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
272275
CLANG_WARN_UNREACHABLE_CODE = YES;
273276
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
274277
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -312,8 +315,10 @@
312315
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
313316
CLANG_WARN_EMPTY_BODY = YES;
314317
CLANG_WARN_ENUM_CONVERSION = YES;
318+
CLANG_WARN_INFINITE_RECURSION = YES;
315319
CLANG_WARN_INT_CONVERSION = YES;
316320
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
321+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
317322
CLANG_WARN_UNREACHABLE_CODE = YES;
318323
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
319324
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -341,23 +346,28 @@
341346
isa = XCBuildConfiguration;
342347
baseConfigurationReference = B38C00C57F922ED4177A0F43 /* Pods-PinpointKitExample.debug.xcconfig */;
343348
buildSettings = {
349+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
344350
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
345351
INFOPLIST_FILE = PinpointKitExample/Info.plist;
346352
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
347353
PRODUCT_BUNDLE_IDENTIFIER = net.Lickability.PinpointKitExample;
348354
PRODUCT_NAME = "$(TARGET_NAME)";
355+
SWIFT_VERSION = 3.0;
349356
};
350357
name = Debug;
351358
};
352359
DA19C3F81C67D4420016861F /* Release */ = {
353360
isa = XCBuildConfiguration;
354361
baseConfigurationReference = 043312B73ABE453B100EB875 /* Pods-PinpointKitExample.release.xcconfig */;
355362
buildSettings = {
363+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
356364
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
357365
INFOPLIST_FILE = PinpointKitExample/Info.plist;
358366
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
359367
PRODUCT_BUNDLE_IDENTIFIER = net.Lickability.PinpointKitExample;
360368
PRODUCT_NAME = "$(TARGET_NAME)";
369+
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
370+
SWIFT_VERSION = 3.0;
361371
};
362372
name = Release;
363373
};

‎Example/PinpointKitExample/AppDelegate.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ import PinpointKit
1111

1212
@UIApplicationMain
1313
class AppDelegate: UIResponder, UIApplicationDelegate {
14-
15-
lazy var window: UIWindow? = ShakeDetectingWindow(frame: UIScreen.mainScreen().bounds)
1614

17-
func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
15+
var window: UIWindow?
16+
17+
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
1818
NSLog("Initial test log for the system logger.")
1919
return true
2020
}

‎Example/PinpointKitExample/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>APPL</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>1.0</string>
18+
<string>1.0.0</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>

‎Example/PinpointKitExample/ViewController.swift‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,18 @@ import PinpointKit
1111

1212
final class ViewController: UITableViewController {
1313

14+
fileprivate let pinpointKit = PinpointKit(feedbackRecipients: ["[email protected]"])
15+
1416
override func viewDidLoad() {
1517
super.viewDidLoad()
1618

1719
// Hides the infinite cells footer.
1820
tableView.tableFooterView = UIView()
1921
}
2022

21-
override func viewDidAppear(animated: Bool) {
23+
override func viewDidAppear(_ animated: Bool) {
2224
super.viewDidAppear(animated)
2325

24-
PinpointKit.defaultPinpointKit.show(fromViewController: self)
26+
pinpointKit.show(from: self)
2527
}
2628
}

‎Example/Podfile.lock‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
PODS:
2-
- PinpointKit (0.9)
2+
- PinpointKit (0.9):
3+
- PinpointKit/Core (= 0.9)
4+
- PinpointKit/Core (0.9)
35

46
DEPENDENCIES:
57
- PinpointKit (from `../`)
68

79
EXTERNAL SOURCES:
810
PinpointKit:
9-
:path: "../"
11+
:path: ../
1012

1113
SPEC CHECKSUMS:
12-
PinpointKit: 79a54c1642c37fe466c8ff128f98ae0147067255
14+
PinpointKit: 6d19d08afddfad2753aee95e2a6160f2d8d30764
1315

1416
PODFILE CHECKSUM: 57140b686c94ba1e5869bbc5b91a657c508da681
1517

16-
COCOAPODS: 1.0.0
18+
COCOAPODS: 1.0.1

‎Example/Pods/Local Podspecs/PinpointKit.podspec.json‎

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

0 commit comments

Comments
 (0)