diff --git a/Frank.xcodeproj/project.pbxproj b/Frank.xcodeproj/project.pbxproj index e31b649..fe9ef49 100644 --- a/Frank.xcodeproj/project.pbxproj +++ b/Frank.xcodeproj/project.pbxproj @@ -1347,6 +1347,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = src/Frank_Prefix.pch; INSTALL_PATH = /usr/local/lib; + IPHONEOS_DEPLOYMENT_TARGET = 5.1.1; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "\"$(SRCROOT)/lib/PublicAutomation/build/$(CONFIGURATION)-$(PLATFORM_NAME)\"", @@ -1365,10 +1366,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; - ARCHS = ( - "$(ARCHS_STANDARD_32_BIT)", - armv6, - ); + ARCHS = "$(ARCHS_STANDARD)"; DSTROOT = /tmp/Frank.dst; GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -1391,7 +1389,7 @@ 1DEB922308733DC00010E9CD /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; + ARCHS = "$(ARCHS_STANDARD)"; GCC_C_LANGUAGE_STANDARD = c99; GCC_OPTIMIZATION_LEVEL = 0; GCC_WARN_ABOUT_RETURN_TYPE = YES; @@ -1405,7 +1403,7 @@ 1DEB922408733DC00010E9CD /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; + ARCHS = "$(ARCHS_STANDARD)"; GCC_C_LANGUAGE_STANDARD = c99; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; diff --git a/Frank.xcodeproj/xcshareddata/xcschemes/Frank.xcscheme b/Frank.xcodeproj/xcshareddata/xcschemes/Frank.xcscheme index 03a06d2..477cb19 100644 --- a/Frank.xcodeproj/xcshareddata/xcschemes/Frank.xcscheme +++ b/Frank.xcodeproj/xcshareddata/xcschemes/Frank.xcscheme @@ -67,6 +67,15 @@ ignoresPersistentStateOnLaunch = "NO" debugDocumentVersioning = "YES" allowLocationSimulation = "YES"> + + + + diff --git a/gem/frank-cucumber.gemspec b/gem/frank-cucumber.gemspec index ec0214d..ce8c68d 100644 --- a/gem/frank-cucumber.gemspec +++ b/gem/frank-cucumber.gemspec @@ -22,13 +22,13 @@ Gem::Specification.new do |s| s.add_dependency( "cucumber", ["~>1.3.10"] ) s.add_dependency( "rspec", ["~>2.14.1"] ) - s.add_dependency( "sim_launcher", ["~>0.4.6"] ) + s.add_dependency( "sim_launcher", ["~>0.5.0"] ) s.add_dependency( "i18n", ["~>0.6.9"] ) s.add_dependency( "plist", ["~>3.1.0"] ) s.add_dependency( "json", ["1.8.1"] ) # TODO: figure out how to be more permissive as to which JSON gems we allow s.add_dependency( "dnssd", ["~>2.0"] ) s.add_dependency( "thor", ["~>0.18.1"] ) - s.add_dependency( "xcodeproj", ["~>0.14.1"] ) + s.add_dependency( "xcodeproj", ["~>0.20.2"] ) s.add_development_dependency( "rr" ) s.add_development_dependency( "yard" ) diff --git a/gem/frank-skeleton/libCocoaAsyncSocket.a b/gem/frank-skeleton/libCocoaAsyncSocket.a index 3b5712d..e31d3de 100644 Binary files a/gem/frank-skeleton/libCocoaAsyncSocket.a and b/gem/frank-skeleton/libCocoaAsyncSocket.a differ diff --git a/gem/frank-skeleton/libCocoaAsyncSocketMac.a b/gem/frank-skeleton/libCocoaAsyncSocketMac.a index 358fec4..8befa28 100644 Binary files a/gem/frank-skeleton/libCocoaAsyncSocketMac.a and b/gem/frank-skeleton/libCocoaAsyncSocketMac.a differ diff --git a/gem/frank-skeleton/libCocoaHTTPServer.a b/gem/frank-skeleton/libCocoaHTTPServer.a index 3dba8e9..54fa799 100644 Binary files a/gem/frank-skeleton/libCocoaHTTPServer.a and b/gem/frank-skeleton/libCocoaHTTPServer.a differ diff --git a/gem/frank-skeleton/libCocoaHTTPServerMac.a b/gem/frank-skeleton/libCocoaHTTPServerMac.a index 1abd142..7ad2655 100644 Binary files a/gem/frank-skeleton/libCocoaHTTPServerMac.a and b/gem/frank-skeleton/libCocoaHTTPServerMac.a differ diff --git a/gem/frank-skeleton/libCocoaLumberjack.a b/gem/frank-skeleton/libCocoaLumberjack.a index 3fe7cab..0d512bd 100644 Binary files a/gem/frank-skeleton/libCocoaLumberjack.a and b/gem/frank-skeleton/libCocoaLumberjack.a differ diff --git a/gem/frank-skeleton/libCocoaLumberjackMac.a b/gem/frank-skeleton/libCocoaLumberjackMac.a index 8e21e55..e76c464 100644 Binary files a/gem/frank-skeleton/libCocoaLumberjackMac.a and b/gem/frank-skeleton/libCocoaLumberjackMac.a differ diff --git a/gem/frank-skeleton/libFrank.a b/gem/frank-skeleton/libFrank.a index 75cb2d1..b556312 100644 Binary files a/gem/frank-skeleton/libFrank.a and b/gem/frank-skeleton/libFrank.a differ diff --git a/gem/frank-skeleton/libFrankMac.a b/gem/frank-skeleton/libFrankMac.a index b459be9..06af6e4 100644 Binary files a/gem/frank-skeleton/libFrankMac.a and b/gem/frank-skeleton/libFrankMac.a differ diff --git a/gem/frank-skeleton/libShelley.a b/gem/frank-skeleton/libShelley.a index 3bc2295..e1dc213 100644 Binary files a/gem/frank-skeleton/libShelley.a and b/gem/frank-skeleton/libShelley.a differ