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.4'
Browse files Browse the repository at this point in the history
  • Loading branch information
Andreas Linde committed Apr 24, 2015
2 parents dc0b7ba + ac2c50e commit 3c7f168
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 18 deletions.
2 changes: 2 additions & 0 deletions Classes/BITHockeyManager.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
#import <Foundation/Foundation.h>
#import <UIKit/UIKit.h>

#import "HockeySDKFeatureConfig.h"


@protocol BITHockeyManagerDelegate;

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.3'
s.version = '3.6.4'

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.3/'
s.documentation_url = 'http://hockeyapp.net/help/sdk/ios/3.6.4/'

s.license = 'MIT'
s.author = { 'Andreas Linde' => 'mail@andreaslinde.de', 'Thomas Dohmke' => "thomas@dohmke.de" }
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="@\\"36\\"" BITHOCKEY_C_BUILD="\\"36\\""} }
s.xcconfig = {'GCC_PREPROCESSOR_DEFINITIONS' => %{$(inherited) BITHOCKEY_VERSION="@\\"#{s.version}\\"" BITHOCKEY_C_VERSION="\\"#{s.version}\\"" BITHOCKEY_BUILD="@\\"38\\"" BITHOCKEY_C_BUILD="\\"38\\""} }
s.resource_bundle = { 'HockeySDKResources' => ['Resources/*.png', 'Resources/*.lproj'] }
s.preserve_paths = 'Resources', 'Support'
s.private_header_files = 'Classes/*Private.h'
Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## Version 3.6.3
## Version 3.6.4

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


## Introduction
Expand Down Expand Up @@ -31,9 +31,9 @@ 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.3/docs/docs/Guide-Installation-Setup.html) (Recommended)
- [Installation & Setup Advanced](http://www.hockeyapp.net/help/sdk/ios/3.6.2/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.2/docs/docs/HowTo-Authenticating-Users-on-iOS.html)
- [Installation & Setup](http://www.hockeyapp.net/help/sdk/ios/3.6.4/docs/docs/Guide-Installation-Setup.html) (Recommended)
- [Installation & Setup Advanced](http://www.hockeyapp.net/help/sdk/ios/3.6.4/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.4/docs/docs/HowTo-Authenticating-Users-on-iOS.html)
- [Migration from previous SDK Versions](http://www.hockeyapp.net/help/sdk/ios/3.6.2/docs/docs/Guide-Migration-Kits.html)


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.3/](http://hockeyapp.net/help/sdk/ios/3.6.3/)
The documentation is also available via the following URL: [http://hockeyapp.net/help/sdk/ios/3.6.4/](http://hockeyapp.net/help/sdk/ios/3.6.4/)
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 = 36
VERSION_STRING = 3.6.3
BUILD_NUMBER = 38
VERSION_STRING = 3.6.4
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
4 changes: 4 additions & 0 deletions docs/Changelog-template.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## Version 3.6.4

- [BUGFIX] Fixed a build issue

## Version 3.6.3

- [NEW] `BITCrashManager`: Added launch time to crash reports
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.3
## Version 3.6.4

- [Changelog](http://www.hockeyapp.net/help/sdk/ios/3.6.3/docs/docs/Changelog.html)
- [Changelog](http://www.hockeyapp.net/help/sdk/ios/3.6.4/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.3/](http://hockeyapp.net/help/sdk/ios/3.6.3/)
The documentation is also available via the following URL: [http://hockeyapp.net/help/sdk/ios/3.6.4/](http://hockeyapp.net/help/sdk/ios/3.6.4/)

### 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.3
## Version 3.6.4

- [Changelog](http://www.hockeyapp.net/help/sdk/ios/3.6.3/docs/docs/Changelog.html)
- [Changelog](http://www.hockeyapp.net/help/sdk/ios/3.6.4/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.1.docset` into ~`/Library/Developer/Shared/Documentation/DocSets`
1. Copy `de.bitstadium.HockeySDK-iOS-3.6.4.docset` into ~`/Library/Developer/Shared/Documentation/DocSets`

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

### Set up with xcconfig

Expand Down

0 comments on commit 3c7f168

Please sign in to comment.