mirror of
https://github.com/Instagram/IGListKit
synced 2026-04-21 21:47:34 +00:00
c9e045c942
Summary: This diff imports and refines the PR made by cntrump on GitHub. The PR introduces the following: * Sample apps now use SPM instead of CocoaPods to import IGListKit. * Adds Mac Catalyst as an example target. * Adds C++ flags to the CocoaPods specs. * Fixes a script issue that was discovered when regenerating the symlinks. The PR originally aimed to remove the need for symlinked references to the IGListKit and IGListDiffKit source files, but in testing, I couldn't get it working. It's possible SPM being too strict [on where the headers can be placed to be discovered](https://forums.swift.org/t/how-do-i-specify-the-headers-directory-for-a-objc-target-in-swift-package-managers-package-swift/58531/3). Additionally, another issue was that the original PR changed all of the `#import` statements to the the modular `import` statements, which is fine for the sample apps, but ended up breaking compatibility for any apps that had modules disabled. ## Changes in this pull request Improve SwiftPM support: Build module `IGListDiffKit` and `IGListKit` as Objective-C++. module `IGListDiffKit`: - Source/IGListDiffKit - module defined in `Source/IGListDiffKit/modulemap/module.modulemap` - requires `-fmodules` and `-fcxx-modules` module `IGListKit`: - depend on `IGListDiffKit`, use `import IGListDiffKit;` - Source/IGListKit - module defined in `Source/IGListKit/modulemap/module.modulemap` - requires `-fmodules` and `-fcxx-modules` module `IGListSwiftKit`: - depend on `IGListKit`, use `import IGListKit` - Source/IGListSwiftKit Deleted `spm/` and `scripts/generate_spm_sources_layout.sh`, it is unnecessary. Updated `.podspec`, add `'OTHER_CFLAGS' => '-fmodules'` and `'OTHER_CPLUSPLUSFLAGS' => '-fcxx-modules'`. Add missing swift files for `IGListSwiftKit` in `IGListKit.xcodeproj` ### How to use Replace `#import <IGListDiffKit/IGListDiffKit.h>` with `import IGListDiffKit;`, because `IGListDiffKit.h` isn't exist in `modulemap/`, Or create a symbol link by `ln -sf ../IGListDiffKit.h` for support it ? ### Examples Use SwiftPM for building examples. ### Checklist - [x] All tests pass. Demo project builds and runs. - [x] I added tests, an experiment, or detailed why my change isn't tested. - [ ] I added an entry to the `CHANGELOG.md` for any breaking changes, enhancements, or bug fixes. - [x] I have reviewed the [contributing guide](https://github.com/Instagram/IGListKit/blob/master/.github/CONTRIBUTING.md) Pull Request resolved: https://github.com/Instagram/IGListKit/pull/1546 Test Plan: Test PR showing running tests: https://github.com/TimOliver/IGListKit/actions/runs/4339956050/jobs/7578047058 Reviewed By: lorixx Differential Revision: D33592395 Pulled By: TimOliver fbshipit-source-id: 8f7b1873f2b1c6a80908bb55b123e31bea13bb0c
55 lines
1.6 KiB
Ruby
55 lines
1.6 KiB
Ruby
# Copyright (c) Meta Platforms, Inc. and its affiliates.
|
|
#
|
|
# This source code is licensed under the MIT license found in the
|
|
# LICENSE file in the root directory of this source tree.
|
|
|
|
Pod::Spec.new do |s|
|
|
s.name = 'IGListKit'
|
|
s.version = `scripts/version.sh`
|
|
s.summary = 'A data-driven UICollectionView framework.'
|
|
s.homepage = 'https://github.com/Instagram/IGListKit'
|
|
s.documentation_url = 'https://instagram.github.io/IGListKit'
|
|
s.description = 'A data-driven UICollectionView framework for building fast and flexible lists.'
|
|
|
|
s.license = { :type => 'MIT' }
|
|
s.authors = 'Instagram'
|
|
s.social_media_url = 'https://twitter.com/fbOpenSource'
|
|
s.source = {
|
|
:git => 'https://github.com/Instagram/IGListKit.git',
|
|
:tag => s.version.to_s,
|
|
:branch => 'stable'
|
|
}
|
|
|
|
s.dependency 'IGListDiffKit', "= #{s.version}"
|
|
|
|
[s.ios, s.tvos].each do |os|
|
|
os.source_files = [
|
|
'Source/IGListDiffKit/Internal/*.h',
|
|
'Source/IGListKit/**/*.{h,m,mm}',
|
|
]
|
|
os.private_header_files = [
|
|
'Source/IGListDiffKit/Internal/*.h',
|
|
'Source/IGListKit/Internal/*.h',
|
|
]
|
|
end
|
|
|
|
s.osx.source_files = 'Source/IGListKit/IGListKit.h'
|
|
|
|
s.requires_arc = true
|
|
|
|
s.ios.deployment_target = '9.0'
|
|
s.tvos.deployment_target = '9.0'
|
|
s.osx.deployment_target = '10.11'
|
|
|
|
s.ios.frameworks = 'UIKit'
|
|
s.tvos.frameworks = 'UIKit'
|
|
s.osx.frameworks = 'Cocoa'
|
|
|
|
s.library = 'c++'
|
|
s.pod_target_xcconfig = {
|
|
'OTHER_CFLAGS' => '-fmodules',
|
|
'OTHER_CPLUSPLUSFLAGS' => '-fcxx-modules',
|
|
'CLANG_CXX_LANGUAGE_STANDARD' => 'c++11',
|
|
'CLANG_CXX_LIBRARY' => 'libc++',
|
|
}
|
|
end
|