Version bump 4.0.0-beta.3

xyzisinus · Sep 11, 2016 · 31aa5c1 · 31aa5c1
1 parent 3f78d45
commit 31aa5c1
Show file tree

Hide file tree

Showing 14 changed files with 75 additions and 71 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -21,23 +21,27 @@ env:
     - TVOS_EXAMPLE_SCHEME="tvOSDemo"
   matrix:
     # Can't do a pod lint with Xcode 8 due to: https://github.com/CocoaPods/CocoaPods/issues/5661
+    # Should now be fixed: https://github.com/CocoaPods/Xcodeproj/pull/407 but doesn't look like the updates are on Travis yet
     # - POD_LINT="YES"
-    - PROJECT_FILE="$LIB_PROJECT"       DESTINATION="OS=10.0,name=iPhone 6S"            SCHEME="$IOS_FRAMEWORK_SCHEME"      SDK="$IOS_SDK"      POD_LINT="NO"   BUILDCMD="clean test build"
+    - PROJECT_FILE="$LIB_PROJECT"       DESTINATION="OS=10.0,name=iPhone 7"             SCHEME="$IOS_FRAMEWORK_SCHEME"      SDK="$IOS_SDK"      POD_LINT="NO"   BUILDCMD="clean test build"
     - PROJECT_FILE="$LIB_PROJECT"       DESTINATION="arch=x86_64"                       SCHEME="$OSX_FRAMEWORK_SCHEME"      SDK="$OSX_SDK"      POD_LINT="NO"   BUILDCMD="clean test build"
     - PROJECT_FILE="$LIB_PROJECT"       DESTINATION="OS=10.0,name=Apple TV 1080p"       SCHEME="$TVOS_FRAMEWORK_SCHEME"     SDK="$TVOS_SDK"     POD_LINT="NO"   BUILDCMD="clean test build"
     - PROJECT_FILE="$LIB_PROJECT"       DESTINATION="OS=3.0,name=Apple Watch - 42mm"    SCHEME="$WATCHOS_FRAMEWORK_SCHEME"  SDK="$WATCHOS_SDK"  POD_LINT="NO"   BUILDCMD="clean build"
-    # SDK not available in Xcode 8 yet - PROJECT_FILE="$IOSDEMO_PROJECT"   DESTINATION="OS=8.1,name=iPhone 5"              SCHEME="$IOS_EXAMPLE_SCHEME"        SDK="$IOS_SDK"      POD_LINT="NO"   BUILDCMD="clean build"
-    # SDK not available in Xcode 8 yet - PROJECT_FILE="$IOSDEMO_PROJECT"   DESTINATION="OS=8.2,name=iPhone 5S"             SCHEME="$IOS_EXAMPLE_SCHEME"        SDK="$IOS_SDK"      POD_LINT="NO"   BUILDCMD="clean build"
-    # SDK not available in Xcode 8 yet - PROJECT_FILE="$IOSDEMO_PROJECT"   DESTINATION="OS=8.3,name=iPhone 6"              SCHEME="$IOS_EXAMPLE_SCHEME"        SDK="$IOS_SDK"      POD_LINT="NO"   BUILDCMD="clean build"
-    # SDK not available in Xcode 8 yet - PROJECT_FILE="$IOSDEMO_PROJECT"   DESTINATION="OS=8.4,name=iPad Retina"           SCHEME="$IOS_EXAMPLE_SCHEME"        SDK="$IOS_SDK"      POD_LINT="NO"   BUILDCMD="clean build"
-    # SDK not available in Xcode 8 yet - PROJECT_FILE="$IOSDEMO_PROJECT"   DESTINATION="OS=9.0,name=iPhone 6 Plus"         SCHEME="$IOS_EXAMPLE_SCHEME"        SDK="$IOS_SDK"      POD_LINT="NO"   BUILDCMD="clean build"
-    # SDK not available in Xcode 8 yet - PROJECT_FILE="$IOSDEMO_PROJECT"   DESTINATION="OS=9.1,name=iPhone 6S"             SCHEME="$IOS_EXAMPLE_SCHEME"        SDK="$IOS_SDK"      POD_LINT="NO"   BUILDCMD="clean build"
-    # SDK not available in Xcode 8 yet - PROJECT_FILE="$IOSDEMO_PROJECT"   DESTINATION="OS=9.2,name=iPhone 6S Plus"        SCHEME="$IOS_EXAMPLE_SCHEME"        SDK="$IOS_SDK"      POD_LINT="NO"   BUILDCMD="clean build"
-    # SDK not available in Xcode 8 yet - PROJECT_FILE="$IOSDEMO_PROJECT"   DESTINATION="OS=9.3,name=iPad Retina"           SCHEME="$IOS_EXAMPLE_SCHEME"        SDK="$IOS_SDK"      POD_LINT="NO"   BUILDCMD="clean build"
+    - PROJECT_FILE="$IOSDEMO_PROJECT"   DESTINATION="OS=8.1,name=iPhone 5"              SCHEME="$IOS_EXAMPLE_SCHEME"        SDK="$IOS_SDK"      POD_LINT="NO"   BUILDCMD="clean build"
+    - PROJECT_FILE="$IOSDEMO_PROJECT"   DESTINATION="OS=8.2,name=iPhone 5S"             SCHEME="$IOS_EXAMPLE_SCHEME"        SDK="$IOS_SDK"      POD_LINT="NO"   BUILDCMD="clean build"
+    - PROJECT_FILE="$IOSDEMO_PROJECT"   DESTINATION="OS=8.3,name=iPhone 6"              SCHEME="$IOS_EXAMPLE_SCHEME"        SDK="$IOS_SDK"      POD_LINT="NO"   BUILDCMD="clean build"
+    - PROJECT_FILE="$IOSDEMO_PROJECT"   DESTINATION="OS=8.4,name=iPad Retina"           SCHEME="$IOS_EXAMPLE_SCHEME"        SDK="$IOS_SDK"      POD_LINT="NO"   BUILDCMD="clean build"
+    - PROJECT_FILE="$IOSDEMO_PROJECT"   DESTINATION="OS=9.0,name=iPhone 6 Plus"         SCHEME="$IOS_EXAMPLE_SCHEME"        SDK="$IOS_SDK"      POD_LINT="NO"   BUILDCMD="clean build"
+    - PROJECT_FILE="$IOSDEMO_PROJECT"   DESTINATION="OS=9.1,name=iPhone 6S"             SCHEME="$IOS_EXAMPLE_SCHEME"        SDK="$IOS_SDK"      POD_LINT="NO"   BUILDCMD="clean build"
+    - PROJECT_FILE="$IOSDEMO_PROJECT"   DESTINATION="OS=9.2,name=iPhone 6S Plus"        SCHEME="$IOS_EXAMPLE_SCHEME"        SDK="$IOS_SDK"      POD_LINT="NO"   BUILDCMD="clean build"
+    - PROJECT_FILE="$IOSDEMO_PROJECT"   DESTINATION="OS=9.3,name=iPad Retina"           SCHEME="$IOS_EXAMPLE_SCHEME"        SDK="$IOS_SDK"      POD_LINT="NO"   BUILDCMD="clean build"
+    - PROJECT_FILE="$IOSDEMO_PROJECT"   DESTINATION="OS=10.0,name=iPhone 7 Plus"        SCHEME="$IOS_EXAMPLE_SCHEME"        SDK="$IOS_SDK"      POD_LINT="NO"   BUILDCMD="clean build"
     - PROJECT_FILE="$IOSDEMO_PROJECT"   DESTINATION="OS=10.0,name=iPad Retina"          SCHEME="$IOS_EXAMPLE_SCHEME"        SDK="$IOS_SDK"      POD_LINT="NO"   BUILDCMD="clean build"
     - PROJECT_FILE="$OSXDEMO_PROJECT"   DESTINATION="arch=x86_64"                       SCHEME="$OSX_EXAMPLE_SCHEME"        SDK="$OSX_SDK"      POD_LINT="NO"   BUILDCMD="clean build"
-    # SDK not available in Xcode 8 yet - PROJECT_FILE="$TVOSDEMO_PROJECT"  DESTINATION="OS=9.2,name=Apple TV 1080p"        SCHEME="$TVOS_EXAMPLE_SCHEME"       SDK="$TVOS_SDK"     POD_LINT="NO"   BUILDCMD="clean build"
-    - PROJECT_FILE="$TVOSDEMO_PROJECT"  DESTINATION="OS=10.0,name=Apple TV 1080p"        SCHEME="$TVOS_EXAMPLE_SCHEME"      SDK="$TVOS_SDK"     POD_LINT="NO"   BUILDCMD="clean build"
+    - PROJECT_FILE="$TVOSDEMO_PROJECT"  DESTINATION="OS=9.0,name=Apple TV 1080p"        SCHEME="$TVOS_EXAMPLE_SCHEME"       SDK="$TVOS_SDK"     POD_LINT="NO"   BUILDCMD="clean build"
+    - PROJECT_FILE="$TVOSDEMO_PROJECT"  DESTINATION="OS=9.1,name=Apple TV 1080p"        SCHEME="$TVOS_EXAMPLE_SCHEME"       SDK="$TVOS_SDK"     POD_LINT="NO"   BUILDCMD="clean build"
+    - PROJECT_FILE="$TVOSDEMO_PROJECT"  DESTINATION="OS=9.2,name=Apple TV 1080p"        SCHEME="$TVOS_EXAMPLE_SCHEME"       SDK="$TVOS_SDK"     POD_LINT="NO"   BUILDCMD="clean build"
+    - PROJECT_FILE="$TVOSDEMO_PROJECT"  DESTINATION="OS=10.0,name=Apple TV 1080p"       SCHEME="$TVOS_EXAMPLE_SCHEME"       SDK="$TVOS_SDK"     POD_LINT="NO"   BUILDCMD="clean build"
 before_install:
   - brew update
 script:
@@ -53,3 +57,4 @@ script:
   # Can't specify the SDK or the watchOS builds will fail with: target specifies product type 'com.apple.product-type.watchkit2-extension', but there's no such product type for the 'iphonesimulator' platform
   # - xcodebuild -UseSanitizedBuildSystemEnvironment=YES -project "$PROJECT_FILE" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO ENABLE_TESTABILITY=YES $BUILDCMD;
   # - xcodebuild -UseSanitizedBuildSystemEnvironment=YES -project "$PROJECT_FILE" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Release ONLY_ACTIVE_ARCH=NO ENABLE_TESTABILITY=YES $BUILDCMD;
+
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,6 @@
 #Change Log
 
+* **Version 4.0.0-beta.3**: *(2016/09/11)* - Fixed issue with CocoaPods using multiple `XCGLogger.h` files, added Objective-C exception handling to fix #123
 * **Version 4.0.0-beta.2**: *(2016/09/04)* - Updated docs, added filtering by tag and developer, added demo for filters
 * **Version 4.0.0-beta.1**: *(2016/09/01)* - First beta for Swift 3 compatibility, including a lot of architecture changes
 * **Version 3.5.1**: *(2016/08/28)* - Added documentation, improved tests. This will likely be the last version for Swift 2.x.

diff --git a/DemoApps/OSXDemo/OSXDemo.xcodeproj/project.pbxproj b/DemoApps/OSXDemo/OSXDemo.xcodeproj/project.pbxproj
@@ -438,7 +438,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "-";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = "4.0.0-beta.2";
+				CURRENT_PROJECT_VERSION = "4.0.0-beta.3";
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -485,7 +485,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "-";
 				COPY_PHASE_STRIP = YES;
-				CURRENT_PROJECT_VERSION = "4.0.0-beta.2";
+				CURRENT_PROJECT_VERSION = "4.0.0-beta.3";
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;

diff --git a/DemoApps/iOSDemo/iOSDemo.xcodeproj/project.pbxproj b/DemoApps/iOSDemo/iOSDemo.xcodeproj/project.pbxproj
@@ -673,7 +673,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = "4.0.0-beta.2";
+				CURRENT_PROJECT_VERSION = "4.0.0-beta.3";
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -721,7 +721,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				COPY_PHASE_STRIP = YES;
-				CURRENT_PROJECT_VERSION = "4.0.0-beta.2";
+				CURRENT_PROJECT_VERSION = "4.0.0-beta.3";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;

diff --git a/DemoApps/tvOSDemo/tvOSDemo.xcodeproj/project.pbxproj b/DemoApps/tvOSDemo/tvOSDemo.xcodeproj/project.pbxproj
@@ -425,7 +425,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = "4.0.0-beta.2";
+				CURRENT_PROJECT_VERSION = "4.0.0-beta.3";
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -472,7 +472,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = "4.0.0-beta.2";
+				CURRENT_PROJECT_VERSION = "4.0.0-beta.3";
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;

diff --git a/README.md b/README.md
@@ -53,7 +53,7 @@ in your repository folder.
 
 Add the following line to your `Cartfile`.
 
-```github "DaveWoodCom/XCGLogger" ~> 4.0.0-beta.2```
+```github "DaveWoodCom/XCGLogger" ~> 4.0.0-beta.3```
 
 Then run `carthage update --no-use-binaries` or just `carthage update`. For details of the installation and usage of Carthage, visit [it's project page][carthage].
 
@@ -523,9 +523,9 @@ The change log is now in it's own file: [CHANGELOG.md](CHANGELOG.md)
 [badge-platforms]: https://img.shields.io/badge/Platforms-OS%20X%20%7C%20iOS%20%7C%20tvOS%20%7C%20watchOS-lightgray.svg?style=flat
 [badge-license]: https://img.shields.io/badge/License-MIT-lightgrey.svg?style=flat
 [badge-travis]: https://img.shields.io/travis/DaveWoodCom/XCGLogger/swift_3.0.svg?style=flat
-[badge-swiftpm]: https://img.shields.io/badge/Swift_Package_Manager-v4.0.0--beta.2-64a6dd.svg?style=flat
+[badge-swiftpm]: https://img.shields.io/badge/Swift_Package_Manager-v4.0.0--beta.3-64a6dd.svg?style=flat
 [badge-cocoapods]: https://img.shields.io/cocoapods/v/XCGLogger.svg?style=flat
-[badge-carthage]: https://img.shields.io/badge/Carthage-v4.0.0--beta.2-64a6dd.svg?style=flat
+[badge-carthage]: https://img.shields.io/badge/Carthage-v4.0.0--beta.3-64a6dd.svg?style=flat
 
 [badge-sponsors]: https://img.shields.io/badge/Sponsors-Cerebral%20Gardens-orange.svg?style=flat
 [badge-twitter]: https://img.shields.io/twitter/follow/DaveWoodX.svg?style=social