Skip to content

Adopt default main actor isolation and drop CocoaPods #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jmarek41 wants to merge 1 commit into from
Closed

Adopt default main actor isolation and drop CocoaPods #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 28 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name: CI

on:
push:
branches:
- main
pull_request:
branches:
- '*'

jobs:
test:
runs-on: macos-latest

steps:
- uses: actions/checkout@v6
- name: Install SwiftLint
run: brew install swiftlint
- name: Lint
run: |
swiftlint --strict
- name: Build
run: |
xcodebuild -scheme CellKit -destination 'generic/platform=iOS' build
xcodebuild -scheme DiffableCellKit -destination 'generic/platform=iOS' build
- name: Build example app
run: |
xcodebuild -project Example/Example.xcodeproj -scheme Example -destination 'generic/platform=iOS Simulator' -sdk iphonesimulator CODE_SIGNING_ALLOWED=NO build
23 changes: 0 additions & 23 deletions .github/workflows/test.yml
View file
Open in desktop

This file was deleted.

30 changes: 0 additions & 30 deletions CellKit.podspec
View file
Open in desktop

This file was deleted.

42 changes: 30 additions & 12 deletions Example/Example.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,12 +409,15 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 4.0;
SWIFT_DEFAULT_ACTOR_ISOLATION = MainActor;
SWIFT_UPCOMING_FEATURE_INFER_ISOLATED_CONFORMANCES = YES;
SWIFT_UPCOMING_FEATURE_NONISOLATED_NONSENDING_BY_DEFAULT = YES;
SWIFT_VERSION = 6.0;
TARGETED_DEVICE_FAMILY = "1,2";
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
Expand Down Expand Up @@ -463,10 +466,13 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SWIFT_VERSION = 4.0;
SWIFT_DEFAULT_ACTOR_ISOLATION = MainActor;
SWIFT_UPCOMING_FEATURE_INFER_ISOLATED_CONFORMANCES = YES;
SWIFT_UPCOMING_FEATURE_NONISOLATED_NONSENDING_BY_DEFAULT = YES;
SWIFT_VERSION = 6.0;
TARGETED_DEVICE_FAMILY = "1,2";
VALIDATE_PRODUCT = YES;
VERSIONING_SYSTEM = "apple-generic";
Expand All @@ -490,7 +496,7 @@
DEVELOPMENT_TEAM = "";
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = "$(SRCROOT)/Sources/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 11.4;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -499,7 +505,10 @@
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_VERSION = 5.0;
SWIFT_DEFAULT_ACTOR_ISOLATION = MainActor;
SWIFT_UPCOMING_FEATURE_INFER_ISOLATED_CONFORMANCES = YES;
SWIFT_UPCOMING_FEATURE_NONISOLATED_NONSENDING_BY_DEFAULT = YES;
SWIFT_VERSION = 6.0;
TARGETED_DEVICE_FAMILY = 1;
};
name = Debug;
Expand All @@ -520,7 +529,7 @@
DEVELOPMENT_TEAM = "";
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = "$(SRCROOT)/Sources/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 11.4;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -530,7 +539,10 @@
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_COMPILATION_MODE = wholemodule;
SWIFT_OPTIMIZATION_LEVEL = "-O";
SWIFT_VERSION = 5.0;
SWIFT_DEFAULT_ACTOR_ISOLATION = MainActor;
SWIFT_UPCOMING_FEATURE_INFER_ISOLATED_CONFORMANCES = YES;
SWIFT_UPCOMING_FEATURE_NONISOLATED_NONSENDING_BY_DEFAULT = YES;
SWIFT_VERSION = 6.0;
TARGETED_DEVICE_FAMILY = 1;
};
name = Release;
Expand All @@ -547,7 +559,7 @@
CODE_SIGN_STYLE = Automatic;
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = Tests/ExampleUITests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 11.4;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -558,7 +570,10 @@
PRODUCT_BUNDLE_IDENTIFIER = com.thefuntasty.ExampleUITests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_VERSION = 5.0;
SWIFT_DEFAULT_ACTOR_ISOLATION = MainActor;
SWIFT_UPCOMING_FEATURE_INFER_ISOLATED_CONFORMANCES = YES;
SWIFT_UPCOMING_FEATURE_NONISOLATED_NONSENDING_BY_DEFAULT = YES;
SWIFT_VERSION = 6.0;
TARGETED_DEVICE_FAMILY = "1,2";
TEST_TARGET_NAME = Example;
};
Expand All @@ -576,7 +591,7 @@
CODE_SIGN_STYLE = Automatic;
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = Tests/ExampleUITests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 11.4;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -587,7 +602,10 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_COMPILATION_MODE = wholemodule;
SWIFT_OPTIMIZATION_LEVEL = "-O";
SWIFT_VERSION = 5.0;
SWIFT_DEFAULT_ACTOR_ISOLATION = MainActor;
SWIFT_UPCOMING_FEATURE_INFER_ISOLATED_CONFORMANCES = YES;
SWIFT_UPCOMING_FEATURE_NONISOLATED_NONSENDING_BY_DEFAULT = YES;
SWIFT_VERSION = 6.0;
TARGETED_DEVICE_FAMILY = "1,2";
TEST_TARGET_NAME = Example;
};
Expand Down
2 changes: 1 addition & 1 deletion Example/Sources/Supporting/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import UIKit

@UIApplicationMain
@main
final class AppDelegate: UIResponder, UIApplicationDelegate {

var window: UIWindow?
Expand Down
2 changes: 1 addition & 1 deletion Example/Sources/Table Cells/AndroidCell/DeviceAndroidCellModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import CellKit
import DiffableCellKit
import UIKit

struct DeviceAndroidCellModel: CellConvertible, DifferentiableCellModel, DeletableCellModel {
struct DeviceAndroidCellModel: @MainActor CellConvertible, @MainActor DifferentiableCellModel, DeletableCellModel {

var domainIdentifier: Int {
name.hashValue
Expand Down
2 changes: 1 addition & 1 deletion Example/Sources/Table Cells/IOSCell/DeviceiOSCellModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import CellKit
import DiffableCellKit
import UIKit

struct DeviceiOSCellModel: CellConvertible, DifferentiableCellModel, DeletableCellModel {
struct DeviceiOSCellModel: @MainActor CellConvertible, @MainActor DifferentiableCellModel, DeletableCellModel {

var domainIdentifier: Int {
name.hashValue
Expand Down
2 changes: 1 addition & 1 deletion Example/Sources/Table Cells/NibTableViewCell.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import CellKit
import DiffableCellKit
import UIKit

struct NibTableViewCellModel: ReusableCellConvertible, DifferentiableCellModel {
struct NibTableViewCellModel: @MainActor ReusableCellConvertible, @MainActor DifferentiableCellModel {

var domainIdentifier: Int {
text.hashValue
Expand Down
2 changes: 1 addition & 1 deletion Example/Sources/Table Headers/PhonesHeaderModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ struct PhonesHeaderModel {
let title: String
}

extension PhonesHeaderModel: SupplementaryViewModel, CellConvertible {
extension PhonesHeaderModel: @MainActor SupplementaryViewModel, @MainActor CellConvertible {
typealias Cell = PhonesHeader

var height: Double {
Expand Down
4 changes: 2 additions & 2 deletions Example/Sources/ViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import UIKit

enum Constants {

static var iPhones = ["iPhone", "iPhone 3G", "iPhone 3GS", "iPhone 4", "iPhone 4S", "iPhone 5", "iPhone 5s", "iPhone 6", "iPhone 6s", "iPhone SE", "iPhone 7", "iPhone 8", "iPhone X"]
static var androids = ["Samsung Galaxy Note", "OnePlus 2", "Nexus 6", "Huawei P9", "Kindle Fire", "Samsung Galaxy S6", "Nexus 5"]
static let iPhones = ["iPhone", "iPhone 3G", "iPhone 3GS", "iPhone 4", "iPhone 4S", "iPhone 5", "iPhone 5s", "iPhone 6", "iPhone 6s", "iPhone SE", "iPhone 7", "iPhone 8", "iPhone X"]
static let androids = ["Samsung Galaxy Note", "OnePlus 2", "Nexus 6", "Huawei P9", "Kindle Fire", "Samsung Galaxy S6", "Nexus 5"]
}

final class ViewController: UITableViewController {
Expand Down
5 changes: 0 additions & 5 deletions Gemfile
View file
Open in desktop

This file was deleted.

90 changes: 0 additions & 90 deletions Gemfile.lock
View file
Open in desktop

This file was deleted.

17 changes: 13 additions & 4 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,17 @@
// swift-tools-version:5.1
// swift-tools-version:6.2

import PackageDescription

let swiftSettings: [SwiftSetting] = [
.swiftLanguageMode(.v6),
.defaultIsolation(MainActor.self),
.enableUpcomingFeature("NonisolatedNonsendingByDefault"),
.enableUpcomingFeature("InferIsolatedConformances")
]

let package = Package(
name: "CellKit",
platforms: [.iOS(.v9), .tvOS(.v9)],
platforms: [.iOS(.v15), .tvOS(.v15)],
products: [
.library(
name: "CellKit",
Expand All @@ -19,9 +26,11 @@ let package = Package(
targets: [
.target(
name: "CellKit",
dependencies: []),
dependencies: [],
swiftSettings: swiftSettings),
.target(
name: "DiffableCellKit",
dependencies: ["CellKit", "DifferenceKit"])
dependencies: ["CellKit", "DifferenceKit"],
swiftSettings: swiftSettings)
]
)
Loading
Loading