Skip to content

C
cocoapods
Commit 72a82296 authored by Ben Asher's avatar Ben Asher
Browse files
Options

Fixed watchOs build. Brought back destinations

parent d39d39cf
Show whitespace changes
Inline Side-by-side
Showing with 162 additions and 16 deletions
Rakefile
View file @ 72a82296
...@@ -260,8 +260,27 @@ begin ...@@ -260,8 +260,27 @@ begin
workspace = Xcodeproj::Workspace.new_from_xcworkspace(workspace_path) workspace = Xcodeproj::Workspace.new_from_xcworkspace(workspace_path)
workspace.schemes.each do |scheme_name, project_path| workspace.schemes.each do |scheme_name, project_path|
next if scheme_name == 'Pods' next if scheme_name == 'Pods'
next if project_path.end_with? 'Pods.xcodeproj'
puts " Building scheme: #{scheme_name}" puts " Building scheme: #{scheme_name}"
execute_command "xcodebuild -workspace '#{workspace_path}' -scheme '#{scheme_name}' clean build ONLY_ACTIVE_ARCH=NO"
project = Xcodeproj::Project.open(project_path)
target = project.targets.first
platform = target.platform_name
case platform
when :osx
execute_command "xcodebuild -workspace '#{workspace_path}' -scheme '#{scheme_name}' clean build"
when :ios
xcode_version = `xcodebuild -version`.scan(/Xcode (.*)\n/).first.first
major_version = xcode_version.split('.').first.to_i
# Specifically build against the simulator SDK so we don't have to deal with code signing.
simulator_name = major_version > 5 ? 'iPhone 6' : 'iPhone Retina (4-inch)'
execute_command "xcodebuild -workspace '#{workspace_path}' -scheme '#{scheme_name}' clean build ONLY_ACTIVE_ARCH=NO -destination 'platform=iOS Simulator,name=#{simulator_name}'"
when :watchos
execute_command "xcodebuild -workspace '#{workspace_path}' -scheme '#{scheme_name}' clean build ONLY_ACTIVE_ARCH=NO -destination 'platform=iOS Simulator,name=Apple Watch - 38mm'"
else
raise "Unknown platform #{platform}"
end
end end
end end
end end
......
examples/watchOS Example/watchOSsample.xcodeproj/xcshareddata/xcschemes/watchOSsample WatchKit App.xcscheme
View file @ 72a82296
...@@ -14,21 +14,7 @@ ...@@ -14,21 +14,7 @@
buildForAnalyzing = "YES"> buildForAnalyzing = "YES">
<BuildableReference <BuildableReference
BuildableIdentifier = "primary" BuildableIdentifier = "primary"
BlueprintIdentifier = "A129F8D11B2CA81600EBC1DD" BlueprintIdentifier = "A865B2791CAF18FF0031EFC6"
BuildableName = "watchOSsample WatchKit App.app"
BlueprintName = "watchOSsample WatchKit App"
ReferencedContainer = "container:watchOSsample.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "A129F8E01B2CA81600EBC1DD"
BuildableName = "watchOSsample WatchKit Extension.appex" BuildableName = "watchOSsample WatchKit Extension.appex"
BlueprintName = "watchOSsample WatchKit Extension" BlueprintName = "watchOSsample WatchKit Extension"
ReferencedContainer = "container:watchOSsample.xcodeproj"> ReferencedContainer = "container:watchOSsample.xcodeproj">
......
examples/watchOS Example/watchOSsample.xcodeproj/xcshareddata/xcschemes/watchOSsample WatchKit.xcscheme 0 → 100644
View file @ 72a82296
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0730"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "A865B26D1CAF18FF0031EFC6"
BuildableName = "watchOSsample WatchKit.app"
BlueprintName = "watchOSsample WatchKit"
ReferencedContainer = "container:watchOSsample.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "A865B2791CAF18FF0031EFC6"
BuildableName = "watchOSsample WatchKit Extension.appex"
BlueprintName = "watchOSsample WatchKit Extension"
ReferencedContainer = "container:watchOSsample.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "A129F8BF1B2CA81600EBC1DD"
BuildableName = "watchOSsample.app"
BlueprintName = "watchOSsample"
ReferencedContainer = "container:watchOSsample.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "A865B26D1CAF18FF0031EFC6"
BuildableName = "watchOSsample WatchKit.app"
BlueprintName = "watchOSsample WatchKit"
ReferencedContainer = "container:watchOSsample.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<RemoteRunnable
runnableDebuggingMode = "2"
BundleIdentifier = "com.apple.carousel"
RemotePath = "/watchOSsample">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "A865B26D1CAF18FF0031EFC6"
BuildableName = "watchOSsample WatchKit.app"
BlueprintName = "watchOSsample WatchKit"
ReferencedContainer = "container:watchOSsample.xcodeproj">
</BuildableReference>
</RemoteRunnable>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "A865B26D1CAF18FF0031EFC6"
BuildableName = "watchOSsample WatchKit.app"
BlueprintName = "watchOSsample WatchKit"
ReferencedContainer = "container:watchOSsample.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<RemoteRunnable
runnableDebuggingMode = "2"
BundleIdentifier = "com.apple.carousel"
RemotePath = "/watchOSsample">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "A865B26D1CAF18FF0031EFC6"
BuildableName = "watchOSsample WatchKit.app"
BlueprintName = "watchOSsample WatchKit"
ReferencedContainer = "container:watchOSsample.xcodeproj">
</BuildableReference>
</RemoteRunnable>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "A865B26D1CAF18FF0031EFC6"
BuildableName = "watchOSsample WatchKit.app"
BlueprintName = "watchOSsample WatchKit"
ReferencedContainer = "container:watchOSsample.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment