Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
C
cocoapods
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
gengmeiios
cocoapods
Commits
9d078b8b
Commit
9d078b8b
authored
Mar 12, 2017
by
Ben Asher
Committed by
GitHub
Mar 12, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #6543 from dnkoutso/watchos_resources
Properly compile storyboard for watch device family
parents
697d780d
5996d719
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
2 deletions
+7
-2
CHANGELOG.md
CHANGELOG.md
+3
-1
copy_resources_script.rb
lib/cocoapods/generator/copy_resources_script.rb
+3
-0
cocoapods-integration-specs
spec/cocoapods-integration-specs
+1
-1
No files found.
CHANGELOG.md
View file @
9d078b8b
...
...
@@ -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)
...
...
lib/cocoapods/generator/copy_resources_script.rb
View file @
9d078b8b
...
...
@@ -117,6 +117,9 @@ case "${TARGETED_DEVICE_FAMILY}" in
3)
TARGET_DEVICE_ARGS="--target-device tv"
;;
4)
TARGET_DEVICE_ARGS="--target-device watch"
;;
*)
TARGET_DEVICE_ARGS="--target-device mac"
;;
...
...
cocoapods-integration-specs
@
d19dc553
Subproject commit
29e64c27eff470779877e8ffc24fdaf707f261a
8
Subproject commit
d19dc55372c85e95e21ead19a9d34b589567308
8
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment