Skip to content

Commit

Permalink
Merge pull request #33 from dtrenz/develop
Browse files Browse the repository at this point in the history
RC 0.3.0
  • Loading branch information
dtrenz authored Jan 6, 2017
2 parents b14f3db + 11d088c commit 9841ca7
Show file tree
Hide file tree
Showing 19 changed files with 433 additions and 340 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,6 @@ DerivedData

# CocoaPods
Pods/

# Jazzy
docs/
1 change: 1 addition & 0 deletions .swift-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2.3
4 changes: 4 additions & 0 deletions .swiftlint.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
disabled_rules: # rule identifiers to exclude from running
- conditional_binding_cascade
- trailing_whitespace
- vertical_whitespace
included: # paths to include during linting. `--path` is ignored if present.
- Sources
# parameterized rules can be customized from this configuration file
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ branches:
- develop
- master
language: objective-c
osx_image: xcode7.3
osx_image: xcode8
notifications:
slack:
rooms:
Expand Down
46 changes: 24 additions & 22 deletions BugShaker.podspec
Original file line number Diff line number Diff line change
@@ -1,23 +1,25 @@
Pod::Spec.new do |s|
s.name = "BugShaker"
s.version = "0.2.1"
s.summary = "Shake to submit a bug report (w/ screenshot) via email."
s.description = <<-DESC
BugShaker allows your users to simply submit bug reports by shaking the device.
When a shake is detected, the current screen state is captured and the user is
prompted to submit a bug report via a mail composer with the screenshot attached.
DESC
s.homepage = "https://github.com/detroit-labs/BugShaker"
s.screenshots = [
"https://raw.githubusercontent.com/dtrenz/BugShaker/develop/Screenshots/screenshot-1.png",
"https://raw.githubusercontent.com/dtrenz/BugShaker/develop/Screenshots/screenshot-2.png",
]
s.license = "Apache 2.0"
s.author = { "Dan Trenz" => "dtrenz@gmail.com" }
s.source = { :git => "https://github.com/detroit-labs/BugShaker.git", :tag => s.version.to_s }
s.social_media_url = "https://twitter.com/dtrenz"
s.platform = :ios, "8.3"
s.requires_arc = true
s.source_files = "Sources/**/*"
s.frameworks = "UIKit", "MessageUI"
Pod::Spec.new do |spec|
spec.name = 'BugShaker'
spec.version = '0.3.0'
spec.license = { :type => 'Apache 2.0' }
spec.homepage = 'https://github.com/detroit-labs/BugShaker'
spec.documentation_url = 'http://dtrenz.github.io/BugShaker/'
spec.authors = { 'Dan Trenz' => 'dtrenz@gmail.com' }
spec.summary = 'Shake to submit a bug report (w/ screenshot) via email.'
spec.source = { :git => 'https://github.com/detroit-labs/BugShaker.git', :tag => spec.version.to_s }
spec.source_files = 'Sources/*.swift'
spec.platform = :ios, '9.0'
spec.frameworks = 'UIKit', 'MessageUI'
spec.requires_arc = true
spec.description = <<-DESC
BugShaker allows your users to simply submit bug reports by shaking the device.
When a shake is detected, the current screen state is captured and the user is
prompted to submit a bug report via a mail composer with the screenshot attached.
DESC
spec.screenshots = [
'https://raw.githubusercontent.com/dtrenz/BugShaker/develop/Screenshots/screenshot-1.png',
'https://raw.githubusercontent.com/dtrenz/BugShaker/develop/Screenshots/screenshot-2.png',
]
spec.social_media_url = 'https://twitter.com/dtrenz'
spec.source_files = 'Sources/**/*'
end
278 changes: 152 additions & 126 deletions BugShaker.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions BugShaker.xcodeproj/xcshareddata/xcschemes/BugShaker.xcscheme
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0730"
LastUpgradeVersion = "0810"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down Expand Up @@ -33,7 +33,7 @@
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "C528211D1CA43E70003EA0D4"
BlueprintIdentifier = "C51FD83F1DCBADE700FC21FC"
BuildableName = "BugShakerTests.xctest"
BlueprintName = "BugShakerTests"
ReferencedContainer = "container:BugShaker.xcodeproj">
Expand Down
11 changes: 10 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@
All notable changes to this project will be documented in this file.
`BugShaker` adheres to [Semantic Versioning](http://semver.org/).

## [0.3.0](https://github.com/dtrenz/BugShaker/releases/tag/0.3.0)
**Released:** 2016-11-04

#### Added
- Support for **Swift v2.3**

---

## [0.2.1](https://github.com/dtrenz/BugShaker/releases/tag/0.2.1)
**Released:** 2016-03-25

Expand All @@ -13,7 +21,8 @@ All notable changes to this project will be documented in this file.

#### Fixed
- Broken README images
-

---

## [0.2.0](https://github.com/dtrenz/BugShaker/releases/tag/0.2.0)
**Released:** 2016-03-24
Expand Down
38 changes: 35 additions & 3 deletions Example/Example.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,24 +7,42 @@
objects = {

/* Begin PBXBuildFile section */
C53DFA0C1DCB97A000634CE4 /* BugShaker.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C53DFA0B1DCB97A000634CE4 /* BugShaker.framework */; };
C53DFA0D1DCB97A000634CE4 /* BugShaker.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = C53DFA0B1DCB97A000634CE4 /* BugShaker.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
C573BD7E1CA443810021F8ED /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = C52821521CA4403A003EA0D4 /* AppDelegate.swift */; };
C573BD7F1CA443A90021F8ED /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = C52821531CA4403A003EA0D4 /* LaunchScreen.xib */; };
C573BD801CA443AE0021F8ED /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = C52821551CA4403A003EA0D4 /* Main.storyboard */; };
/* End PBXBuildFile section */

/* Begin PBXCopyFilesBuildPhase section */
C53DFA0E1DCB97A000634CE4 /* Embed Frameworks */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "";
dstSubfolderSpec = 10;
files = (
C53DFA0D1DCB97A000634CE4 /* BugShaker.framework in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
C52821521CA4403A003EA0D4 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
C52821541CA4403A003EA0D4 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = "<group>"; };
C52821561CA4403A003EA0D4 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
C52821571CA4403A003EA0D4 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
C59755ED1CA450C700A21FAB /* Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; name = Example.app; path = "/Users/dtrenz/Dev/src/BugShaker/Example/build/Debug-iphoneos/Example.app"; sourceTree = "<absolute>"; };
C53DFA0B1DCB97A000634CE4 /* BugShaker.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = BugShaker.framework; sourceTree = BUILT_PRODUCTS_DIR; };
C58A4FB41DCB96A000BC029B /* Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Example.app; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
C573BD691CA4436A0021F8ED /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
C53DFA0C1DCB97A000634CE4 /* BugShaker.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -34,7 +52,9 @@
607FACC71AFB9204008FA782 = {
isa = PBXGroup;
children = (
C53DFA0B1DCB97A000634CE4 /* BugShaker.framework */,
C52821511CA4403A003EA0D4 /* Sources */,
C58A4FB41DCB96A000BC029B /* Example.app */,
);
sourceTree = "<group>";
};
Expand Down Expand Up @@ -75,14 +95,15 @@
C573BD681CA4436A0021F8ED /* Sources */,
C573BD691CA4436A0021F8ED /* Frameworks */,
C573BD6A1CA4436A0021F8ED /* Resources */,
C53DFA0E1DCB97A000634CE4 /* Embed Frameworks */,
);
buildRules = (
);
dependencies = (
);
name = Example;
productName = "BugShaker Example";
productReference = C59755ED1CA450C700A21FAB /* Example.app */;
productReference = C58A4FB41DCB96A000BC029B /* Example.app */;
productType = "com.apple.product-type.application";
};
/* End PBXNativeTarget section */
Expand All @@ -92,11 +113,13 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0730;
LastUpgradeCheck = 0720;
LastUpgradeCheck = 0810;
ORGANIZATIONNAME = CocoaPods;
TargetAttributes = {
C573BD6B1CA4436A0021F8ED = {
CreatedOnToolsVersion = 7.3;
DevelopmentTeam = 4J9G6749JK;
LastSwiftMigration = 0810;
};
};
};
Expand Down Expand Up @@ -174,8 +197,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 @@ -219,8 +244,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 All @@ -240,6 +267,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 8.3;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
VALIDATE_PRODUCT = YES;
};
name = Release;
Expand All @@ -249,23 +277,27 @@
buildSettings = {
CLANG_ANALYZER_NONNULL = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = 4J9G6749JK;
INFOPLIST_FILE = "$(SRCROOT)/Sources/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.dtrenz.BugShaker-Example";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 2.3;
};
name = Debug;
};
C573BD7C1CA4436A0021F8ED /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ANALYZER_NONNULL = YES;
DEVELOPMENT_TEAM = 4J9G6749JK;
INFOPLIST_FILE = "$(SRCROOT)/Sources/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.dtrenz.BugShaker-Example";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 2.3;
};
name = Release;
};
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0730"
LastUpgradeVersion = "0810"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down Expand Up @@ -61,6 +61,13 @@
ReferencedContainer = "container:Example.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<EnvironmentVariables>
<EnvironmentVariable
key = "OS_ACTIVITY_MODE"
value = "disable"
isEnabled = "YES">
</EnvironmentVariable>
</EnvironmentVariables>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
Expand Down
6 changes: 3 additions & 3 deletions Example/Sources/AppDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
// AppDelegate.swift
// BugShaker
//
// Created by git on 12/18/2015.
// Copyright (c) 2015 git. All rights reserved.
// Created by Dan Trenz on 12/18/2015.
// Copyright (c) 2015 Dan Trenz. All rights reserved.
//

import UIKit

import BugShaker


@UIApplicationMain
class AppDelegate: UIResponder, UIApplicationDelegate {

Expand Down
25 changes: 14 additions & 11 deletions Example/Sources/Base.lproj/Main.storyboard
Original file line number Diff line number Diff line change
@@ -1,38 +1,42 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10116" systemVersion="15E65" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="vXZ-lx-hvc">
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11542" systemVersion="16B2555" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="vXZ-lx-hvc">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11524"/>
<capability name="Constraints to layout margins" minToolsVersion="6.0"/>
<capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
<!--View Controller-->
<scene sceneID="ufC-wZ-h7g">
<objects>
<viewController id="vXZ-lx-hvc" customClass="ViewController" customModule="Example" customModuleProvider="target" sceneMemberID="viewController">
<viewController id="vXZ-lx-hvc" sceneMemberID="viewController">
<layoutGuides>
<viewControllerLayoutGuide type="top" id="jyV-Pf-zRb"/>
<viewControllerLayoutGuide type="bottom" id="2fi-mo-0CV"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="kh9-bI-dsS">
<rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="BugShaker" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="HHG-LZ-mav">
<rect key="frame" x="116" y="223" width="183" height="48"/>
<rect key="frame" x="96" y="199.5" width="183" height="48"/>
<fontDescription key="fontDescription" type="system" weight="thin" pointSize="40"/>
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Shake device to trigger bug report.
(⌃⌘Z in simulator)" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="A2Q-hN-kEb">
<rect key="frame" x="20" y="621" width="374" height="48"/>
<rect key="frame" x="16" y="560.5" width="343" height="48"/>
<fontDescription key="fontDescription" type="system" pointSize="20"/>
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" red="0.93725490199999995" green="0.29803921570000003" blue="0.29803921570000003" alpha="1" colorSpace="calibratedRGB"/>
<color key="backgroundColor" red="0.93725490199999995" green="0.29803921570000003" blue="0.29803921570000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="A2Q-hN-kEb" firstAttribute="centerY" secondItem="kh9-bI-dsS" secondAttribute="bottom" multiplier="7/8" constant="1" id="5fA-Uy-2sO"/>
<constraint firstItem="A2Q-hN-kEb" firstAttribute="trailing" secondItem="kh9-bI-dsS" secondAttribute="trailingMargin" id="I54-Jg-Mxh"/>
Expand All @@ -42,7 +46,6 @@
<constraint firstItem="HHG-LZ-mav" firstAttribute="centerY" secondItem="kh9-bI-dsS" secondAttribute="bottom" multiplier="1/3" constant="1" id="alS-lL-nNF"/>
</constraints>
</view>
<simulatedScreenMetrics key="simulatedDestinationMetrics" type="retina55"/>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="x5A-6p-PRh" sceneMemberID="firstResponder"/>
</objects>
Expand Down
17 changes: 13 additions & 4 deletions Podfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,16 @@
source "https://github.com/CocoaPods/Specs.git"
source 'https://github.com/CocoaPods/Specs.git'
use_frameworks!
platform :ios, '9.3'

target "BugShakerTests", :exclusive => true do
pod "Quick", "~> 0.9.1"
pod "Nimble", "3.2.0"
target 'BugShakerTests' do
pod 'Quick', '< 0.10'
pod 'Nimble', '< 5.0'
end

post_install do | installer |
installer.pods_project.targets.each do |target|
target.build_configurations.each do |config|
config.build_settings['SWIFT_VERSION'] = '2.3'
end
end
end
Loading

0 comments on commit 9841ca7

Please sign in to comment.