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

Commit

Permalink
Merge branch 'release/3.6.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
DerAndereAndi committed Sep 26, 2014
2 parents 8bf7729 + 071adb9 commit 8e06273
Show file tree
Hide file tree
Showing 7 changed files with 32 additions and 24 deletions.
12 changes: 8 additions & 4 deletions Classes/BITFeedbackComposeViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -146,18 +146,22 @@ - (void)keyboardWasShown:(NSNotification*)aNotification {

CGRect frame = CGRectMake(0, 0, self.view.frame.size.width, self.view.frame.size.height);
if (UI_USER_INTERFACE_IDIOM() != UIUserInterfaceIdiomPad) {
if (UIInterfaceOrientationIsPortrait(self.interfaceOrientation))
if (!bit_isPreiOS8Environment() || UIInterfaceOrientationIsPortrait(self.interfaceOrientation)) {
frame.size.height -= kbSize.height;
else
} else {
frame.size.height -= kbSize.width;
}
} else {
CGSize windowSize = [[UIScreen mainScreen] bounds].size;
CGFloat windowHeight = windowSize.height - 20;
CGFloat navBarHeight = self.navigationController.navigationBar.frame.size.height;

if (UIInterfaceOrientationIsPortrait(self.interfaceOrientation)) {
if (!bit_isPreiOS8Environment() || UIInterfaceOrientationIsPortrait(self.interfaceOrientation)) {
CGFloat modalGap = (windowHeight - self.view.bounds.size.height) / 2;
frame.size.height = windowHeight - navBarHeight - modalGap - kbSize.height;
frame.size.height = windowHeight - navBarHeight - kbSize.height;
if (bit_isPreiOS8Environment()) {
frame.size.height -= modalGap;
}
} else {
windowHeight = windowSize.width - 20;
CGFloat modalGap = 0.0f;
Expand Down
6 changes: 3 additions & 3 deletions HockeySDK.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'HockeySDK'
s.version = '3.6'
s.version = '3.6.1'

s.summary = 'Collect live crash reports, get feedback from your users, distribute your betas, and analyze your test coverage with HockeyApp.'
s.description = <<-DESC
Expand All @@ -12,7 +12,7 @@ Pod::Spec.new do |s|
DESC

s.homepage = 'http://hockeyapp.net/'
s.documentation_url = 'http://hockeyapp.net/help/sdk/ios/3.6/'
s.documentation_url = 'http://hockeyapp.net/help/sdk/ios/3.6.1/'

s.license = 'MIT'
s.author = { 'Andreas Linde' => '[email protected]', 'Thomas Dohmke' => "[email protected]" }
Expand All @@ -24,7 +24,7 @@ Pod::Spec.new do |s|

s.frameworks = 'AssetsLibrary', 'CoreText', 'CoreGraphics', 'MobileCoreServices', 'QuartzCore', 'QuickLook', 'Security', 'SystemConfiguration', 'UIKit'
s.ios.vendored_frameworks = 'Vendor/CrashReporter.framework'
s.xcconfig = {'GCC_PREPROCESSOR_DEFINITIONS' => %{$(inherited) BITHOCKEY_VERSION="@\\"#{s.version}\\"" BITHOCKEY_C_VERSION="\\"#{s.version}\\"" BITHOCKEY_BUILD="@\\"33\\"" BITHOCKEY_C_BUILD="\\"33\\""} }
s.xcconfig = {'GCC_PREPROCESSOR_DEFINITIONS' => %{$(inherited) BITHOCKEY_VERSION="@\\"#{s.version}\\"" BITHOCKEY_C_VERSION="\\"#{s.version}\\"" BITHOCKEY_BUILD="@\\"34\\"" BITHOCKEY_C_BUILD="\\"34\\""} }
s.resource_bundle = { 'HockeySDKResources' => ['Resources/*.png', 'Resources/*.lproj'] }
s.preserve_paths = 'Resources', 'Support'

Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## Version 3.6
## Version 3.6.1

- [Changelog](http://www.hockeyapp.net/help/sdk/ios/3.6/docs/docs/Changelog.html)
- [Changelog](http://www.hockeyapp.net/help/sdk/ios/3.6.1/docs/docs/Changelog.html)


## Introduction
Expand Down Expand Up @@ -31,10 +31,10 @@ The main SDK class is `BITHockeyManager`. It initializes all modules and provide

## Installation & Setup

- [Installation & Setup](http://www.hockeyapp.net/help/sdk/ios/3.6/docs/docs/Guide-Installation-Setup.html) (Recommended)
- [Installation & Setup Advanced](http://www.hockeyapp.net/help/sdk/ios/3.6/docs/docs/Guide-Installation-Setup-Advanced.html) (Using Git submodule and Xcode sub-project)
- [Identify and authenticate users of Ad-Hoc or Enterprise builds](http://www.hockeyapp.net/help/sdk/ios/3.6/docs/docs/HowTo-Authenticating-Users-on-iOS.html)
- [Migration from previous SDK Versions](http://www.hockeyapp.net/help/sdk/ios/3.6/docs/docs/Guide-Migration-Kits.html)
- [Installation & Setup](http://www.hockeyapp.net/help/sdk/ios/3.6.1/docs/docs/Guide-Installation-Setup.html) (Recommended)
- [Installation & Setup Advanced](http://www.hockeyapp.net/help/sdk/ios/3.6.1/docs/docs/Guide-Installation-Setup-Advanced.html) (Using Git submodule and Xcode sub-project)
- [Identify and authenticate users of Ad-Hoc or Enterprise builds](http://www.hockeyapp.net/help/sdk/ios/3.6.1/docs/docs/HowTo-Authenticating-Users-on-iOS.html)
- [Migration from previous SDK Versions](http://www.hockeyapp.net/help/sdk/ios/3.6.1/docs/docs/Guide-Migration-Kits.html)


## Xcode Documentation
Expand All @@ -47,4 +47,4 @@ This documentation provides integrated help in Xcode for all public APIs and a s

3. Copy the content into ~`/Library/Developer/Shared/Documentation/DocSets`

The documentation is also available via the following URL: [http://hockeyapp.net/help/sdk/ios/3.6/](http://hockeyapp.net/help/sdk/ios/3.6/)
The documentation is also available via the following URL: [http://hockeyapp.net/help/sdk/ios/3.6.1/](http://hockeyapp.net/help/sdk/ios/3.6.1/)
4 changes: 2 additions & 2 deletions Support/buildnumber.xcconfig
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "HockeySDK.xcconfig"

BUILD_NUMBER = 33
VERSION_STRING = 3.6
BUILD_NUMBER = 34
VERSION_STRING = 3.6.1
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) BITHOCKEY_VERSION="@\""$(VERSION_STRING)"\"" BITHOCKEY_BUILD="@\""$(BUILD_NUMBER)"\"" BITHOCKEY_C_VERSION="\""$(VERSION_STRING)"\"" BITHOCKEY_C_BUILD="\""$(BUILD_NUMBER)"\""
BIT_ARM_ARCHS = armv7 armv7s arm64
BIT_SIM_ARCHS = x86_64 i386
Expand Down
6 changes: 5 additions & 1 deletion docs/Changelog-template.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
## Version 3.6.0
## Version 3.6.1

- [BUGFIX] Fixed feedback compose view to correctly show the text in landscape on iOS 8

## Version 3.6

- [NEW] `BITCrashManager`: Added support for iOS 8 Extensions
- [NEW] `BITCrashManager`: Option to add a custom UI flow before sending a crash report, e.g. to ask users for more details (see `setAlertViewHandler:`)
Expand Down
6 changes: 3 additions & 3 deletions docs/Guide-Installation-Setup-Advanced-template.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## Version 3.6
## Version 3.6.1

- [Changelog](http://www.hockeyapp.net/help/sdk/ios/3.6/docs/docs/Changelog.html)
- [Changelog](http://www.hockeyapp.net/help/sdk/ios/3.6.1/docs/docs/Changelog.html)

## Introduction

Expand Down Expand Up @@ -166,7 +166,7 @@ This documentation provides integrated help in Xcode for all public APIs and a s

3. Copy the content into ~`/Library/Developer/Shared/Documentation/DocSets`

The documentation is also available via the following URL: [http://hockeyapp.net/help/sdk/ios/3.6/](http://hockeyapp.net/help/sdk/ios/3.6/)
The documentation is also available via the following URL: [http://hockeyapp.net/help/sdk/ios/3.6.1/](http://hockeyapp.net/help/sdk/ios/3.6.1/)

### Set up with xcconfig

Expand Down
8 changes: 4 additions & 4 deletions docs/Guide-Installation-Setup-template.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## Version 3.6
## Version 3.6.1

- [Changelog](http://www.hockeyapp.net/help/sdk/ios/3.6/docs/docs/Changelog.html)
- [Changelog](http://www.hockeyapp.net/help/sdk/ios/3.6.1/docs/docs/Changelog.html)

## Introduction

Expand Down Expand Up @@ -142,9 +142,9 @@ The following points need to be considered to use HockeySDK with iOS 8 Extension

This documentation provides integrated help in Xcode for all public APIs and a set of additional tutorials and how-tos.

1. Copy `de.bitstadium.HockeySDK-iOS-3.6.docset` into ~`/Library/Developer/Shared/Documentation/DocSets`
1. Copy `de.bitstadium.HockeySDK-iOS-3.6.1.docset` into ~`/Library/Developer/Shared/Documentation/DocSets`

The documentation is also available via the following URL: [http://hockeyapp.net/help/sdk/ios/3.6/](http://hockeyapp.net/help/sdk/ios/3.6/)
The documentation is also available via the following URL: [http://hockeyapp.net/help/sdk/ios/3.6.1/](http://hockeyapp.net/help/sdk/ios/3.6.1/)

### Set up with xcconfig

Expand Down

0 comments on commit 8e06273

Please sign in to comment.