Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ NEXT

This release closes the [0.1.9 milestone](https://github.com/jessesquires/ReactiveCollectionsKit/milestone/2?closed=1).

- Drop support for iOS 15. **Minimum iOS 16 now required.**
- Fixed a (potential) bug where cells with the same name, but in different modules, would provide the same (conflicting) default `reuseIdentifier`. Default `reuseIdentifiers` now return the fully qualified type name. ([@jessesquires](https://github.com/jessesquires), [#150](https://github.com/jessesquires/ReactiveCollectionsKit/issues/150), [#154](https://github.com/jessesquires/ReactiveCollectionsKit/pull/154))
- Previous behavior: `"MyCellClassName"`
- New behavior: `"MyModuleName.MyCellClassName"`
Expand Down
68 changes: 21 additions & 47 deletions Example/ExampleApp.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 77;
objectVersion = 90;
objects = {

/* Begin PBXBuildFile section */
Expand Down Expand Up @@ -38,14 +38,12 @@
/* Begin PBXCopyFilesBuildPhase section */
0B31B9B72BCC63D4006F2078 /* Embed Frameworks */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "";
dstSubfolderSpec = 10;
dstSubfolder = Frameworks;
files = (
0B31B9B62BCC63D4006F2078 /* ReactiveCollectionsKit.framework in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXCopyFilesBuildPhase section */

Expand Down Expand Up @@ -117,25 +115,19 @@
/* Begin PBXFrameworksBuildPhase section */
0B31B9382BCC62A4006F2078 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
0B31B9B52BCC63D4006F2078 /* ReactiveCollectionsKit.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
0B31B94E2BCC62A5006F2078 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
0B31B9582BCC62A5006F2078 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */

Expand Down Expand Up @@ -190,8 +182,6 @@
);
buildRules = (
);
dependencies = (
);
fileSystemSynchronizedGroups = (
0B8701882CAE1D980098CB29 /* Sources */,
);
Expand Down Expand Up @@ -269,7 +259,7 @@
);
mainGroup = 0B31B9322BCC62A4006F2078;
minimizedProjectReferenceProxies = 1;
preferredProjectObjectVersion = 77;
preferredProjectObjectVersion = 90;
productRefGroup = 0B31B93C2BCC62A4006F2078 /* Products */;
projectDirPath = "";
projectReferences = (
Expand Down Expand Up @@ -300,48 +290,36 @@
/* Begin PBXResourcesBuildPhase section */
0B31B9392BCC62A4006F2078 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
0B31B94F2BCC62A5006F2078 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
0B31B9592BCC62A5006F2078 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXResourcesBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
0B31B9372BCC62A4006F2078 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
0B31B94D2BCC62A5006F2078 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
0B31B9572BCC62A5006F2078 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXSourcesBuildPhase section */

Expand All @@ -359,7 +337,7 @@
/* End PBXTargetDependency section */

/* Begin XCBuildConfiguration section */
0B31B9632BCC62A5006F2078 /* Debug */ = {
0B31B9632BCC62A5006F2078 /* Debug configuration for PBXProject "ExampleApp" */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
Expand Down Expand Up @@ -415,7 +393,7 @@
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
INFOPLIST_KEY_UIMainStoryboardFile = Main;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
IPHONEOS_DEPLOYMENT_TARGET = 16.6;
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
MARKETING_VERSION = 1.0;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
Expand All @@ -430,7 +408,7 @@
};
name = Debug;
};
0B31B9642BCC62A5006F2078 /* Release */ = {
0B31B9642BCC62A5006F2078 /* Release configuration for PBXProject "ExampleApp" */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
Expand Down Expand Up @@ -480,7 +458,7 @@
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
INFOPLIST_KEY_UIMainStoryboardFile = Main;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
IPHONEOS_DEPLOYMENT_TARGET = 16.6;
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
MARKETING_VERSION = 1.0;
MTL_ENABLE_DEBUG_INFO = NO;
Expand All @@ -494,7 +472,7 @@
};
name = Release;
};
0B31B9662BCC62A5006F2078 /* Debug */ = {
0B31B9662BCC62A5006F2078 /* Debug configuration for PBXNativeTarget "ExampleApp" */ = {
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
Expand Down Expand Up @@ -524,7 +502,7 @@
};
name = Debug;
};
0B31B9672BCC62A5006F2078 /* Release */ = {
0B31B9672BCC62A5006F2078 /* Release configuration for PBXNativeTarget "ExampleApp" */ = {
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
Expand Down Expand Up @@ -554,7 +532,7 @@
};
name = Release;
};
0B31B9692BCC62A5006F2078 /* Debug */ = {
0B31B9692BCC62A5006F2078 /* Debug configuration for PBXNativeTarget "ExampleAppTests" */ = {
isa = XCBuildConfiguration;
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
Expand All @@ -573,7 +551,7 @@
};
name = Debug;
};
0B31B96A2BCC62A5006F2078 /* Release */ = {
0B31B96A2BCC62A5006F2078 /* Release configuration for PBXNativeTarget "ExampleAppTests" */ = {
isa = XCBuildConfiguration;
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
Expand All @@ -592,7 +570,7 @@
};
name = Release;
};
0B31B96C2BCC62A5006F2078 /* Debug */ = {
0B31B96C2BCC62A5006F2078 /* Debug configuration for PBXNativeTarget "ExampleAppUITests" */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_STYLE = Manual;
Expand All @@ -610,7 +588,7 @@
};
name = Debug;
};
0B31B96D2BCC62A5006F2078 /* Release */ = {
0B31B96D2BCC62A5006F2078 /* Release configuration for PBXNativeTarget "ExampleAppUITests" */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_STYLE = Manual;
Expand All @@ -634,37 +612,33 @@
0B31B9362BCC62A4006F2078 /* Build configuration list for PBXProject "ExampleApp" */ = {
isa = XCConfigurationList;
buildConfigurations = (
0B31B9632BCC62A5006F2078 /* Debug */,
0B31B9642BCC62A5006F2078 /* Release */,
0B31B9632BCC62A5006F2078 /* Debug configuration for PBXProject "ExampleApp" */,
0B31B9642BCC62A5006F2078 /* Release configuration for PBXProject "ExampleApp" */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
0B31B9652BCC62A5006F2078 /* Build configuration list for PBXNativeTarget "ExampleApp" */ = {
isa = XCConfigurationList;
buildConfigurations = (
0B31B9662BCC62A5006F2078 /* Debug */,
0B31B9672BCC62A5006F2078 /* Release */,
0B31B9662BCC62A5006F2078 /* Debug configuration for PBXNativeTarget "ExampleApp" */,
0B31B9672BCC62A5006F2078 /* Release configuration for PBXNativeTarget "ExampleApp" */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
0B31B9682BCC62A5006F2078 /* Build configuration list for PBXNativeTarget "ExampleAppTests" */ = {
isa = XCConfigurationList;
buildConfigurations = (
0B31B9692BCC62A5006F2078 /* Debug */,
0B31B96A2BCC62A5006F2078 /* Release */,
0B31B9692BCC62A5006F2078 /* Debug configuration for PBXNativeTarget "ExampleAppTests" */,
0B31B96A2BCC62A5006F2078 /* Release configuration for PBXNativeTarget "ExampleAppTests" */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
0B31B96B2BCC62A5006F2078 /* Build configuration list for PBXNativeTarget "ExampleAppUITests" */ = {
isa = XCConfigurationList;
buildConfigurations = (
0B31B96C2BCC62A5006F2078 /* Debug */,
0B31B96D2BCC62A5006F2078 /* Release */,
0B31B96C2BCC62A5006F2078 /* Debug configuration for PBXNativeTarget "ExampleAppUITests" */,
0B31B96D2BCC62A5006F2078 /* Release configuration for PBXNativeTarget "ExampleAppUITests" */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */
Expand Down
10 changes: 6 additions & 4 deletions Example/Sources/Grid/GridViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -89,16 +89,18 @@ final class GridViewController: ExampleViewController, CellEventCoordinator {

// Item
let itemSize = NSCollectionLayoutSize(widthDimension: .fractionalWidth(1.0),
heightDimension: .fractionalHeight(1.0))
heightDimension: .fractionalHeight(0.5))
let item = NSCollectionLayoutItem(layoutSize: itemSize, supplementaryItems: [badge])
item.contentInsets = NSDirectionalEdgeInsets(top: inset, leading: inset, bottom: inset, trailing: inset)

// Group
let groupSize = NSCollectionLayoutSize(widthDimension: .fractionalWidth(0.5),
heightDimension: .fractionalHeight(0.5))
let group = NSCollectionLayoutGroup.vertical(layoutSize: groupSize,
subitem: item,
count: 2)
let group = NSCollectionLayoutGroup.vertical(
layoutSize: groupSize,
repeatingSubitem: item,
count: 2
)

// Headers and Footers
let headerFooterSize = NSCollectionLayoutSize(widthDimension: .fractionalWidth(1.0),
Expand Down
2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import PackageDescription
let package = Package(
name: "ReactiveCollectionsKit",
platforms: [
.iOS(.v15)
.iOS(.v16)
],
products: [
.library(
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ driver.update(viewModel: updated)

## Requirements

- iOS 15.0+
- iOS 16.0+
- Swift 5.10+
- Xcode 26.0+
- [SwiftLint](https://github.com/realm/SwiftLint)
Expand Down
Loading