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
275d3f40
Commit
275d3f40
authored
Dec 24, 2014
by
Orta Therox
Committed by
Marius Rackwitz
Dec 25, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
englishification for swift branch
parent
573e0267
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
14 deletions
+15
-14
CHANGELOG.md
CHANGELOG.md
+12
-11
module_map.rb
lib/cocoapods/generator/module_map.rb
+1
-1
aggregate_xcconfig.rb
lib/cocoapods/generator/xcconfig/aggregate_xcconfig.rb
+1
-1
aggregate_target_installer_spec.rb
...aller/target_installer/aggregate_target_installer_spec.rb
+1
-1
No files found.
CHANGELOG.md
View file @
275d3f40
...
...
@@ -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
)
...
...
@@ -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
)
...
...
lib/cocoapods/generator/module_map.rb
View file @
275d3f40
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.
#
...
...
lib/cocoapods/generator/xcconfig/aggregate_xcconfig.rb
View file @
275d3f40
...
...
@@ -69,7 +69,7 @@ module Pod
# 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'
)
...
...
spec/unit/installer/target_installer/aggregate_target_installer_spec.rb
View file @
275d3f40
...
...
@@ -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 buil
d
'
do
it
'does not add pods to the embed frameworks script if they are not to be buil
t
'
do
@pod_target
.
stubs
(
:should_build?
=>
false
)
@pod_target
.
stubs
(
:requires_frameworks?
=>
true
)
@target
.
stubs
(
:requires_frameworks?
=>
true
)
...
...
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