Add capabilities for detecting app extensions and host targets #382
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -416,6 +416,19 @@ class PBXNativeTarget < AbstractTarget | |
| # @!group Helpers | ||
| #--------------------------------------# | ||
|
|
||
| # Checks product_type to determine whether or not the recevier is a | ||
| # an app extension | ||
| # | ||
| # @return True if the target would be an extension embedded in an | ||
| # app target, otherwise false | ||
| # | ||
| # @note watchOS 2 extensions are extensions of a watch target, not | ||
| # an app target, whereas this is not the case for watchOS 1 | ||
| def app_extension? | ||
|
There was a problem hiding this comment. I believe there's already a helper for this? There was a problem hiding this comment. Oh I see there's There was a problem hiding this comment. That naming (and maybe this method) is more targeted toward how it's going to be used in CocoaPods. Maybe this should just be a method/helper on There was a problem hiding this comment. yeah, this feels like it belongs in CocoaPods There was a problem hiding this comment. I agree with @segiddins @benasher44 you're correct that watchOS 2 extensions need their frameworks embedded, because the binaries are build for a different architecture. There was a problem hiding this comment. Okie doke. Thanks! I'll refactor and update soon. |
||
| extension_types = Set.new [:app_extension, :watch_extension] | ||
| extension_types.include? symbol_type | ||
| end | ||
|
|
||
| # @return [Symbol] The type of the target expressed as a symbol. | ||
| # | ||
| def symbol_type | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| { | ||
| "images" : [ | ||
| { | ||
| "size" : "24x24", | ||
| "idiom" : "watch", | ||
| "scale" : "2x", | ||
| "role" : "notificationCenter", | ||
| "subtype" : "38mm" | ||
| }, | ||
| { | ||
| "size" : "27.5x27.5", | ||
| "idiom" : "watch", | ||
| "scale" : "2x", | ||
| "role" : "notificationCenter", | ||
| "subtype" : "42mm" | ||
| }, | ||
| { | ||
| "size" : "29x29", | ||
| "idiom" : "watch", | ||
| "role" : "companionSettings", | ||
| "scale" : "2x" | ||
| }, | ||
| { | ||
| "size" : "29x29", | ||
| "idiom" : "watch", | ||
| "role" : "companionSettings", | ||
| "scale" : "3x" | ||
| }, | ||
| { | ||
| "size" : "40x40", | ||
| "idiom" : "watch", | ||
| "scale" : "2x", | ||
| "role" : "appLauncher", | ||
| "subtype" : "38mm" | ||
| }, | ||
| { | ||
| "size" : "44x44", | ||
| "idiom" : "watch", | ||
| "scale" : "2x", | ||
| "role" : "longLook", | ||
| "subtype" : "42mm" | ||
| }, | ||
| { | ||
| "size" : "86x86", | ||
| "idiom" : "watch", | ||
| "scale" : "2x", | ||
| "role" : "quickLook", | ||
| "subtype" : "38mm" | ||
| }, | ||
| { | ||
| "size" : "98x98", | ||
| "idiom" : "watch", | ||
| "scale" : "2x", | ||
| "role" : "quickLook", | ||
| "subtype" : "42mm" | ||
| } | ||
| ], | ||
| "info" : { | ||
| "version" : 1, | ||
| "author" : "xcode" | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| <?xml version="1.0" encoding="UTF-8" standalone="no"?> | ||
| <document type="com.apple.InterfaceBuilder.WatchKit.Storyboard" version="3.0" toolsVersion="6221" systemVersion="13E28" targetRuntime="watchKit" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="AgC-eL-Hgc"> | ||
| <dependencies> | ||
| <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6213"/> | ||
| <plugIn identifier="com.apple.InterfaceBuilder.IBWatchKitPlugin" version="3733"/> | ||
| </dependencies> | ||
| <scenes> | ||
| <!--Interface Controller--> | ||
| <scene sceneID="aou-V4-d1y"> | ||
| <objects> | ||
| <controller id="AgC-eL-Hgc" customClass="InterfaceController" customModuleProvider="target"/> | ||
| </objects> | ||
| </scene> | ||
| </scenes> | ||
| </document> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> | ||
| <plist version="1.0"> | ||
| <dict> | ||
| <key>CFBundleDevelopmentRegion</key> | ||
| <string>en</string> | ||
| <key>CFBundleDisplayName</key> | ||
| <string>Extensions</string> | ||
| <key>CFBundleExecutable</key> | ||
| <string>$(EXECUTABLE_NAME)</string> | ||
| <key>CFBundleIdentifier</key> | ||
| <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string> | ||
| <key>CFBundleInfoDictionaryVersion</key> | ||
| <string>6.0</string> | ||
| <key>CFBundleName</key> | ||
| <string>$(PRODUCT_NAME)</string> | ||
| <key>CFBundlePackageType</key> | ||
| <string>APPL</string> | ||
| <key>CFBundleShortVersionString</key> | ||
| <string>1.0</string> | ||
| <key>CFBundleSignature</key> | ||
| <string>????</string> | ||
| <key>CFBundleVersion</key> | ||
| <string>1</string> | ||
| <key>UISupportedInterfaceOrientations</key> | ||
| <array> | ||
| <string>UIInterfaceOrientationPortrait</string> | ||
| <string>UIInterfaceOrientationPortraitUpsideDown</string> | ||
| </array> | ||
| <key>WKCompanionAppBundleIdentifier</key> | ||
| <string>cocoapods.Extensions</string> | ||
| <key>WKWatchKitApp</key> | ||
| <true/> | ||
| </dict> | ||
| </plist> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| Did you know that git does not support storing empty directories? |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> | ||
| <plist version="1.0"> | ||
| <dict> | ||
| <key>CFBundleDevelopmentRegion</key> | ||
| <string>en</string> | ||
| <key>CFBundleDisplayName</key> | ||
| <string>Extensions WatchKit 1 Extension</string> | ||
| <key>CFBundleExecutable</key> | ||
| <string>$(EXECUTABLE_NAME)</string> | ||
| <key>CFBundleIdentifier</key> | ||
| <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string> | ||
| <key>CFBundleInfoDictionaryVersion</key> | ||
| <string>6.0</string> | ||
| <key>CFBundleName</key> | ||
| <string>$(PRODUCT_NAME)</string> | ||
| <key>CFBundlePackageType</key> | ||
| <string>XPC!</string> | ||
| <key>CFBundleShortVersionString</key> | ||
| <string>1.0</string> | ||
| <key>CFBundleSignature</key> | ||
| <string>????</string> | ||
| <key>CFBundleVersion</key> | ||
| <string>1</string> | ||
| <key>NSExtension</key> | ||
| <dict> | ||
| <key>NSExtensionAttributes</key> | ||
| <dict> | ||
| <key>WKAppBundleIdentifier</key> | ||
| <string>cocoapods.Extensions.watchkitapp</string> | ||
| </dict> | ||
| <key>NSExtensionPointIdentifier</key> | ||
| <string>com.apple.watchkit</string> | ||
| </dict> | ||
| </dict> | ||
| </plist> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| // | ||
| // InterfaceController.swift | ||
| // Extensions WatchKit 1 Extension | ||
| // | ||
| // Created by Benjamin Asher on 4/9/16. | ||
| // Copyright © 2016 CocoaPods. All rights reserved. | ||
| // | ||
|
|
||
| import WatchKit | ||
| import Foundation | ||
|
|
||
|
|
||
| class InterfaceController: WKInterfaceController { | ||
|
|
||
| override func awakeWithContext(context: AnyObject?) { | ||
| super.awakeWithContext(context) | ||
|
|
||
| // Configure interface objects here. | ||
| } | ||
|
|
||
| override func willActivate() { | ||
| // This method is called when watch view controller is about to be visible to user | ||
| super.willActivate() | ||
| } | ||
|
|
||
| override func didDeactivate() { | ||
| // This method is called when watch view controller is no longer visible | ||
| super.didDeactivate() | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This will actually return an array