Skip to content

Commit

Permalink
Merge pull request #6543 from dnkoutso/watchos_resources
Browse files Browse the repository at this point in the history
Properly compile storyboard for watch device family
  • Loading branch information
benasher44 committed Mar 12, 2017
2 parents 697d780 + 5996d71 commit 9d078b8
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 2 deletions.
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ To install release candidates run `[sudo] gem install cocoapods --pre`

##### Bug Fixes

* None.
* Properly compile storyboard for watch device family.
[Dimitris Koutsogiorgas](https://github.com/dnkoutso)
[#6516](https://github.com/CocoaPods/CocoaPods/issues/6516)


## 1.2.1.beta.1 (2017-03-08)
Expand Down
3 changes: 3 additions & 0 deletions lib/cocoapods/generator/copy_resources_script.rb
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,9 @@ def script
3)
TARGET_DEVICE_ARGS="--target-device tv"
;;
4)
TARGET_DEVICE_ARGS="--target-device watch"
;;
*)
TARGET_DEVICE_ARGS="--target-device mac"
;;
Expand Down
2 changes: 1 addition & 1 deletion spec/cocoapods-integration-specs
Submodule cocoapods-integration-specs updated 31 files
+3 −0 install_add_pod/after/Pods/Target Support Files/Pods-SampleApp/Pods-SampleApp-resources.sh
+3 −0 ...r_subspec_dependency/after/Pods/Target Support Files/Pods-SubSpecCircular/Pods-SubSpecCircular-resources.sh
+3 −0 install_custom_build_configuration/after/Pods/Target Support Files/Pods-SampleApp/Pods-SampleApp-resources.sh
+3 −0 install_custom_module_map/after/Pods/Target Support Files/Pods-Example/Pods-Example-resources.sh
+3 −0 install_custom_module_name/after/Pods/Target Support Files/Pods-Example/Pods-Example-resources.sh
+3 −0 install_custom_workspace/after/Pods/Target Support Files/Pods-SampleApp_1/Pods-SampleApp_1-resources.sh
+3 −0 install_custom_workspace/after/Pods/Target Support Files/Pods-SampleApp_2/Pods-SampleApp_2-resources.sh
+3 −0 install_external_source/after/Pods/Target Support Files/Pods-iOS App/Pods-iOS App-resources.sh
+3 −0 install_framework_resources/after/Pods/Target Support Files/Pods-SampleApp/Pods-SampleApp-resources.sh
+3 −0 ...ll_framework_resources/after/Pods/Target Support Files/Pods-SampleAppTests/Pods-SampleAppTests-resources.sh
+3 −0 install_local_source/after/Pods/Target Support Files/Pods-iOS App/Pods-iOS App-resources.sh
+3 −0 install_multiple_targets/after/Pods/Target Support Files/Pods-SampleApp/Pods-SampleApp-resources.sh
+3 −0 install_multiple_targets/after/Pods/Target Support Files/Pods-SampleAppTests/Pods-SampleAppTests-resources.sh
+3 −0 install_multiple_targets/after/Pods/Target Support Files/Pods-SampleApp_2/Pods-SampleApp_2-resources.sh
+3 −0 install_new/after/Pods/Target Support Files/Pods-SampleApp/Pods-SampleApp-resources.sh
+3 −0 install_no_dependencies/after/Pods/Target Support Files/Pods-SampleApp/Pods-SampleApp-resources.sh
+3 −0 install_non_objective_c_files/after/Pods/Target Support Files/Pods-SampleApp/Pods-SampleApp-resources.sh
+3 −0 install_podfile_callbacks/after/Pods/Target Support Files/Pods-SampleApp/Pods-SampleApp-resources.sh
+3 −0 install_podspec/after/Pods/Target Support Files/Pods-SampleApp/Pods-SampleApp-resources.sh
+3 −0 install_remove_pod/after/Pods/Target Support Files/Pods-SampleApp/Pods-SampleApp-resources.sh
+3 −0 install_resources/after/Pods/Target Support Files/Pods-SampleApp/Pods-SampleApp-resources.sh
+3 −0 install_resources_no_source_files/after/Pods/Target Support Files/Pods-SampleApp/Pods-SampleApp-resources.sh
+3 −0 install_search_paths_inheritance/after/Pods/Target Support Files/Pods-App/Pods-App-resources.sh
+3 −0 install_search_paths_inheritance/after/Pods/Target Support Files/Pods-Test/Pods-Test-resources.sh
+3 −0 install_subspecs/after/Pods/Target Support Files/Pods-OS X App/Pods-OS X App-resources.sh
+3 −0 install_subspecs/after/Pods/Target Support Files/Pods-iOS App/Pods-iOS App-resources.sh
+3 −0 install_subspecs_no_duplicate_prefix/after/Pods/Target Support Files/Pods-iOS App/Pods-iOS App-resources.sh
+3 −0 install_using_checkout_options/after/Pods/Target Support Files/Pods-SampleApp/Pods-SampleApp-resources.sh
+3 −0 install_vendored_dynamic_framework/after/Pods/Target Support Files/Pods-SampleApp/Pods-SampleApp-resources.sh
+3 −0 update_all/after/Pods/Target Support Files/Pods-SampleApp/Pods-SampleApp-resources.sh
+3 −0 update_selected/after/Pods/Target Support Files/Pods-SampleApp/Pods-SampleApp-resources.sh

0 comments on commit 9d078b8

Please sign in to comment.