Commit 46c26b0e authored by Samuel E. Giddins's avatar Samuel E. Giddins

Merge pull request #4524 from dnkoutso/master

Undo tracking of .def files as sources
parents 6923c978 c2b18b39
...@@ -12,8 +12,9 @@ To install release candidates run `[sudo] gem install cocoapods --pre` ...@@ -12,8 +12,9 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
[Muhammed Yavuz Nuzumlalı](https://github.com/manuyavuz) [Muhammed Yavuz Nuzumlalı](https://github.com/manuyavuz)
* Add support to track `.def` sources. * Add support to track `.def` sources.
* Add support to track `.def` files as headers.
[Dimitris Koutsogiorgas](https://github.com/dnkoutso) [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
[#4490](https://github.com/CocoaPods/CocoaPods/pull/4490) [#338](https://github.com/CocoaPods/Xcodeproj/pull/338)
* `Pod::Installer::PostInstallHooksContext` now offers access to the `sandbox` * `Pod::Installer::PostInstallHooksContext` now offers access to the `sandbox`
object. object.
......
...@@ -24,7 +24,7 @@ GIT ...@@ -24,7 +24,7 @@ GIT
GIT GIT
remote: https://github.com/CocoaPods/Xcodeproj.git remote: https://github.com/CocoaPods/Xcodeproj.git
revision: 7a3d0c6520d995353b7ec09c4585aebf43e6c613 revision: f7d31a59aa080c24fd50cbb66b50ee30ddf52a50
branch: master branch: master
specs: specs:
xcodeproj (0.28.2) xcodeproj (0.28.2)
...@@ -99,7 +99,7 @@ PATH ...@@ -99,7 +99,7 @@ PATH
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
activesupport (4.2.4) activesupport (4.2.5)
i18n (~> 0.7) i18n (~> 0.7)
json (~> 1.7, >= 1.7.7) json (~> 1.7, >= 1.7.7)
minitest (~> 5.1) minitest (~> 5.1)
......
...@@ -8,7 +8,7 @@ module Pod ...@@ -8,7 +8,7 @@ module Pod
# #
class FileAccessor class FileAccessor
HEADER_EXTENSIONS = Xcodeproj::Constants::HEADER_FILES_EXTENSIONS HEADER_EXTENSIONS = Xcodeproj::Constants::HEADER_FILES_EXTENSIONS
SOURCE_FILE_EXTENSIONS = (%w(.m .mm .i .c .cc .cxx .cpp .c++ .swift .def) + HEADER_EXTENSIONS).uniq.freeze SOURCE_FILE_EXTENSIONS = (%w(.m .mm .i .c .cc .cxx .cpp .c++ .swift) + HEADER_EXTENSIONS).uniq.freeze
GLOB_PATTERNS = { GLOB_PATTERNS = {
:readme => 'readme{*,.*}'.freeze, :readme => 'readme{*,.*}'.freeze,
......
...@@ -237,7 +237,7 @@ module Pod ...@@ -237,7 +237,7 @@ module Pod
file_patterns = ['Classes/*.{h,m,d}', 'Vendor', 'framework/Source/*.h'] file_patterns = ['Classes/*.{h,m,d}', 'Vendor', 'framework/Source/*.h']
options = { options = {
:exclude_patterns => ['Classes/**/osx/**/*', 'Resources/**/osx/**/*'], :exclude_patterns => ['Classes/**/osx/**/*', 'Resources/**/osx/**/*'],
:dir_pattern => '*{.m,.mm,.i,.c,.cc,.cxx,.cpp,.c++,.swift,.def,.h,.hh,.hpp,.ipp,.tpp,.hxx}', :dir_pattern => '*{.m,.mm,.i,.c,.cc,.cxx,.cpp,.c++,.swift,.h,.hh,.hpp,.ipp,.tpp,.hxx,.def}',
:include_dirs => false, :include_dirs => false,
} }
@spec.exclude_files = options[:exclude_patterns] @spec.exclude_files = options[:exclude_patterns]
......
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