Swift 2.0 #617
Merged
Swift 2.0 #617
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fixed compile errors in Xcode 7 with Swift 2.0
It looks like Xcode 7 now supports textual headers.
Swift 2 fixes
# Xcode7-beta3 * Error when using current head of swift_2.0 branch * "Cannot import module that is being compiled" ... which actually makes sense compared to most swift xcode errors * Simply remove the import line
Fix Xcode 7 beta3 "Cannot import module that is being compiled" error
Support watchOS
…s CocoaLumberjack(Swift)-watchOS, Creates watchOSSwiftTest
Add watchOSSwiftTest and some changes on Lumberjack.xcodeproj
Fix #582 and some warnings
Using Xcode 7 image on Travis CI for testing Swift 2.0
tvOS does not support `host_info()` anymore. At the same time it supports `[[NSProcessInfo processInfo] activeProcessorCount]` so this can be used instead.
Mac OS before 10.5 would not support [NSProcessInfo processorCount] so make this safe.
Add tvOS targets on project
Revert "Add tvOS targets on project"
Conflicts: - .travis.yml Resolved by choosing the version from the swift_2.0 branch that requires the xcode7 build environment. - Classes/DDFileLogger.h Resolved by choosing the changes from 58ae948 by sinoru over changes from b765caf by stephencelis. See discussion on issue #592 - Lumberjack.xcodeproj/project.pbxproj Resolved by choosing the version from the swift_2.0 branch and manually redoing what was done in 9f41918. Since it was branched off master, there have been three new commits modifying the project file: - f1cd4b8 Make CocoaLumberjackSwift-iOS Target depend on CocoaLumberjack-iOS Similar change was done when re-adding CocoaLumberjackSwift-iOS target again (after it had been removed) in fa57e49 - 9f41918 Mark CocoaLumberjack dynamic libraries as Require Only App-Extension-Safe API Manually applied changes again in GUI after choosing project file from swift_2.0 branch. Switched the 'Require Only App-Extension-Safe API' to 'Yes' on CocoaLumberjack, CocoaLumberjackSwift, CocoaLumberjack-iOS and CocoaLumberjackSwift-iOS targets. CocoaLumberjack(Swift)-watchOS targets already had this option set. - 96b1dfd Silence the Xcode 7 upgrade check. Similar change was done in aee0707
There was a comment, in line 55 indicating that the block would be called twice for every log. Appearantly this isn't the case anymore. Note: I do not fully understand what is going on there and why the behavior seems to have changed. I only observed the current behavior to be that the block is called exactly once for every log. @bpoplauschi please double check this commit
Merge master back into swift_2.0
…_2.0 Fix CI failures
Conflicts: Classes/CocoaLumberjack.swift Classes/DDLog.m
|
Well seems like the 2.0.2 release was made before this, so we may not need a separate branch for Xcode 6.x support (yet). |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merging the
swift_2.0branch intomasterbefore creating a Beta release