Commit 275d3f40 authored by Orta Therox's avatar Orta Therox Committed by Marius Rackwitz

englishification for swift branch

parent 573e0267
...@@ -8,16 +8,16 @@ To install release candidates run `[sudo] gem install cocoapods --pre` ...@@ -8,16 +8,16 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
##### Highlighted Enhancement That Needs Testing ##### Highlighted Enhancement That Needs Testing
* Support Frameworks & Swift: This allows the creation of pods that contain Swift. * Support Frameworks & Swift: CocoaPods now recognizes Swift source files and
CocoaPods now recognizes Swift source files and builds dynamic frameworks when builds dynamic frameworks when necessary. A project can explicitly
necessary. opt-in via `use_frameworks!` in the Podfile, or if any dependency contains
As soon as a project explicitly opts-in to `use_frameworks!` in the Podfile, or Swift code, all pods for that target will be integrated as frameworks.
if any dependency contains Swift, all pods for that target will be integrated
as frameworks. As a pod author, you can change the module name of the built framework by
As a pod author, you can change the name of the built framework by specifying a specifying a `module_name` in the podspec. The built frameworks are embedded into
`module_name` in the podspec. The built frameworks are embedded into the host the host application with a new shell script build phase in the user's
application with a new shell script build phase in the user project to allow project allowing configuration-dependent pods.
for configuration-dependent pods.
[Marius Rackwitz](https://github.com/mrackwitz) [Marius Rackwitz](https://github.com/mrackwitz)
[#2835](https://github.com/CocoaPods/CocoaPods/issues/2835) [#2835](https://github.com/CocoaPods/CocoaPods/issues/2835)
...@@ -26,7 +26,8 @@ To install release candidates run `[sudo] gem install cocoapods --pre` ...@@ -26,7 +26,8 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
* Bundle Resources into Frameworks: Previously all resources were compiled and * Bundle Resources into Frameworks: Previously all resources were compiled and
copied into the `mainBundle`. Now Pods have to use copied into the `mainBundle`. Now Pods have to use
`[NSBundle bundleForClass:<#Class from Pod#>]` to access provided resources `[NSBundle bundleForClass:<#Class from Pod#>]` to access provided resources
relative to the bundle. relative to the bundle.
[Boris Bügling](https://github.com/neonichu) [Boris Bügling](https://github.com/neonichu)
[#2835](https://github.com/CocoaPods/CocoaPods/issues/2730) [#2835](https://github.com/CocoaPods/CocoaPods/issues/2730)
......
module Pod module Pod
module Generator module Generator
# Generates LLVM module map files. A module map file is generated for each # Generates LLVM module map files. A module map file is generated for each
# Pod and for each Pod target definition that is built as framework. It # Pod and for each Pod target definition that is built as a framework. It
# specifies a different umbrella header than usual to avoid name conflicts # specifies a different umbrella header than usual to avoid name conflicts
# with existing headers of the podspec. # with existing headers of the podspec.
# #
......
...@@ -69,7 +69,7 @@ module Pod ...@@ -69,7 +69,7 @@ module Pod
# Make headers discoverable from $PODS_ROOT/Headers directory # Make headers discoverable from $PODS_ROOT/Headers directory
header_search_paths = target.sandbox.public_headers.search_paths(target.platform) header_search_paths = target.sandbox.public_headers.search_paths(target.platform)
build_settings = { build_settings = {
# by `import "…"` # by `#import "…"`
'HEADER_SEARCH_PATHS' => XCConfigHelper.quote(header_search_paths), 'HEADER_SEARCH_PATHS' => XCConfigHelper.quote(header_search_paths),
# by `#import <…>` # by `#import <…>`
'OTHER_CFLAGS' => '$(inherited) ' + XCConfigHelper.quote(header_search_paths, '-isystem') 'OTHER_CFLAGS' => '$(inherited) ' + XCConfigHelper.quote(header_search_paths, '-isystem')
......
...@@ -159,7 +159,7 @@ module Pod ...@@ -159,7 +159,7 @@ module Pod
script.read.should.include?('BananaLib.framework') script.read.should.include?('BananaLib.framework')
end end
it 'does not add pods to the embed frameworks script if they are not to be build' do it 'does not add pods to the embed frameworks script if they are not to be built' do
@pod_target.stubs(:should_build? => false) @pod_target.stubs(:should_build? => false)
@pod_target.stubs(:requires_frameworks? => true) @pod_target.stubs(:requires_frameworks? => true)
@target.stubs(:requires_frameworks? => true) @target.stubs(:requires_frameworks? => true)
......
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