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

Commit

Permalink
Merge pull request #203 from Lickability/develop
Browse files Browse the repository at this point in the history
Merges `develop` into `master`
  • Loading branch information
mbbischoff authored Feb 3, 2017
2 parents 76f06b7 + 19b6f1a commit c3bbb00
Show file tree
Hide file tree
Showing 91 changed files with 3,049 additions and 2,390 deletions.
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

0 comments on commit c3bbb00

Please sign in to comment.