Merge branch 'nerdishbynature-all-platforms'

luisobo · Jul 1, 2016 · e325d9b · e325d9b
2 parents 56fd6ef + cc0e937
commit e325d9b
Show file tree

Hide file tree

Showing 7 changed files with 541 additions and 14 deletions.
diff --git a/Nocilla.podspec b/Nocilla.podspec
@@ -11,6 +11,7 @@ Pod::Spec.new do |s|
 
   s.ios.deployment_target = '4.0'
   s.osx.deployment_target = '10.7'
+  s.tvos.deployment_target = '9.0'
 
   s.source_files = 'Nocilla/**/*.{h,m}'
 

diff --git a/Nocilla.xcodeproj/project.pbxproj b/Nocilla.xcodeproj/project.pbxproj
diff --git a/Nocilla.xcodeproj/xcshareddata/xcschemes/Nocilla.xcscheme b/Nocilla.xcodeproj/xcshareddata/xcschemes/Nocilla.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0500"
+   LastUpgradeVersion = "0730"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -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">
@@ -53,15 +53,18 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
+      <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
@@ -81,10 +84,10 @@
       </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
+      buildConfiguration = "Release"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
       debugDocumentVersioning = "YES">
    </ProfileAction>
    <AnalyzeAction

diff --git a/Nocilla/Info.plist b/Nocilla/Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.luissolano.$(PRODUCT_NAME:rfc1034identifier)</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>

diff --git a/NocillaTests/NocillaTests-Info.plist b/NocillaTests/NocillaTests-Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.luissolano.${PRODUCT_NAME:rfc1034identifier}</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundlePackageType</key>

diff --git a/Podfile b/Podfile
@@ -5,7 +5,6 @@ platform :ios, '9.0'
 project 'Nocilla'
 
 target :NocillaTests do
-   inhibit_all_warnings!
    inherit! :search_paths
 
    pod 'MKNetworkKit', '~> 0.87'

diff --git a/Podfile.lock b/Podfile.lock
@@ -60,6 +60,6 @@ SPEC CHECKSUMS:
   MKNetworkKit: 60ad3c83b62183e40ba75ce772c9427c25b520de
   Reachability: dd9aa4fb6667b9f787690a74f53cb7634ce99893
 
-PODFILE CHECKSUM: 503d521ec379d1e924b8e6ea90166193c2cf04c8
+PODFILE CHECKSUM: 6845bdf1d8a193a8186fdae487e0615d7037f7ba
 
 COCOAPODS: 1.0.1