Skip to content

Commit

Permalink
Merge pull request #43 from Wolox/xcode7
Browse files Browse the repository at this point in the history
Xcode7
  • Loading branch information
Guido Marucci Blas committed Sep 23, 2015
2 parents 663020a + 2f068e8 commit 7cb4cf6
Show file tree
Hide file tree
Showing 30 changed files with 33 additions and 1,508 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
language: objective-c
osx_image: xcode6.4
osx_image: xcode7
script: script/cibuild
branches:
only:
Expand Down
3 changes: 1 addition & 2 deletions Cartfile
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
github "ReactiveCocoa/ReactiveCocoa" ~> 3.0.0
github "CocoaLumberjack/CocoaLumberjack" ~> 2.0.1
github "CocoaLumberjack/CocoaLumberjack" "swift_2.0"
2 changes: 1 addition & 1 deletion Cartfile.private
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
github "specta/specta" ~> 1.0.0
github "specta/specta" "master"
github "specta/expecta" ~> 1.0.1
7 changes: 2 additions & 5 deletions Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
github "robrix/Box" "1.2.2"
github "CocoaLumberjack/CocoaLumberjack" "2.0.1"
github "CocoaLumberjack/CocoaLumberjack" "479279f102a8ab23084290697bafa77aac0d1bdf"
github "specta/expecta" "v1.0.3"
github "specta/specta" "v1.0.3"
github "antitypical/Result" "0.4.4"
github "ReactiveCocoa/ReactiveCocoa" "v3.0.0"
github "specta/specta" "8f7ac2989d5ad953ded6c3c3668ee128cd2e5683"
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
GEM
remote: https://rubygems.org/
specs:
xcpretty (0.1.10)
xcpretty (0.1.12)

PLATFORMS
ruby
Expand Down
406 changes: 7 additions & 399 deletions WLXBluetoothDevice.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0630"
LastUpgradeVersion = "0700"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down Expand Up @@ -37,10 +37,10 @@
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
buildConfiguration = "Debug">
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO">
Expand All @@ -62,15 +62,18 @@
ReferencedContainer = "container:WLXBluetoothDevice.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
buildConfiguration = "Debug"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
Expand All @@ -85,10 +88,10 @@
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
buildConfiguration = "Release"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
Expand Down

This file was deleted.

2 changes: 1 addition & 1 deletion WLXBluetoothDevice/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>ar.com.wolox.$(PRODUCT_NAME:rfc1034identifier)</string>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
Expand Down
26 changes: 0 additions & 26 deletions WLXBluetoothDeviceReactiveExtensions/Info.plist

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 7cb4cf6

Please sign in to comment.