Skip to content

C
cocoapods
Commit 96c6d8ba authored by Samuel Giddins's avatar Samuel Giddins
Browse files
Options

Merge pull request #5146 from markspanbroek/master 

Fix non-modular header errors for vendored frameworks.
parents e610bef2 0c61c9de
Expand all Show whitespace changes
Inline Side-by-side
Showing with 381 additions and 2 deletions
CHANGELOG.md
View file @ 96c6d8ba
...@@ -12,8 +12,11 @@ To install release candidates run `[sudo] gem install cocoapods --pre` ...@@ -12,8 +12,11 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
##### Bug Fixes ##### Bug Fixes
* None. * Headers from vendored frameworks no longer end up in the HEADER_SEARCH_PATH when
using frameworks. They are assumed to be already present as modular headers in the
framework itself.
[Mark Spanbroek](https://github.com/markspanbroek)
[#5146](https://github.com/CocoaPods/CocoaPods/pull/5146)
## 1.0.0.beta.7 (2016-04-15) ## 1.0.0.beta.7 (2016-04-15)
......
examples/Vendored Framework Example/Example Pods/VendoredFrameworkExample.podspec 0 → 100644
View file @ 96c6d8ba
Pod::Spec.new do |s|
s.name = "VendoredFrameworkExample"
s.version = "0.0.1"
s.summary = "Vendored Framework in a spec test pod."
s.description = "This spec specifies a vendored framework."
s.ios.deployment_target = '8.0'
s.homepage = "https://cocoapods.org"
s.license = { :type => "MIT", :file => "../../../../LICENSE" }
s.author = "Mark Spanbroek"
s.source = { :http => "https://github.com/AFNetworking/AFNetworking/releases/download/3.1.0/AFNetworking.framework.zip" }
s.ios.vendored_frameworks = "**/iOS/AFNetworking.framework"
end
examples/Vendored Framework Example/Examples.xcworkspace/contents.xcworkspacedata 0 → 100644
View file @ 96c6d8ba
<?xml version="1.0" encoding="UTF-8"?>
<Workspace
version = "1.0">
<FileRef
location = "group:Vendored Framework Example.xcodeproj">
</FileRef>
<FileRef
location = "group:Pods/Pods.xcodeproj">
</FileRef>
</Workspace>
examples/Vendored Framework Example/Podfile 0 → 100644
View file @ 96c6d8ba
platform :ios, '8.0'
use_frameworks!
workspace 'Examples.xcworkspace'
project 'Vendored Framework Example.xcodeproj'
target 'Vendored Framework Example' do
pod 'VendoredFrameworkExample', :podspec => 'Example Pods/VendoredFrameworkExample.podspec'
end
examples/Vendored Framework Example/Vendored Framework Example.xcodeproj/xcshareddata/xcschemes/Vendored Framework Example.xcscheme 0 → 100644
View file @ 96c6d8ba
<?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 = "5CAF4FE71CC1125900B44520"
BuildableName = "Vendored Framework Example.app"
BlueprintName = "Vendored Framework Example"
ReferencedContainer = "container:Vendored Framework Example.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 = "5CAF4FE71CC1125900B44520"
BuildableName = "Vendored Framework Example.app"
BlueprintName = "Vendored Framework Example"
ReferencedContainer = "container:Vendored Framework Example.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">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "5CAF4FE71CC1125900B44520"
BuildableName = "Vendored Framework Example.app"
BlueprintName = "Vendored Framework Example"
ReferencedContainer = "container:Vendored Framework Example.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "5CAF4FE71CC1125900B44520"
BuildableName = "Vendored Framework Example.app"
BlueprintName = "Vendored Framework Example"
ReferencedContainer = "container:Vendored Framework Example.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
examples/Vendored Framework Example/Vendored Framework Example/AppDelegate.swift 0 → 100644
View file @ 96c6d8ba
//
// AppDelegate.swift
// Vendored Framework Example
//
// Created by Mark Spanbroek on 15/04/16.
// Copyright © 2016 CocoaPods. All rights reserved.
//
import UIKit
@UIApplicationMain
class AppDelegate: UIResponder, UIApplicationDelegate {
var window: UIWindow?
func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
// Override point for customization after application launch.
return true
}
func applicationWillResignActive(application: UIApplication) {
// Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
// Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game.
}
func applicationDidEnterBackground(application: UIApplication) {
// Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
// If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
}
func applicationWillEnterForeground(application: UIApplication) {
// Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background.
}
func applicationDidBecomeActive(application: UIApplication) {
// Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
}
func applicationWillTerminate(application: UIApplication) {
// Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
}
}
examples/Vendored Framework Example/Vendored Framework Example/Assets.xcassets/AppIcon.appiconset/Contents.json 0 → 100644
View file @ 96c6d8ba
{
"images" : [
{
"idiom" : "iphone",
"size" : "29x29",
"scale" : "2x"
},
{
"idiom" : "iphone",
"size" : "29x29",
"scale" : "3x"
},
{
"idiom" : "iphone",
"size" : "40x40",
"scale" : "2x"
},
{
"idiom" : "iphone",
"size" : "40x40",
"scale" : "3x"
},
{
"idiom" : "iphone",
"size" : "60x60",
"scale" : "2x"
},
{
"idiom" : "iphone",
"size" : "60x60",
"scale" : "3x"
},
{
"idiom" : "ipad",
"size" : "29x29",
"scale" : "1x"
},
{
"idiom" : "ipad",
"size" : "29x29",
"scale" : "2x"
},
{
"idiom" : "ipad",
"size" : "40x40",
"scale" : "1x"
},
{
"idiom" : "ipad",
"size" : "40x40",
"scale" : "2x"
},
{
"idiom" : "ipad",
"size" : "76x76",
"scale" : "1x"
},
{
"idiom" : "ipad",
"size" : "76x76",
"scale" : "2x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
examples/Vendored Framework Example/Vendored Framework Example/Base.lproj/LaunchScreen.storyboard 0 → 100644
View file @ 96c6d8ba
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10116" systemVersion="15E65" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM">
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
</dependencies>
<scenes>
<!--View Controller-->
<scene sceneID="EHf-IW-A2E">
<objects>
<viewController id="01J-lp-oVM" sceneMemberID="viewController">
<layoutGuides>
<viewControllerLayoutGuide type="top" id="Llm-lL-Icb"/>
<viewControllerLayoutGuide type="bottom" id="xb3-aO-Qok"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
</view>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="53" y="375"/>
</scene>
</scenes>
</document>
examples/Vendored Framework Example/Vendored Framework Example/Base.lproj/Main.storyboard 0 → 100644
View file @ 96c6d8ba
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10116" systemVersion="15E65" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="BYZ-38-t0r">
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
</dependencies>
<scenes>
<!--View Controller-->
<scene sceneID="tne-QT-ifu">
<objects>
<viewController id="BYZ-38-t0r" customClass="ViewController" customModule="Vendored_Framework_Example" customModuleProvider="target" sceneMemberID="viewController">
<layoutGuides>
<viewControllerLayoutGuide type="top" id="y3c-jy-aDJ"/>
<viewControllerLayoutGuide type="bottom" id="wfy-db-euE"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
</view>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
</objects>
</scene>
</scenes>
</document>
examples/Vendored Framework Example/Vendored Framework Example/Info.plist 0 → 100644
View file @ 96c6d8ba
<?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>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>LSRequiresIPhoneOS</key>
<true/>
<key>UILaunchStoryboardName</key>
<string>LaunchScreen</string>
<key>UIMainStoryboardFile</key>
<string>Main</string>
<key>UIRequiredDeviceCapabilities</key>
<array>
<string>armv7</string>
</array>
<key>UISupportedInterfaceOrientations</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
</array>
<key>UISupportedInterfaceOrientations~ipad</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
<string>UIInterfaceOrientationPortraitUpsideDown</string>
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
</array>
</dict>
</plist>
examples/Vendored Framework Example/Vendored Framework Example/ViewController.swift 0 → 100644
View file @ 96c6d8ba
//
// ViewController.swift
// Vendored Framework Example
//
// Created by Mark Spanbroek on 15/04/16.
// Copyright © 2016 CocoaPods. All rights reserved.
//
import UIKit
import AFNetworking
class ViewController: UIViewController {
override func viewDidLoad() {
super.viewDidLoad()
// Do any additional setup after loading the view, typically from a nib.
}
override func didReceiveMemoryWarning() {
super.didReceiveMemoryWarning()
// Dispose of any resources that can be recreated.
}
}
lib/cocoapods/installer/file_references_installer.rb
View file @ 96c6d8ba
...@@ -135,6 +135,7 @@ module Pod ...@@ -135,6 +135,7 @@ module Pod
end end
end end
unless pod_target.requires_frameworks?
vendored_frameworks_header_mappings(headers_sandbox, file_accessor).each do |namespaced_path, files| vendored_frameworks_header_mappings(headers_sandbox, file_accessor).each do |namespaced_path, files|
sandbox.public_headers.add_files(namespaced_path, files) sandbox.public_headers.add_files(namespaced_path, files)
end end
...@@ -142,6 +143,7 @@ module Pod ...@@ -142,6 +143,7 @@ module Pod
end end
end end
end end
end
#-----------------------------------------------------------------------# #-----------------------------------------------------------------------#
......
spec/unit/installer/file_references_installer_spec.rb
View file @ 96c6d8ba
...@@ -106,6 +106,14 @@ module Pod ...@@ -106,6 +106,14 @@ module Pod
monkey_header = headers_root + 'monkey/monkey.h' monkey_header = headers_root + 'monkey/monkey.h'
monkey_header.should.exist monkey_header.should.exist
end end
it "doesn't link public headers from vendored framework, when frameworks required" do
Target.any_instance.stubs(:requires_frameworks?).returns(true)
@installer.install!
headers_root = config.sandbox.public_headers.root
framework_header = headers_root + 'BananaLib/Bananalib/Bananalib.h'
framework_header.should.not.exist
end
end end
#-------------------------------------------------------------------------# #-------------------------------------------------------------------------#
......
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