Skip to content

DeallocTests 4.0 (1/5): groundwork – cleanup, CI, Dependency Injection as a package trait #25

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

Open
DanielCech wants to merge 1 commit into from
Open

DeallocTests 4.0 (1/5): groundwork – cleanup, CI, Dependency Injection as a package trait #25

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
35 changes: 35 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,35 @@
name: CI

on:
push:
branches: [master]
pull_request:

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
package:
name: Package build (macOS, ${{ matrix.traits.name }})
runs-on: macos-15
strategy:
matrix:
traits:
- { name: "DependencyInjection (default)", flags: "" }
- { name: "without DependencyInjection", flags: "--disable-default-traits" }
steps:
- uses: actions/checkout@v4
- name: Build
run: swift build ${{ matrix.traits.flags }}

package-ios:
name: Package build (iOS Simulator)
runs-on: macos-15
steps:
- uses: actions/checkout@v4
- name: Build
run: |
xcodebuild build \
-scheme DeallocTests \
-destination 'generic/platform=iOS Simulator'
8 changes: 0 additions & 8 deletions .jazzy.yml
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion .ruby-version
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion .swift-version
View file
Open in desktop

This file was deleted.

95 changes: 0 additions & 95 deletions .travis.yml
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions Dangerfile
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions Package.resolved
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

34 changes: 16 additions & 18 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// swift-tools-version:6.0.0
// swift-tools-version:6.1
//
// DeallocTests.swift
// Package.swift
// DeallocTests
//
// Created by Daniel Cech on 01/04/19.
Expand All @@ -20,29 +20,27 @@ let package = Package(
name: "DeallocTests",
targets: ["DeallocTests"]
),
.library(
name: "DeallocTestsDIFree",
targets: ["DeallocTestsDIFree"]
],
traits: [
.trait(
name: "DependencyInjection",
description: "Integration with STRV Dependency Injection: the AsyncContainer in DeallocTester"
),
.default(enabledTraits: ["DependencyInjection"]),
],
dependencies: [
// Dependencies declare other packages that this package depends on.
.package(url: "git@github.com:strvcom/ios-dependency-injection.git", .upToNextMajor(from: "2.0.0"))
.package(url: "https://github.com/strvcom/ios-dependency-injection.git", "1.0.4" ..< "3.0.0")
],
targets: [
.target(
name: "DeallocTests",
dependencies: [.product(name: "DependencyInjection", package: "ios-dependency-injection")],
path: "Sources/DeallocTests"
),
.target(
name: "DeallocTestsDIFree",
path: "Sources/DeallocTestsDIFree"
),
.testTarget(
name: "DeallocTestsTests",
dependencies: ["DeallocTests"],
path: "Tests"
dependencies: [
.product(
name: "DependencyInjection",
package: "ios-dependency-injection",
condition: .when(traits: ["DependencyInjection"])
)
]
),
],
swiftLanguageModes: [.v6]
Expand Down
23 changes: 16 additions & 7 deletions SampleApps/DeallocTestsAppDIFreeSPM/DeallocTestsAppSPM.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
27A08053245CBA7A0037F1DB /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27A08052245CBA790037F1DB /* SceneDelegate.swift */; };
27A08055245CBBD10037F1DB /* DeallocTestConformances.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27A08054245CBBD10037F1DB /* DeallocTestConformances.swift */; };
27A08057245CBBFA0037F1DB /* MainCoordinatorDeallocTester.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27A08056245CBBFA0037F1DB /* MainCoordinatorDeallocTester.swift */; };
ADCB58E527FD840C009E0DEB /* DeallocTestsDIFree in Frameworks */ = {isa = PBXBuildFile; productRef = ADCB58E427FD840C009E0DEB /* DeallocTestsDIFree */; };
ADCB58E527FD840C009E0DEB /* DeallocTests in Frameworks */ = {isa = PBXBuildFile; productRef = ADCB58E427FD840C009E0DEB /* DeallocTests */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down Expand Up @@ -54,7 +54,6 @@
27A08054245CBBD10037F1DB /* DeallocTestConformances.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeallocTestConformances.swift; sourceTree = "<group>"; };
27A08056245CBBFA0037F1DB /* MainCoordinatorDeallocTester.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainCoordinatorDeallocTester.swift; sourceTree = "<group>"; };
7E877B2A5D7E5C94D45AE696 /* Pods_DeallocTestsAppCocoapodsTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_DeallocTestsAppCocoapodsTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
ADCB58E327FD82B4009E0DEB /* DeallocTests */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = DeallocTests; path = ../..; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand All @@ -69,7 +68,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
ADCB58E527FD840C009E0DEB /* DeallocTestsDIFree in Frameworks */,
ADCB58E527FD840C009E0DEB /* DeallocTests in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -153,7 +152,6 @@
ADCB58E227FD82B4009E0DEB /* Packages */ = {
isa = PBXGroup;
children = (
ADCB58E327FD82B4009E0DEB /* DeallocTests */,
);
name = Packages;
sourceTree = "<group>";
Expand Down Expand Up @@ -195,7 +193,7 @@
);
name = DeallocTestsAppSPMTests;
packageProductDependencies = (
ADCB58E427FD840C009E0DEB /* DeallocTestsDIFree */,
ADCB58E427FD840C009E0DEB /* DeallocTests */,
);
productName = DeallocTestsAppCocoapodsTests;
productReference = 27A08039245C859E0037F1DB /* DeallocTestsAppSPMTests.xctest */;
Expand Down Expand Up @@ -230,6 +228,7 @@
);
mainGroup = 27A0801A245C859C0037F1DB;
packageReferences = (
AD0E0E0E2F00000100000020 /* XCLocalSwiftPackageReference "../.." */,
);
productRefGroup = 27A08024245C859C0037F1DB /* Products */;
projectDirPath = "";
Expand Down Expand Up @@ -543,10 +542,20 @@
};
/* End XCConfigurationList section */

/* Begin XCLocalSwiftPackageReference section */
AD0E0E0E2F00000100000020 /* XCLocalSwiftPackageReference "../.." */ = {
isa = XCLocalSwiftPackageReference;
relativePath = ../..;
traits = (
);
};
/* End XCLocalSwiftPackageReference section */

/* Begin XCSwiftPackageProductDependency section */
ADCB58E427FD840C009E0DEB /* DeallocTestsDIFree */ = {
ADCB58E427FD840C009E0DEB /* DeallocTests */ = {
isa = XCSwiftPackageProductDependency;
productName = DeallocTestsDIFree;
package = AD0E0E0E2F00000100000020 /* XCLocalSwiftPackageReference "../.." */;
productName = DeallocTests;
};
/* End XCSwiftPackageProductDependency section */
};
Expand Down
15 changes: 0 additions & 15 deletions ...PM/DeallocTestsAppSPM.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion SampleApps/DeallocTestsAppDIFreeSPM/DeallocTestsAppSPMTests/DeallocTestConformances.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
//

import Foundation
import DeallocTestsDIFree
import DeallocTests
@testable import DeallocTestsAppSPM

extension MainCoordinator: DeallocTestable {}
Expand Down
5 changes: 3 additions & 2 deletions ...eApps/DeallocTestsAppDIFreeSPM/DeallocTestsAppSPMTests/MainCoordinatorDeallocTester.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
//

import Foundation
import DeallocTestsDIFree
import DeallocTests
@testable import DeallocTestsAppSPM


Expand All @@ -16,8 +16,9 @@ class MainCoordinatorDeallocTester: DeallocTester {
return MainCoordinator()
}

@MainActor
func test_mainCoordinatorDealloc() async {
presentingController = showPresentingController()
presentingController = await showPresentingController()

try? await Task.sleep(for: .milliseconds(200))

Expand Down
11 changes: 9 additions & 2 deletions SampleApps/DeallocTestsAppSPM/DeallocTestsAppSPM.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@
27A08052245CBA790037F1DB /* SceneDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
27A08054245CBBD10037F1DB /* DeallocTestConformances.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeallocTestConformances.swift; sourceTree = "<group>"; };
27A08056245CBBFA0037F1DB /* MainCoordinatorDeallocTester.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainCoordinatorDeallocTester.swift; sourceTree = "<group>"; };
ADCB58D827FD7B01009E0DEB /* DeallocTests */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = DeallocTests; path = ../..; sourceTree = "<group>"; };
ADCB58DE27FD7CC9009E0DEB /* APIManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = APIManager.swift; sourceTree = "<group>"; };
ADCB58E027FD7CF3009E0DEB /* DependencyGraphDeallocTester.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DependencyGraphDeallocTester.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */
Expand Down Expand Up @@ -157,7 +156,6 @@
ADCB58D727FD7B01009E0DEB /* Packages */ = {
isa = PBXGroup;
children = (
ADCB58D827FD7B01009E0DEB /* DeallocTests */,
);
name = Packages;
sourceTree = "<group>";
Expand Down Expand Up @@ -242,6 +240,7 @@
);
mainGroup = 27A0801A245C859C0037F1DB;
packageReferences = (
AD0E0E0E2F00000100000010 /* XCLocalSwiftPackageReference "../.." */,
);
productRefGroup = 27A08024245C859C0037F1DB /* Products */;
projectDirPath = "";
Expand Down Expand Up @@ -555,9 +554,17 @@
};
/* End XCConfigurationList section */

/* Begin XCLocalSwiftPackageReference section */
AD0E0E0E2F00000100000010 /* XCLocalSwiftPackageReference "../.." */ = {
isa = XCLocalSwiftPackageReference;
relativePath = ../..;
};
/* End XCLocalSwiftPackageReference section */

/* Begin XCSwiftPackageProductDependency section */
ADCB58E627FD8756009E0DEB /* DeallocTests */ = {
isa = XCSwiftPackageProductDependency;
package = AD0E0E0E2F00000100000010 /* XCLocalSwiftPackageReference "../.." */;
productName = DeallocTests;
};
/* End XCSwiftPackageProductDependency section */
Expand Down
Loading
Loading