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

Merges develop into master #203

Merged
merged 290 commits into from
Feb 3, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
290 commits
Select commit Hold shift + click to select a range
a652f47
Renames `viewLog(_:collector:fromViewController:)`
mliberatore Jun 24, 2016
5ba2846
Renames `succeed(_:)`
mliberatore Jun 24, 2016
3195e9d
Renames `fail(:_)`
mliberatore Jun 24, 2016
d45d005
Renames `attachFeedback(_:)`
mliberatore Jun 24, 2016
f346232
Revert "Renames `attachFeedback(_:)`"
mliberatore Jun 24, 2016
c2057d2
Renames `attachFeedback(_:)`
mliberatore Jun 24, 2016
9abbe93
Renames `attachScreenshot(_:)`
mliberatore Jun 24, 2016
55f2f70
Renames `attachLogs(_:)`
mliberatore Jun 24, 2016
2c15372
Renames `attachImage(_:)`
mliberatore Jun 24, 2016
5fc4b24
Renames `attachText(_:)`
mliberatore Jun 24, 2016
8dcf204
Renames `attachAdditionalInformation(_:)`
mliberatore Jun 24, 2016
d6ce17e
Renames `feedbackCollector(_:didCollectFeedback:)`
mliberatore Jun 24, 2016
c79008d
Renames `sender(_:didSendFeedback:success)`
mliberatore Jun 24, 2016
3236d1a
Renames `pinpointKit(_:willSendFeedback:)`
mliberatore Jun 24, 2016
b435caa
Renames `pinpointKit(_:didSendFeedback:)`
mliberatore Jun 24, 2016
17a3024
Renames `sender(_:didFailToSendFeedback:error:)`
mliberatore Jun 24, 2016
4cc2238
Removes optional `feedbackRecipients` from `Configuration`
mliberatore Jul 1, 2016
5f7fadb
show(fromViewController:) → show(from viewController)
mliberatore Jul 1, 2016
293e2c5
Drops `UIFont` prefix where it can be inferred
mliberatore Jul 1, 2016
cb2783d
Fixes missed change to `SenderDelegate` implementation
mliberatore Jul 1, 2016
1bbce43
sendFeedback(_:fromViewController:) → send(_:from:)
mliberatore Jul 1, 2016
60d9e5c
Merge branch 'swift-3.0-api-guidelines-pass-1' into swift-3.0-api-gui…
mliberatore Jul 1, 2016
00e49d9
takeScreenshot(_:application:) → takeScreenshot(of:in:)
mliberatore Jul 1, 2016
5c44676
screenshotDetector(_:didFailWithError:) → screenshotDetector(_:didFai…
mliberatore Jul 1, 2016
7c0d89e
Removes default property assignment
mliberatore Jul 1, 2016
cabb9a9
succeed(_:) → succeed(with:) and fail(_:) → fail(with:)
mliberatore Jul 1, 2016
c6738d6
screenshotDetector(_:didDetectScreenshot:) → screenshotDetector(_:did…
mliberatore Jul 1, 2016
cf0f528
Corrects documentation typos
mliberatore Jul 1, 2016
81b48bf
Merge pull request #127 from Lickability/swift-3.0-beta-1-migration
mbbischoff Jul 1, 2016
c419756
pinpointOrangeColor() → pinpointOrange()
mliberatore Jul 1, 2016
6379533
Merge branch 'swift-3.0' into swift-3.0-api-guidelines-pass-1
mliberatore Jul 1, 2016
c184f45
Makes `PinpointKit` instances `private`
mliberatore Jul 1, 2016
c34451b
Removes use of `ShakeDetectingWindow`
mliberatore Jul 1, 2016
b4d1a77
moveControlPoints(_:) → move(controlPointsBy:)
mliberatore Jul 1, 2016
4a468b5
scaleControlPoints(_:) → scale(controlPointsBy:)
mliberatore Jul 1, 2016
b291712
Merge pull request #130 from Lickability/easier-recipient-specification
bcapps Jul 1, 2016
7e88b3f
Updates README’s Usage Section to Reflect New APIs
mliberatore Jul 1, 2016
b4cd3cc
Moves "Note" to below the snippet
mliberatore Jul 1, 2016
5c1526e
Uses smart apostrophe in "don’t"
mliberatore Jul 1, 2016
3d82e45
Removes use of "`UIApplicationDelegate` class"
mliberatore Jul 1, 2016
93925ce
Removes "class" from "application delegate class"
mliberatore Jul 1, 2016
619815a
Merge pull request #133 from Lickability/updates-readme-usage-section
bcapps Jul 8, 2016
030301a
NotificationCenter.default() → NotificationCenter.default
mliberatore Jul 8, 2016
9d6fca8
NotificationCenter.default() → NotificationCenter.default (missed one)
mliberatore Jul 8, 2016
b44a124
OperationQueue.main() → OperationQueue.main
mliberatore Jul 8, 2016
882b7a2
whenContained(inInstancesOfClasses:) → appearance(whenContainedInInst…
mliberatore Jul 8, 2016
e046960
whenContained(inInstancesOfClasses:) → appearance(whenContainedInInst…
mliberatore Jul 8, 2016
8c0637c
Adds workaround for Mach-O Header issue to Podfile
mliberatore Jul 8, 2016
cfce264
Adds `homepage` to podspec
mliberatore Jul 8, 2016
123f31e
Runs `pod install`
mliberatore Jul 8, 2016
e3fed3d
Runs Swift 3 Migrator
mliberatore Jul 8, 2016
2c6c782
path(forDrawing:) → path(for:)
mliberatore Jul 8, 2016
03fcc77
Adds docs for `post_install` workaround
mliberatore Jul 8, 2016
c39fbbe
Publicizes several `Feedback` properties for customization
mliberatore Jul 8, 2016
93b9f71
Adds test code for feedback customization
mliberatore Jul 8, 2016
e9403c8
Revert "Adds test code for feedback customization"
mliberatore Jul 8, 2016
e354a46
Also makes `recipients` public
mliberatore Jul 8, 2016
f2973c2
Merge pull request #132 from Lickability/swift-3.0-api-guidelines-pass-1
mbbischoff Jul 8, 2016
69028fa
Merge branch 'swift-3.0' into swift-3.0-api-guidelines-pass-2
mliberatore Jul 8, 2016
913c54a
takeScreenshot(of:in:) → takeScreenshot(of:on:)
mliberatore Jul 8, 2016
563889b
Merge pull request #136 from Lickability/swift-3.0-api-guidelines-pass-2
mbbischoff Jul 8, 2016
b9923f8
Merge branch 'swift-3.0' of https://github.com/Lickability/PinpointKi…
mbbischoff Jul 8, 2016
61fc106
WIP on `FeedbackConfiguration` struct use
mliberatore Jul 8, 2016
cb30641
*Made logs and screenshots public
harri121 Jul 21, 2016
5a9108a
Allows specification of title and body in convenience init
mliberatore Jul 22, 2016
7c4a7b1
Adds missing back-tick to docs
mliberatore Jul 22, 2016
678e351
Merge pull request #138 from Lickability/allow-customizing-feedback
bcapps Jul 22, 2016
b097377
Moved homepage and summary up in the JSON
mbbischoff Jul 22, 2016
c7bf321
pod installed
mbbischoff Jul 22, 2016
b76e69f
Merge pull request #137 from Lickability/swift-3.0-beta-2-migration
mbbischoff Jul 22, 2016
6f9db86
Merge pull request #143 from hibento/public-feedback
mbbischoff Jul 22, 2016
5bc0d1a
Removes Mach-O header workaround from Podfile
mliberatore Jul 22, 2016
903b9ca
Runs `bundle exec pod install`
mliberatore Jul 22, 2016
1844872
Runs migrator again to restore migration checks to Pods project
mliberatore Jul 22, 2016
5037d50
Runs Xcode 8’s recommended updates (e.g. whole module optimization)
mliberatore Jul 22, 2016
3ca7208
Merge pull request #145 from Lickability/remove-mach-o-workaround-3.0
mbbischoff Jul 22, 2016
5cf5c11
Mentions Swift 2.3 and 3.0 Branches in README
mliberatore Jul 22, 2016
fd20d5c
Bolds the **Note:** for consistency
mliberatore Jul 22, 2016
a412b54
"up to date" → "up-to-date"
mliberatore Jul 22, 2016
05cf5d1
Merge pull request #146 from Lickability/swift-2.3-3.0-in-readme
mbbischoff Jul 23, 2016
7b5491d
Adding annotationTextAttributes to InterfaceCustomization
ChristianSteffens Jul 28, 2016
ef3f57e
Adding textEditingDoneButton to InterfaceCustomization Struct
ChristianSteffens Jul 29, 2016
b6b5ae4
in → introduced
mbbischoff Jul 29, 2016
ca686d7
Doesn’t assume `FeedbackViewController` is presented modally
mliberatore Jul 29, 2016
05366c2
* BarButtonItem´s Title Argument is no longer optional
ChristianSteffens Jul 30, 2016
b34b1b9
Merge pull request #148 from hibento/develop
mliberatore Aug 5, 2016
0243c3d
Keeps guard statement on one line
mliberatore Aug 5, 2016
8eeca1a
Small whitespace adjustments to correct indents
mliberatore Aug 5, 2016
92061ff
Moves default annotation text attributes to private extension
mliberatore Aug 5, 2016
3098d6c
Removes text color setting
mliberatore Aug 5, 2016
0f3b3b2
Test code for adding custom text attributes
mliberatore Aug 5, 2016
d07354a
Revert "Test code for adding custom text attributes"
mliberatore Aug 5, 2016
2e3cf97
Makes references to `presentingViewController` consistent
mliberatore Aug 5, 2016
92b7af0
Removes "Cancel" button functionality for pushed view controller
mliberatore Aug 5, 2016
368a0fc
Adds test code for pushing instead of presenting
mliberatore Aug 5, 2016
1cc9f13
Revert "Adds test code for pushing instead of presenting"
mliberatore Aug 5, 2016
7a2c59e
Adds system log collector tests
Twigz Aug 5, 2016
c0a7754
Added test to verify logger has no logs initially
Twigz Aug 5, 2016
ca57b1f
Applies Swift 3.0 migrator changes
mliberatore Aug 5, 2016
4159e2e
apply → applying
mliberatore Aug 5, 2016
114ca06
concat → concatenating
mliberatore Aug 5, 2016
7364088
.clear() → .clear
mliberatore Aug 5, 2016
5c3e77d
Adds in expectations to ensure tests don't randomly fail
Twigz Aug 5, 2016
816af66
Remove unnecessary semicolons
Twigz Aug 5, 2016
2f498ae
Overridden funcs to vars
mliberatore Aug 5, 2016
0258b43
.white() → .white
mliberatore Aug 5, 2016
157a91b
urlForResource(_:withExtension) → url(forResource:withExtension:)
mliberatore Aug 5, 2016
fd57dd1
Error protocol now `Swift.Error` to remove ambiguity
mliberatore Aug 5, 2016
2b3a5fe
Add github PR template
Twigz Aug 5, 2016
02c212e
.shared() → .shared
mliberatore Aug 5, 2016
bdebf00
.lightGray() → .lightGray
mliberatore Aug 5, 2016
9b7e8b8
Updated to title case
mbbischoff Aug 5, 2016
540df1f
Predicate → NSPredicate, SortDescriptor → NSSortDescriptor
mliberatore Aug 5, 2016
58328a8
UIScreen.main() → UIScreen.main
mliberatore Aug 5, 2016
877cffb
Adds Closes #
mbbischoff Aug 5, 2016
6b2eb23
Merge pull request #154 from Lickability/feature/add-pr-template
mbbischoff Aug 5, 2016
8404a05
Merge pull request #151 from Lickability/annotation-text-attributes-f…
mbbischoff Aug 5, 2016
c226e72
Merge pull request #149 from Lickability/92
Twigz Aug 5, 2016
8803db6
Adds docs
Twigz Aug 5, 2016
0221c5c
Merge pull request #155 from Lickability/swift-3.0-beta-4-migration
mbbischoff Aug 5, 2016
4d7caef
Merge branch 'develop' into swift-3.0-routine-develop-merge
mliberatore Aug 5, 2016
d1f42ee
Renamed sut to systemLogCollector
Twigz Aug 5, 2016
8058ea9
runs `bundle exec pod install`
mliberatore Aug 5, 2016
2125989
Re-runs migrator and fixes remaining issues
mliberatore Aug 5, 2016
94487cc
Remove custom subscript
Twigz Aug 5, 2016
6a65fc1
Change designatedness of the initializers
Twigz Aug 5, 2016
59906c9
Made the enum a subtype
Twigz Aug 5, 2016
1f66607
Remove extra whitespace
Twigz Aug 5, 2016
27e5a3c
Merge pull request #153 from Lickability/feature/add-system-log-colle…
bcapps Aug 5, 2016
790688a
Allows recommended Xcode changes
mliberatore Aug 12, 2016
78b934f
Work in progress converting table header view into a cell
mliberatore Aug 12, 2016
b2ddb4d
Adds delegate to handle screenshot tapping
mliberatore Aug 12, 2016
4d8389f
ScreenshotHeaderView → ScreenshotCell
mliberatore Aug 12, 2016
59a0fbe
Fixes all compiler errors when opening in Xcode 8b6
mliberatore Aug 26, 2016
558d0af
Runs the Swift 3 migrator accepting public → open changes
mliberatore Aug 26, 2016
fd08856
Runs the Swift 3 migrator accepting public → open changes
mliberatore Aug 26, 2016
7528546
Merge branch 'swift-3.0-beta-6-migration' into feedback-view-gap
mliberatore Aug 26, 2016
0c69eec
Uses CGPath copy method instead of CGPath(__byStroking:...)
mliberatore Sep 2, 2016
e65b961
Removes needless back-ticks surrounding `default`
mliberatore Sep 2, 2016
2a054d9
Makes `feedbackConfiguration` non-optional on `Feedback`
mliberatore Sep 2, 2016
6ef2394
Runs the Xcode 8 GM migrator, updating a single private → fileprivate…
mliberatore Sep 9, 2016
f87f5a2
Merge branch 'swift-3.0-beta-6-migration' into feedback-view-gap
mliberatore Sep 9, 2016
5493275
Merge pull request #161 from Lickability/swift-3.0-beta-6-migration
Twigz Sep 23, 2016
20ce0dc
Merge pull request #163 from Lickability/feedback-configuration-non-o…
Twigz Sep 23, 2016
12cadaf
Merge branch 'swift-3.0' of github.com:Lickability/PinpointKit into f…
Twigz Sep 23, 2016
32c6325
Merge pull request #160 from Lickability/feedback-view-gap
Twigz Sep 23, 2016
201a78b
Merge branch 'swift-3.0' into develop
mliberatore Sep 23, 2016
d1e469c
Adds test code to show new snippets in action
mliberatore Sep 30, 2016
629ef19
Updates README for Swift 3-friendly code snippets
mliberatore Sep 30, 2016
4b068eb
Revert "Adds test code to show new snippets in action"
mliberatore Sep 30, 2016
1a926a3
WIP reorganizing /Sources
mliberatore Sep 30, 2016
1ec3780
bundle exec pod install on /Example
mliberatore Sep 30, 2016
44b99bd
Fixes typo in directory name
mliberatore Sep 30, 2016
bc1bee3
bundle exec pod install
mliberatore Sep 30, 2016
bc6b9ca
Updates podspec to include subspecs
mliberatore Sep 30, 2016
2a3a017
bundle exec pod install
mliberatore Sep 30, 2016
b608249
Removes unnecessary `Photos` import from `EditImageViewController.swift`
mliberatore Sep 30, 2016
b561ae8
Moves Resources to /Core
mliberatore Sep 30, 2016
d021752
bundle exec pod install
mliberatore Sep 30, 2016
6b7edfe
Fixes the spelling of Matt’s last name
mliberatore Sep 30, 2016
f08a728
Moves `frameworks` to their proper locations and adds `Photos`
mliberatore Sep 30, 2016
a24473d
Merge pull request #170 from Lickability/updates-readme-code
bcapps Sep 30, 2016
cc1af64
Adds `default_subspec` of `Core`
mliberatore Sep 30, 2016
7f2d23e
bundle exec pod install
mliberatore Sep 30, 2016
9fec06c
Updates README following #171
mliberatore Sep 30, 2016
8c79ad4
Merge pull request #171 from Lickability/photos-dependency
Twigz Sep 30, 2016
ea6d998
Merge branch 'develop' into readme-with-subspecs
mliberatore Sep 30, 2016
0d92872
Merge pull request #173 from Lickability/readme-with-subspecs
Twigz Sep 30, 2016
1f73e87
Fixes CocoaPods instructions in README
mliberatore Sep 30, 2016
d85b83f
Merge pull request #174 from Lickability/fixes-readme-cocoapods-instr…
Twigz Sep 30, 2016
2936056
Fixes issue with MFMailComposeViewControllerDelegate not getting call…
mliberatore Sep 30, 2016
438aee8
Merge pull request #175 from Lickability/fixes-mail-compose-dismissal…
mliberatore Sep 30, 2016
fba2d11
Adds screenshot parameter to PinpointKit.show() for custom screenshots
mliberatore Oct 14, 2016
fa6c26d
Makes the EditImageViewController’s image view .scaleAspectFit
mliberatore Oct 14, 2016
54298ce
Adds test code for alternate image
mliberatore Oct 14, 2016
271b08a
Clears annotations when shown.
mliberatore Oct 14, 2016
13af816
Revert "Adds test code for alternate image"
mliberatore Oct 14, 2016
5fbddb4
Additional clarification in `screenshot` parameter docs
mliberatore Oct 14, 2016
c26bf97
Merge pull request #177 from Lickability/pass-prior-screenshots
bcapps Oct 14, 2016
67dea48
publicizes `MIMEType`
mliberatore Oct 14, 2016
daecc1e
Publicizes Feedback
mliberatore Oct 14, 2016
9f3149e
Adds test code to show full access to exposed Feedback and MIMEType
mliberatore Oct 14, 2016
1dee431
Revert "Adds test code to show full access to exposed Feedback and MI…
mliberatore Oct 14, 2016
56795da
Merge pull request #178 from Lickability/public-access-for-feedback-a…
bcapps Oct 14, 2016
bc13bc2
Removes unused code from `EditImageViewController`
mliberatore Nov 4, 2016
fd9fa84
Adds editorDidDismiss and editorDidMakeChanges
mliberatore Nov 4, 2016
4d3eaeb
Notifies delegate of annotation deletion
mliberatore Nov 4, 2016
cb34426
Makes `screenshot` a `{get set}` and adds `numberOfAnnotations`
mliberatore Nov 4, 2016
51175e3
Merge pull request #182 from Lickability/unused-code
mbbischoff Nov 4, 2016
4e7da19
Merge branch 'develop' into more-editor-delegate-hooks
mliberatore Nov 4, 2016
4da9197
function → method
mliberatore Nov 4, 2016
0067ebb
Changes → Change
mliberatore Nov 4, 2016
d106619
Reorders EditorDelegate methods
mliberatore Nov 4, 2016
6e9e19e
Merge pull request #183 from Lickability/more-editor-delegate-hooks
mbbischoff Nov 4, 2016
3cf264a
Merge branch 'develop' into adjustments-to-editor-protocol
mliberatore Nov 4, 2016
48d689d
Adds note about `screenshot` setter clearing annotations
mliberatore Nov 4, 2016
3d49086
Merge pull request #184 from Lickability/adjustments-to-editor-protocol
mbbischoff Nov 4, 2016
5286f51
Adds EditImageViewControllerBarButtonItemProviding
mliberatore Nov 4, 2016
4c4ac9d
Makes use of new protocol with a private default provider
mliberatore Nov 4, 2016
7cfd407
Adds test code for custom bar button items
mliberatore Nov 4, 2016
04026a7
Completes docs on attemptToDismiss(animated:)
mliberatore Nov 18, 2016
d67554a
Makes allowsHidingBarButtonItemsWhileEditingTextAnnotations a let
mliberatore Nov 18, 2016
0db8fa2
Revert "Adds test code for custom bar button items"
mliberatore Nov 18, 2016
4a06c98
Reuses attemptToDismiss(animated:)
mliberatore Nov 18, 2016
b2842b1
editorTextAnnotationDoneButtonFont → editorTextAnnotationDismissButt…
mliberatore Nov 18, 2016
2a54e6f
Makes `editorTextAnnotationDismissButtonFont` docs consistent
mliberatore Nov 18, 2016
9021563
allowsHidingBarButtonItemsWhileEditingTextAnnotations → hidesBarButto…
mliberatore Nov 18, 2016
b335205
Specifies left bar button items before right
mliberatore Nov 18, 2016
5c1b78b
Merge pull request #188 from Lickability/bar-button-item-customization
mliberatore Nov 18, 2016
2e44155
Adds `pixelHeight` and corrects docs on `portraitPixelSize`
mliberatore Nov 22, 2016
0de7b3f
Merge pull request #189 from Lickability/updates-to-screen-extension
Twigz Nov 23, 2016
97897a0
Adds default implementation for `editorWillDismiss(_:with:)`
mliberatore Dec 2, 2016
0525196
Adds notes for default `EditorDelegate` method implementations.
mliberatore Dec 2, 2016
fdbff41
Merge pull request #190 from Lickability/editor-will-dismiss-default-…
mliberatore Dec 2, 2016
178bbc3
Adds delegate callback for tool selection
mliberatore Dec 9, 2016
d636e1c
Adds more granular editor change delegate
mliberatore Dec 9, 2016
0f59f57
Adds test code
mliberatore Dec 9, 2016
d7a82dc
Revert "Adds test code"
mliberatore Dec 9, 2016
d39f287
Makes `EditImageViewController` non-final
mliberatore Dec 9, 2016
db5b660
Revert "Makes `EditImageViewController` non-final"
mliberatore Dec 9, 2016
d613888
Makes `EditImageViewController` Subclassable
mliberatore Dec 9, 2016
8711495
Merge pull request #192 from Lickability/makes-edit-image-view-contro…
mbbischoff Dec 9, 2016
f35a1ac
Merge pull request #191 from Lickability/improve-editor-delegate
mbbischoff Dec 16, 2016
0e552ea
Adds `EditImageViewControllerBarButtonItemProviding`
mliberatore Jan 13, 2017
5c10f95
Recommended settings in Example project
mliberatore Jan 13, 2017
533f7b6
Updates to README for 1.0 release
mliberatore Jan 13, 2017
27c541d
Merge pull request #196 from Lickability/swift-3.0-maintenance
bcapps Jan 13, 2017
0f33a48
Adds Swift version requirements and note about 2.3
mliberatore Jan 13, 2017
1a611d8
Fixes small typo ("take peek" → "take a peek")
mliberatore Jan 13, 2017
96e1c1c
Allow use ScreenshotDetector in swift 3
horovodovodo4ka Jan 13, 2017
31372f0
Merge pull request #199 from xbitstream/swift3-ScreenshotDetector
mliberatore Jan 20, 2017
421cb38
Makes `ScreenshotDetector`’s `init` public
mliberatore Jan 20, 2017
dd5731c
Merge pull request #200 from Lickability/screenshot-detector-public-init
bcapps Jan 20, 2017
6cd949d
Merge remote-tracking branch 'origin/develop' into readme-1.0-updates
bcapps Jan 20, 2017
7d788c8
Adds buddybuild build status, CocoaPods, and Carthage badges
bcapps Jan 20, 2017
2721180
Merge pull request #201 from Lickability/readme-build-status-badge
mliberatore Jan 20, 2017
42250bf
Preps version for 1.0.0 release
mliberatore Jan 27, 2017
9e72995
0.9 → 1.0.0 in PinpointKit project
mliberatore Jan 27, 2017
23e70cb
Merge pull request #197 from Lickability/readme-1.0-updates
mbbischoff Jan 27, 2017
0aae89b
Merge branch 'develop' into version-bump-1.0.0
mliberatore Jan 27, 2017
06657c1
Merge pull request #202 from Lickability/version-bump-1.0.0
mbbischoff Jan 27, 2017
ca16e24
Merge branch 'master' into develop
mliberatore Jan 27, 2017
5b75e17
Merge pull request #204 from Lickability/update-develop-from-master
mbbischoff Jan 27, 2017
dae538a
Makes the system logger initializer failable and hides system logging…
mliberatore Feb 3, 2017
72a07fb
Updates `sections` array initialization syntax
mliberatore Feb 3, 2017
34ea01a
Marks system log collection iOS 9 only and de-emphasizes it as a feature
mliberatore Feb 3, 2017
d8b942c
Merge pull request #207 from Lickability/readme-updates-for-logging
mbbischoff Feb 3, 2017
31f56a7
Fixes tests in `SystemLogCollectorTests`
mliberatore Feb 3, 2017
c182459
Merge branch 'develop' into hides-logging
mliberatore Feb 3, 2017
19b6f1a
Merge pull request #206 from Lickability/hides-logging
mbbischoff Feb 3, 2017
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
7 changes: 7 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Closes #

## What It Does

## How to Test

## Notes
Binary file added Assets/screenshots.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion Example/Gemfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source 'https://rubygems.org'

gem 'cocoapods', '1.0.0'
gem 'cocoapods', '1.0.1'
18 changes: 9 additions & 9 deletions Example/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ GEM
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
claide (1.0.0)
cocoapods (1.0.0)
cocoapods (1.0.1)
activesupport (>= 4.0.2)
claide (>= 1.0.0, < 2.0)
cocoapods-core (= 1.0.0)
cocoapods-core (= 1.0.1)
cocoapods-deintegrate (>= 1.0.0, < 2.0)
cocoapods-downloader (>= 1.0.0, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
Expand All @@ -24,8 +24,8 @@ GEM
fourflusher (~> 0.3.0)
molinillo (~> 0.4.5)
nap (~> 1.0)
xcodeproj (>= 1.0.0, < 2.0)
cocoapods-core (1.0.0)
xcodeproj (>= 1.1.0, < 2.0)
cocoapods-core (1.0.1)
activesupport (>= 4.0.2)
fuzzy_match (~> 2.0.4)
nap (~> 1.0)
Expand All @@ -41,18 +41,18 @@ GEM
cocoapods-try (1.0.0)
colored (1.2)
escape (0.0.4)
fourflusher (0.3.0)
fourflusher (0.3.1)
fuzzy_match (2.0.4)
i18n (0.7.0)
json (1.8.3)
minitest (5.8.4)
minitest (5.9.0)
molinillo (0.4.5)
nap (1.1.0)
netrc (0.7.8)
thread_safe (0.3.5)
tzinfo (1.2.2)
thread_safe (~> 0.1)
xcodeproj (1.0.0)
xcodeproj (1.1.0)
activesupport (>= 3)
claide (>= 1.0.0, < 2.0)
colored (~> 1.2)
Expand All @@ -61,7 +61,7 @@ PLATFORMS
ruby

DEPENDENCIES
cocoapods (= 1.0.0)
cocoapods (= 1.0.1)

BUNDLED WITH
1.11.2
1.12.5
30 changes: 20 additions & 10 deletions Example/PinpointKitExample.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -97,12 +97,12 @@
isa = PBXNativeTarget;
buildConfigurationList = DA19C3F61C67D4420016861F /* Build configuration list for PBXNativeTarget "PinpointKitExample" */;
buildPhases = (
072623A5468F27A0975A871A /* 📦 Check Pods Manifest.lock */,
072623A5468F27A0975A871A /* [CP] Check Pods Manifest.lock */,
DA19C3E01C67D4420016861F /* Sources */,
DA19C3E11C67D4420016861F /* Frameworks */,
DA19C3E21C67D4420016861F /* Resources */,
E9FAB3019A9E163A9B828A51 /* 📦 Embed Pods Frameworks */,
8B1639EE38352A1103B1DD1B /* 📦 Copy Pods Resources */,
E9FAB3019A9E163A9B828A51 /* [CP] Embed Pods Frameworks */,
8B1639EE38352A1103B1DD1B /* [CP] Copy Pods Resources */,
F2ACE9C71CEF90FD00A461E5 /* Swiftlint */,
);
buildRules = (
Expand All @@ -121,11 +121,12 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0720;
LastUpgradeCheck = 0720;
LastUpgradeCheck = 0820;
ORGANIZATIONNAME = Lickability;
TargetAttributes = {
DA19C3E31C67D4420016861F = {
CreatedOnToolsVersion = 7.2.1;
LastSwiftMigration = 0800;
};
};
};
Expand Down Expand Up @@ -161,44 +162,44 @@
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
072623A5468F27A0975A871A /* 📦 Check Pods Manifest.lock */ = {
072623A5468F27A0975A871A /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "📦 Check Pods Manifest.lock";
name = "[CP] Check Pods Manifest.lock";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
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";
showEnvVarsInLog = 0;
};
8B1639EE38352A1103B1DD1B /* 📦 Copy Pods Resources */ = {
8B1639EE38352A1103B1DD1B /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "📦 Copy Pods Resources";
name = "[CP] Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-PinpointKitExample/Pods-PinpointKitExample-resources.sh\"\n";
showEnvVarsInLog = 0;
};
E9FAB3019A9E163A9B828A51 /* 📦 Embed Pods Frameworks */ = {
E9FAB3019A9E163A9B828A51 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "📦 Embed Pods Frameworks";
name = "[CP] Embed Pods Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -267,8 +268,10 @@
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
Expand Down Expand Up @@ -312,8 +315,10 @@
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
Expand Down Expand Up @@ -341,23 +346,28 @@
isa = XCBuildConfiguration;
baseConfigurationReference = B38C00C57F922ED4177A0F43 /* Pods-PinpointKitExample.debug.xcconfig */;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
INFOPLIST_FILE = PinpointKitExample/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = net.Lickability.PinpointKitExample;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
};
name = Debug;
};
DA19C3F81C67D4420016861F /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 043312B73ABE453B100EB875 /* Pods-PinpointKitExample.release.xcconfig */;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
INFOPLIST_FILE = PinpointKitExample/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = net.Lickability.PinpointKitExample;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_VERSION = 3.0;
};
name = Release;
};
Expand Down
6 changes: 3 additions & 3 deletions Example/PinpointKitExample/AppDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ import PinpointKit

@UIApplicationMain
class AppDelegate: UIResponder, UIApplicationDelegate {

lazy var window: UIWindow? = ShakeDetectingWindow(frame: UIScreen.mainScreen().bounds)

func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
var window: UIWindow?

func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
NSLog("Initial test log for the system logger.")
return true
}
Expand Down
2 changes: 1 addition & 1 deletion Example/PinpointKitExample/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<string>1.0.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
6 changes: 4 additions & 2 deletions Example/PinpointKitExample/ViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,18 @@ import PinpointKit

final class ViewController: UITableViewController {

fileprivate let pinpointKit = PinpointKit(feedbackRecipients: ["[email protected]"])

override func viewDidLoad() {
super.viewDidLoad()

// Hides the infinite cells footer.
tableView.tableFooterView = UIView()
}

override func viewDidAppear(animated: Bool) {
override func viewDidAppear(_ animated: Bool) {
super.viewDidAppear(animated)

PinpointKit.defaultPinpointKit.show(fromViewController: self)
pinpointKit.show(from: self)
}
}
10 changes: 6 additions & 4 deletions Example/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
PODS:
- PinpointKit (0.9)
- PinpointKit (0.9):
- PinpointKit/Core (= 0.9)
- PinpointKit/Core (0.9)

DEPENDENCIES:
- PinpointKit (from `../`)

EXTERNAL SOURCES:
PinpointKit:
:path: "../"
:path: ../

SPEC CHECKSUMS:
PinpointKit: 79a54c1642c37fe466c8ff128f98ae0147067255
PinpointKit: 6d19d08afddfad2753aee95e2a6160f2d8d30764

PODFILE CHECKSUM: 57140b686c94ba1e5869bbc5b91a657c508da681

COCOAPODS: 1.0.0
COCOAPODS: 1.0.1
29 changes: 22 additions & 7 deletions Example/Pods/Local Podspecs/PinpointKit.podspec.json

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

10 changes: 6 additions & 4 deletions Example/Pods/Manifest.lock

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

Loading