Skip to content
This repository has been archived by the owner on Aug 2, 2023. It is now read-only.

Commit

Permalink
Merge branch 'hotfix/2.0.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
DerAndereAndi committed Feb 15, 2014
2 parents c4c196d + 84c417e commit 7629469
Show file tree
Hide file tree
Showing 10 changed files with 421 additions and 125 deletions.
392 changes: 281 additions & 111 deletions Classes/CrashReporting/BITCrashReportTextFormatter.m

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions HockeySDK-Mac.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'HockeySDK-Mac'
s.version = '2.0.0'
s.version = '2.0.1'

s.summary = 'Collect crash reports with HockeyApp.'
s.description = <<-DESC
Expand All @@ -12,11 +12,11 @@ Pod::Spec.new do |s|
DESC

s.homepage = 'http://hockeyapp.net/'
s.documentation_url = 'http://hockeyapp.net/help/sdk/mac/2.0.0/'
s.documentation_url = 'http://hockeyapp.net/help/sdk/mac/2.0.1/'

s.license = { :type => 'MIT', :file => 'HockeySDK-Mac/LICENSE.txt' }
s.author = { 'Andreas Linde' => 'mail@andreaslinde.de', 'Thomas Dohmke' => "thomas@dohmke.de" }
s.source = { :http => "http://download.hockeyapp.net/sdk/mac/HockeySDK-Mac-2.0.0.zip" }
s.source = { :http => "http://download.hockeyapp.net/sdk/mac/HockeySDK-Mac-2.0.1.zip" }

s.platform = :osx, '10.5'
s.osx.deployment_target = 10.5
Expand Down
6 changes: 3 additions & 3 deletions LICENSE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
The Hockey SDK is provided under the following license:

The MIT License
Copyright (c) 2012-2013 HockeyApp, Bit Stadium GmbH.
Copyright (c) 2012-2014 HockeyApp, Bit Stadium GmbH.
All rights reserved.

Permission is hereby granted, free of charge, to any person
Expand All @@ -30,8 +30,8 @@ The Hockey SDK is provided under the following license:
Except as noted below, PLCrashReporter
is provided under the following license:

Copyright (c) 2008 - 2013 Plausible Labs Cooperative, Inc.
Copyright (c) 2012 - 2013 HockeyApp, Bit Stadium GmbH.
Copyright (c) 2008 - 2014 Plausible Labs Cooperative, Inc.
Copyright (c) 2012 - 2014 HockeyApp, Bit Stadium GmbH.
All rights reserved.

Permission is hereby granted, free of charge, to any person
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## Version 2.0.0
## Version 2.0.1

- [Changelog](http://www.hockeyapp.net/help/sdk/mac/2.0.0/docs/docs/Changelog.html)
- [Changelog](http://www.hockeyapp.net/help/sdk/mac/2.0.1/docs/docs/Changelog.html)


## Introduction
Expand All @@ -25,7 +25,7 @@ The main SDK class is `BITHockeyManager`. It initializes all modules and provide

## Installation & Setup

- [Installation & Setup](http://www.hockeyapp.net/help/sdk/mac/2.0.0/docs/docs/Guide-Installation-Setup.html)
- [Installation & Setup](http://www.hockeyapp.net/help/sdk/mac/2.0.1/docs/docs/Guide-Installation-Setup.html)
- [Mac Desktop Uploader](http://support.hockeyapp.net/kb/how-tos/how-to-upload-to-hockeyapp-on-a-mac)


Expand All @@ -39,5 +39,5 @@ This documentation provides integrated help in Xcode for all public APIs and a s

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

The documentation is also available via the following URL: [http://hockeyapp.net/help/sdk/mac/2.0.0/](http://hockeyapp.net/help/sdk/mac/2.0.0/)
The documentation is also available via the following URL: [http://hockeyapp.net/help/sdk/mac/2.0.1/](http://hockeyapp.net/help/sdk/mac/2.0.1/)

2 changes: 1 addition & 1 deletion Resources/fr.lproj/HockeySDK.strings
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"WindowTitle" = "Rapport de problèmes pour %@";

/* Introduction text, with app name placeholder first and company placeholder second */
"IntroductionText" = "%@ s’est arrêté automatiquement lors de sa dernière utilisation. Souhaitez-vous envoyer un rapport de plantage à %@?";
"IntroductionText" = "%@ s’est arrêté automatiquement lors de sa dernière utilisation. Souhaitez-vous envoyer un rapport de plantage aux developperus de l’application?";

/* Name Text Title */
"NameTextTitle" = "Nom";
Expand Down
2 changes: 2 additions & 0 deletions Support/HockeySDK.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -611,6 +611,7 @@
);
MACOSX_DEPLOYMENT_TARGET = 10.5;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
WRAPPER_EXTENSION = framework;
};
name = Debug;
Expand All @@ -632,6 +633,7 @@
);
MACOSX_DEPLOYMENT_TARGET = 10.5;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
WRAPPER_EXTENSION = framework;
};
name = Release;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0500"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "1E7FB95C17D3F36B00B7E10D"
BuildableName = "HockeySDK Documentation"
BlueprintName = "HockeySDK Documentation"
ReferencedContainer = "container:HockeySDK.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
buildConfiguration = "Debug">
<Testables>
</Testables>
</TestAction>
<LaunchAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
buildConfiguration = "Debug"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
allowLocationSimulation = "YES">
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
buildConfiguration = "Release"
debugDocumentVersioning = "YES">
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0500"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "1EF09D8B1523574200067A5C"
BuildableName = "HockeySDK.framework"
BlueprintName = "HockeySDK"
ReferencedContainer = "container:HockeySDK.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
buildConfiguration = "Debug">
<Testables>
</Testables>
</TestAction>
<LaunchAction
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
buildConfiguration = "Debug"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
allowLocationSimulation = "YES">
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
buildConfiguration = "Release"
debugDocumentVersioning = "YES">
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
6 changes: 3 additions & 3 deletions Support/buildnumber.xcconfig
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "HockeySDK.xcconfig"

BUILD_NUMBER = 19
VERSION_STRING = 2.0
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) BITHOCKEY_VERSION="@\"2.0\""
BUILD_NUMBER = 20
VERSION_STRING = 2.0.1
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) BITHOCKEY_VERSION="@\"2.0.1\""
6 changes: 6 additions & 0 deletions docs/Changelog-template.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
## Version 2.0.1

- [NEW] Crash reports now provide the selector name e.g. for crashes in `objc_msgSend`
- [BUGFIX] Fixed a bug in french localization files that could cause the crash report UI to crash
- [BUGFIX] Enabled `Skip Install` for the Framework target. This fixes a warning when archiving a project and including the SDK as a subproject

## Version 2.0

- General
Expand Down

0 comments on commit 7629469

Please sign in to comment.