Skip to content

Commit

Permalink
englishification for swift branch
Browse files Browse the repository at this point in the history
  • Loading branch information
orta authored and mrackwitz committed Dec 25, 2014
1 parent 573e026 commit 275d3f4
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 14 deletions.
23 changes: 12 additions & 11 deletions CHANGELOG.md
Expand Up @@ -8,16 +8,16 @@ To install release candidates run `[sudo] gem install cocoapods --pre`

##### Highlighted Enhancement That Needs Testing

* Support Frameworks & Swift: This allows the creation of pods that contain Swift.
CocoaPods now recognizes Swift source files and builds dynamic frameworks when
necessary.
As soon as a project explicitly opts-in to `use_frameworks!` in the Podfile, or
if any dependency contains Swift, all pods for that target will be integrated
as frameworks.
As a pod author, you can change the name of the built framework by specifying a
`module_name` in the podspec. The built frameworks are embedded into the host
application with a new shell script build phase in the user project to allow
for configuration-dependent pods.
* Support Frameworks & Swift: CocoaPods now recognizes Swift source files and
builds dynamic frameworks when necessary. A project can explicitly
opt-in via `use_frameworks!` in the Podfile, or if any dependency contains
Swift code, 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
specifying a `module_name` in the podspec. The built frameworks are embedded into
the host application with a new shell script build phase in the user's
project allowing configuration-dependent pods.

[Marius Rackwitz](https://github.com/mrackwitz)
[#2835](https://github.com/CocoaPods/CocoaPods/issues/2835)

Expand All @@ -26,7 +26,8 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
* Bundle Resources into Frameworks: Previously all resources were compiled and
copied into the `mainBundle`. Now Pods have to use
`[NSBundle bundleForClass:<#Class from Pod#>]` to access provided resources
relative to the bundle.
relative to the bundle.

[Boris Bügling](https://github.com/neonichu)
[#2835](https://github.com/CocoaPods/CocoaPods/issues/2730)

Expand Down
2 changes: 1 addition & 1 deletion lib/cocoapods/generator/module_map.rb
@@ -1,7 +1,7 @@
module Pod
module Generator
# 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
# with existing headers of the podspec.
#
Expand Down
2 changes: 1 addition & 1 deletion lib/cocoapods/generator/xcconfig/aggregate_xcconfig.rb
Expand Up @@ -69,7 +69,7 @@ def generate
# Make headers discoverable from $PODS_ROOT/Headers directory
header_search_paths = target.sandbox.public_headers.search_paths(target.platform)
build_settings = {
# by `import "…"`
# by `#import "…"`
'HEADER_SEARCH_PATHS' => XCConfigHelper.quote(header_search_paths),
# by `#import <…>`
'OTHER_CFLAGS' => '$(inherited) ' + XCConfigHelper.quote(header_search_paths, '-isystem')
Expand Down
Expand Up @@ -159,7 +159,7 @@ module Pod
script.read.should.include?('BananaLib.framework')
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(:requires_frameworks? => true)
@target.stubs(:requires_frameworks? => true)
Expand Down

0 comments on commit 275d3f4

Please sign in to comment.