Skip to content

Commit 363f0b0

Browse files
kishikawakatsumikishikawakatsumi
authored
Merge pull request #76 from kishikawakatsumi/spm
Adding support for Swift Package Manager
2 parents 99f8be7 + c7179d2 commit 363f0b0

File tree

69 files changed

+134
-86
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+134
-86
lines changed

‎.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata‎

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎IBPCollectionViewCompositionalLayout.podspec‎

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,17 @@
11
Pod::Spec.new do |s|
22
s.name = 'IBPCollectionViewCompositionalLayout'
3-
s.version = '0.6.0'
3+
s.version = '0.6.1'
44
s.summary = 'Backport of UICollectionViewCompositionalLayout to earlier iOS 12.'
55
s.description = <<-DESC
66
A new UICollectionViewCompositionalLayout class has been added to UIKit to make it incredibly easier to create custom complex collection view layout.
77
You can use new excellent APIs immediately without maintaining two different code bases until iOS 13 would be widely adopted.
88
DESC
9-
s.homepage = 'https://github.com/kishikawakatsumi/IBPCollectionViewCompositionalLayout'
9+
s.homepage = "https://github.com/kishikawakatsumi/#{s.name}"
1010
s.ios.deployment_target = '10.0'
1111
s.source_files = 'Sources/**/*.{h,m}'
12-
s.private_header_files = [ 'Sources/Internal/*.h',
13-
'Sources/IBPNSCollectionLayoutAnchor_Private.h',
14-
'Sources/IBPNSCollectionLayoutContainer.h',
15-
'Sources/IBPNSCollectionLayoutEdgeSpacing_Private.h',
16-
'Sources/IBPNSCollectionLayoutGroup_Private.h',
17-
'Sources/IBPNSCollectionLayoutEnvironment.h',
18-
'Sources/IBPNSCollectionLayoutItem_Private.h',
19-
'Sources/IBPNSCollectionLayoutSection_Private.h',
20-
'Sources/IBPNSCollectionLayoutSize_Private.h',
21-
'Sources/IBPNSCollectionLayoutSpacing_Private.h',
22-
'Sources/IBPNSCollectionLayoutSupplementaryItem_Private.h',
23-
'Sources/IBPUICollectionViewCompositionalLayoutConfiguration_Private.h',
24-
]
12+
s.public_header_files = "Sources/#{s.name}/include/*.h"
2513
s.frameworks = 'UIKit'
26-
s.source = { :git => 'https://github.com/kishikawakatsumi/IBPCollectionViewCompositionalLayout.git', :tag => "v#{s.version}" }
14+
s.source = { :git => "https://github.com/kishikawakatsumi/#{s.name}.git", :tag => "v#{s.version}" }
2715
s.license = { :type => 'MIT', :file => 'LICENSE' }
2816
s.author = { 'Kishikawa Katsumi' => 'kishikawakatsumi@mac.com' }
2917
s.social_media_url = 'https://twitter.com/k_katsumi'

‎IBPCollectionViewCompositionalLayout.xcodeproj/project.pbxproj‎

Lines changed: 66 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
143A2D8322F9CCF900F8904D /* IBPNSDirectionalEdgeInsets.h in Headers */ = {isa = PBXBuildFile; fileRef = 143A2D8122F9CCF900F8904D /* IBPNSDirectionalEdgeInsets.h */; settings = {ATTRIBUTES = (Public, ); }; };
6363
145DA01A230479C700A044D2 /* IBPUICollectionViewCompositionalLayoutConfiguration_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 145DA018230479C700A044D2 /* IBPUICollectionViewCompositionalLayoutConfiguration_Private.h */; settings = {ATTRIBUTES = (Private, ); }; };
6464
145DA02323097D6E00A044D2 /* IBPNSDirectionalEdgeInsets.m in Sources */ = {isa = PBXBuildFile; fileRef = 145DA02123097D6E00A044D2 /* IBPNSDirectionalEdgeInsets.m */; };
65-
14751C20230C70ED00B3DC87 /* IBPCollectionCompositionalLayoutSolver.h in Headers */ = {isa = PBXBuildFile; fileRef = 14751C1E230C70ED00B3DC87 /* IBPCollectionCompositionalLayoutSolver.h */; };
65+
14751C20230C70ED00B3DC87 /* IBPCollectionCompositionalLayoutSolver.h in Headers */ = {isa = PBXBuildFile; fileRef = 14751C1E230C70ED00B3DC87 /* IBPCollectionCompositionalLayoutSolver.h */; settings = {ATTRIBUTES = (Private, ); }; };
6666
14751C21230C70ED00B3DC87 /* IBPCollectionCompositionalLayoutSolver.m in Sources */ = {isa = PBXBuildFile; fileRef = 14751C1F230C70ED00B3DC87 /* IBPCollectionCompositionalLayoutSolver.m */; };
6767
147537BB230A170100337C1B /* IBPNSCollectionLayoutEdgeSpacing_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 147537B9230A170100337C1B /* IBPNSCollectionLayoutEdgeSpacing_Private.h */; settings = {ATTRIBUTES = (Private, ); }; };
6868
147537BF230A190F00337C1B /* IBPNSCollectionLayoutSpacing_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 147537BD230A190F00337C1B /* IBPNSCollectionLayoutSpacing_Private.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -166,21 +166,6 @@
166166
/* End PBXFrameworksBuildPhase section */
167167

168168
/* Begin PBXGroup section */
169-
1438F764230E6FBA007E3ABF /* Internal */ = {
170-
isa = PBXGroup;
171-
children = (
172-
14751C1E230C70ED00B3DC87 /* IBPCollectionCompositionalLayoutSolver.h */,
173-
14751C1F230C70ED00B3DC87 /* IBPCollectionCompositionalLayoutSolver.m */,
174-
143A2D2422F9CBB100F8904D /* IBPCollectionCompositionalLayoutSolverResult.h */,
175-
143A2D4322F9CBB200F8904D /* IBPCollectionCompositionalLayoutSolverResult.m */,
176-
143A2D3022F9CBB100F8904D /* IBPCollectionViewOrthogonalScrollerEmbeddedScrollView.h */,
177-
143A2D2222F9CBB100F8904D /* IBPCollectionViewOrthogonalScrollerEmbeddedScrollView.m */,
178-
143A2D2C22F9CBB100F8904D /* IBPCollectionViewOrthogonalScrollerSectionController.h */,
179-
143A2D1C22F9CBB000F8904D /* IBPCollectionViewOrthogonalScrollerSectionController.m */,
180-
);
181-
path = Internal;
182-
sourceTree = "<group>";
183-
};
184169
143A2CF322F9C81D00F8904D = {
185170
isa = PBXGroup;
186171
children = (
@@ -202,70 +187,109 @@
202187
143A2CFF22F9C81D00F8904D /* Sources */ = {
203188
isa = PBXGroup;
204189
children = (
205-
143A2D0022F9C81D00F8904D /* IBPCollectionViewCompositionalLayout.h */,
206-
143A2D1D22F9CBB000F8904D /* IBPNSCollectionLayoutAnchor.h */,
190+
149FA9C1230F2ADD0065AD4D /* IBPCollectionViewCompositionalLayout */,
191+
143A2D0122F9C81D00F8904D /* Info.plist */,
192+
);
193+
path = Sources;
194+
sourceTree = "<group>";
195+
};
196+
143A2D0A22F9C81D00F8904D /* Tests */ = {
197+
isa = PBXGroup;
198+
children = (
199+
149FA9E2230F30780065AD4D /* IBPCollectionViewCompositionalLayoutTests */,
200+
143A2D0D22F9C81D00F8904D /* Info.plist */,
201+
);
202+
path = Tests;
203+
sourceTree = "<group>";
204+
};
205+
149FA9C1230F2ADD0065AD4D /* IBPCollectionViewCompositionalLayout */ = {
206+
isa = PBXGroup;
207+
children = (
208+
149FA9C3230F2B480065AD4D /* include */,
207209
147537C5230A6A1300337C1B /* IBPNSCollectionLayoutAnchor_Private.h */,
208210
143A2D4422F9CBB300F8904D /* IBPNSCollectionLayoutAnchor.m */,
209-
143A2D2622F9CBB100F8904D /* IBPNSCollectionLayoutBoundarySupplementaryItem.h */,
210211
143A2D3922F9CBB200F8904D /* IBPNSCollectionLayoutBoundarySupplementaryItem.m */,
211-
143A2D4622F9CBB300F8904D /* IBPNSCollectionLayoutContainer_Protocol.h */,
212212
143A2D3C22F9CBB200F8904D /* IBPNSCollectionLayoutContainer.h */,
213213
143A2D4822F9CBB300F8904D /* IBPNSCollectionLayoutContainer.m */,
214-
143A2D3122F9CBB100F8904D /* IBPNSCollectionLayoutDecorationItem.h */,
215214
143A2D3222F9CBB100F8904D /* IBPNSCollectionLayoutDecorationItem.m */,
216-
143A2D4222F9CBB200F8904D /* IBPNSCollectionLayoutDimension.h */,
217215
143A2D2B22F9CBB100F8904D /* IBPNSCollectionLayoutDimension.m */,
218-
143A2D3622F9CBB200F8904D /* IBPNSCollectionLayoutEdgeSpacing.h */,
219216
147537B9230A170100337C1B /* IBPNSCollectionLayoutEdgeSpacing_Private.h */,
220217
143A2D4722F9CBB300F8904D /* IBPNSCollectionLayoutEdgeSpacing.m */,
221-
143A2D3322F9CBB100F8904D /* IBPNSCollectionLayoutEnvironment_Protocol.h */,
222218
143A2D2522F9CBB100F8904D /* IBPNSCollectionLayoutEnvironment.h */,
223219
143A2D2A22F9CBB100F8904D /* IBPNSCollectionLayoutEnvironment.m */,
224-
14F3F7952300542B0096D032 /* IBPNSCollectionLayoutForwardCompatibility.h */,
225-
143A2D2922F9CBB100F8904D /* IBPNSCollectionLayoutGroup.h */,
226220
143A2D1B22F9CBB000F8904D /* IBPNSCollectionLayoutGroup_Private.h */,
227221
143A2D2022F9CBB100F8904D /* IBPNSCollectionLayoutGroup.m */,
228-
143A2D1822F9CBB000F8904D /* IBPNSCollectionLayoutGroupCustomItem.h */,
229222
143A2D3A22F9CBB200F8904D /* IBPNSCollectionLayoutGroupCustomItem.m */,
230-
143A2D3422F9CBB100F8904D /* IBPNSCollectionLayoutItem.h */,
231223
143A2D3722F9CBB200F8904D /* IBPNSCollectionLayoutItem_Private.h */,
232224
143A2D4022F9CBB200F8904D /* IBPNSCollectionLayoutItem.m */,
233-
143A2D3B22F9CBB200F8904D /* IBPNSCollectionLayoutSection.h */,
234225
143A2D2F22F9CBB100F8904D /* IBPNSCollectionLayoutSection_Private.h */,
235226
143A2D1E22F9CBB000F8904D /* IBPNSCollectionLayoutSection.m */,
236-
143A2D4922F9CBB300F8904D /* IBPNSCollectionLayoutSize.h */,
237227
143A2D1A22F9CBB000F8904D /* IBPNSCollectionLayoutSize_Private.h */,
238228
143A2D4522F9CBB300F8904D /* IBPNSCollectionLayoutSize.m */,
239-
143A2D4A22F9CBB300F8904D /* IBPNSCollectionLayoutSpacing.h */,
240229
147537BD230A190F00337C1B /* IBPNSCollectionLayoutSpacing_Private.h */,
241230
143A2D2122F9CBB100F8904D /* IBPNSCollectionLayoutSpacing.m */,
242-
143A2D2322F9CBB100F8904D /* IBPNSCollectionLayoutSupplementaryItem.h */,
243231
143A2D1722F9CBB000F8904D /* IBPNSCollectionLayoutSupplementaryItem_Private.h */,
244232
143A2D4B22F9CBB300F8904D /* IBPNSCollectionLayoutSupplementaryItem.m */,
233+
145DA02123097D6E00A044D2 /* IBPNSDirectionalEdgeInsets.m */,
234+
143A2D2E22F9CBB100F8904D /* IBPUICollectionViewCompositionalLayout.m */,
235+
145DA018230479C700A044D2 /* IBPUICollectionViewCompositionalLayoutConfiguration_Private.h */,
236+
143A2D3F22F9CBB200F8904D /* IBPUICollectionViewCompositionalLayoutConfiguration.m */,
237+
149FA9C2230F2B230065AD4D /* Internal */,
238+
);
239+
path = IBPCollectionViewCompositionalLayout;
240+
sourceTree = "<group>";
241+
};
242+
149FA9C2230F2B230065AD4D /* Internal */ = {
243+
isa = PBXGroup;
244+
children = (
245+
14751C1E230C70ED00B3DC87 /* IBPCollectionCompositionalLayoutSolver.h */,
246+
14751C1F230C70ED00B3DC87 /* IBPCollectionCompositionalLayoutSolver.m */,
247+
143A2D2422F9CBB100F8904D /* IBPCollectionCompositionalLayoutSolverResult.h */,
248+
143A2D4322F9CBB200F8904D /* IBPCollectionCompositionalLayoutSolverResult.m */,
249+
143A2D3022F9CBB100F8904D /* IBPCollectionViewOrthogonalScrollerEmbeddedScrollView.h */,
250+
143A2D2222F9CBB100F8904D /* IBPCollectionViewOrthogonalScrollerEmbeddedScrollView.m */,
251+
143A2D2C22F9CBB100F8904D /* IBPCollectionViewOrthogonalScrollerSectionController.h */,
252+
143A2D1C22F9CBB000F8904D /* IBPCollectionViewOrthogonalScrollerSectionController.m */,
253+
);
254+
name = Internal;
255+
sourceTree = "<group>";
256+
};
257+
149FA9C3230F2B480065AD4D /* include */ = {
258+
isa = PBXGroup;
259+
children = (
260+
143A2D0022F9C81D00F8904D /* IBPCollectionViewCompositionalLayout.h */,
261+
143A2D1D22F9CBB000F8904D /* IBPNSCollectionLayoutAnchor.h */,
262+
143A2D2622F9CBB100F8904D /* IBPNSCollectionLayoutBoundarySupplementaryItem.h */,
263+
143A2D4622F9CBB300F8904D /* IBPNSCollectionLayoutContainer_Protocol.h */,
264+
143A2D3122F9CBB100F8904D /* IBPNSCollectionLayoutDecorationItem.h */,
265+
143A2D4222F9CBB200F8904D /* IBPNSCollectionLayoutDimension.h */,
266+
143A2D3622F9CBB200F8904D /* IBPNSCollectionLayoutEdgeSpacing.h */,
267+
143A2D3322F9CBB100F8904D /* IBPNSCollectionLayoutEnvironment_Protocol.h */,
268+
14F3F7952300542B0096D032 /* IBPNSCollectionLayoutForwardCompatibility.h */,
269+
143A2D2922F9CBB100F8904D /* IBPNSCollectionLayoutGroup.h */,
270+
143A2D1822F9CBB000F8904D /* IBPNSCollectionLayoutGroupCustomItem.h */,
271+
143A2D3422F9CBB100F8904D /* IBPNSCollectionLayoutItem.h */,
272+
143A2D3B22F9CBB200F8904D /* IBPNSCollectionLayoutSection.h */,
273+
143A2D4922F9CBB300F8904D /* IBPNSCollectionLayoutSize.h */,
274+
143A2D4A22F9CBB300F8904D /* IBPNSCollectionLayoutSpacing.h */,
275+
143A2D2322F9CBB100F8904D /* IBPNSCollectionLayoutSupplementaryItem.h */,
245276
143A2D4122F9CBB200F8904D /* IBPNSCollectionLayoutVisibleItem.h */,
246277
143A2D8122F9CCF900F8904D /* IBPNSDirectionalEdgeInsets.h */,
247-
145DA02123097D6E00A044D2 /* IBPNSDirectionalEdgeInsets.m */,
248278
143A2D3822F9CBB200F8904D /* IBPNSDirectionalRectEdge.h */,
249279
143A2D1922F9CBB000F8904D /* IBPNSRectAlignment.h */,
250280
143A2D3522F9CBB200F8904D /* IBPUICollectionLayoutSectionOrthogonalScrollingBehavior.h */,
251281
143A2D2D22F9CBB100F8904D /* IBPUICollectionViewCompositionalLayout.h */,
252-
143A2D2E22F9CBB100F8904D /* IBPUICollectionViewCompositionalLayout.m */,
253282
143A2D3E22F9CBB200F8904D /* IBPUICollectionViewCompositionalLayoutConfiguration.h */,
254-
145DA018230479C700A044D2 /* IBPUICollectionViewCompositionalLayoutConfiguration_Private.h */,
255-
143A2D3F22F9CBB200F8904D /* IBPUICollectionViewCompositionalLayoutConfiguration.m */,
256-
1438F764230E6FBA007E3ABF /* Internal */,
257-
143A2D0122F9C81D00F8904D /* Info.plist */,
258283
);
259-
path = Sources;
284+
path = include;
260285
sourceTree = "<group>";
261286
};
262-
143A2D0A22F9C81D00F8904D /* Tests */ = {
287+
149FA9E2230F30780065AD4D /* IBPCollectionViewCompositionalLayoutTests */ = {
263288
isa = PBXGroup;
264289
children = (
265290
143A2D0B22F9C81D00F8904D /* IBPCollectionViewCompositionalLayoutTests.m */,
266-
143A2D0D22F9C81D00F8904D /* Info.plist */,
267291
);
268-
path = Tests;
292+
path = IBPCollectionViewCompositionalLayoutTests;
269293
sourceTree = "<group>";
270294
};
271295
/* End PBXGroup section */

‎Sources/IBPCollectionViewCompositionalLayoutInteroperability.swift‎ renamed to ‎IBPCollectionViewCompositionalLayoutInteroperability.swift‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ typealias NSCollectionLayoutDimension = IBPNSCollectionLayoutDimension
77
typealias NSCollectionLayoutEdgeSpacing = IBPNSCollectionLayoutEdgeSpacing
88
typealias NSCollectionLayoutEnvironment = IBPNSCollectionLayoutEnvironment
99
typealias NSCollectionLayoutGroup = IBPNSCollectionLayoutGroup
10+
typealias NSCollectionLayoutGroupCustomItem = IBPNSCollectionLayoutGroupCustomItem
1011
typealias NSCollectionLayoutItem = IBPNSCollectionLayoutItem
1112
typealias NSCollectionLayoutSection = IBPNSCollectionLayoutSection
1213
typealias NSCollectionLayoutSize = IBPNSCollectionLayoutSize

‎Package.swift‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
// swift-tools-version:5.1
2+
// The swift-tools-version declares the minimum version of Swift required to build this package.
3+
import PackageDescription
4+
5+
let package = Package(
6+
name: "IBPCollectionViewCompositionalLayout",
7+
products: [
8+
.library(
9+
name: "IBPCollectionViewCompositionalLayout",
10+
targets: ["IBPCollectionViewCompositionalLayout"]),
11+
],
12+
dependencies: [],
13+
targets: [
14+
.target(
15+
name: "IBPCollectionViewCompositionalLayout",
16+
dependencies: []),
17+
.testTarget(
18+
name: "IBPCollectionViewCompositionalLayoutTests",
19+
dependencies: ["IBPCollectionViewCompositionalLayout"]),
20+
]
21+
)

‎README.md‎

Lines changed: 1 addition & 0 deletions

‎Sources/IBPCollectionViewCompositionalLayout.h‎

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎Sources/Internal/IBPCollectionCompositionalLayoutSolver.h‎ renamed to ‎Sources/IBPCollectionViewCompositionalLayout/IBPCollectionCompositionalLayoutSolver.h‎

File renamed without changes.

‎Sources/Internal/IBPCollectionCompositionalLayoutSolver.m‎ renamed to ‎Sources/IBPCollectionViewCompositionalLayout/IBPCollectionCompositionalLayoutSolver.m‎

File renamed without changes.

‎Sources/Internal/IBPCollectionCompositionalLayoutSolverResult.h‎ renamed to ‎Sources/IBPCollectionViewCompositionalLayout/IBPCollectionCompositionalLayoutSolverResult.h‎

File renamed without changes.

0 commit comments

Comments
 (0)