New version of Swinject 2.10.0

.github/workflows/Pod Lint.yml

@@ -2,16 +2,22 @@
 
 name: Pod Lint
 on:
-  workflow_dispatch:
-env:
-  ENCODING: LC_CTYPE=en_US.UTF-8
-  DEVELOPER_DIR: /Applications/Xcode_12.4.app/Contents/Developer
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
 jobs:
   pod-lint:
-    runs-on: macos-10.15
+    runs-on: macos-15
+    env:
+      ENCODING: LC_CTYPE=en_US.UTF-8
+      DEVELOPER_DIR: /Applications/Xcode_16.4.app/Contents/Developer
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
-      - name: Linting PodSpec for Cocoapods"
-        run: export "${{ env. ENCODING }}" | pod lib lint
-        shell: bash
+        uses: actions/checkout@v4
+      - name: Inspect Environment
+        run: xcrun simctl list
+        shell: bash
+      - name: Linting PodSpec for Cocoapods
+        run: export "${{ env. ENCODING }}" | pod lib lint --verbose
+        shell: bash

.github/workflows/Project Testing.yml

@@ -5,33 +5,33 @@ on:
   workflow_dispatch:
 env: 
   PROJECT: Swinject.xcodeproj
-  DEVELOPER_DIR: /Applications/Xcode_12.4.app/Contents/Developer
+  DEVELOPER_DIR: /Applications/Xcode_16.4.app/Contents/Developer
 jobs:
   test:
-    runs-on: macos-10.15
+    runs-on: macos-15
     strategy:
       matrix:
        include:
          - platform-version: iOS
-           DEST: "OS=14.4,name=iPhone 8"
+           DEST: "OS=18.4,name=iPhone 16"
            SCHEME: "Swinject-iOS"
            SDK: "iphonesimulator"
            ACTION: "test"
            PLATFORM: "iOS"
          - platform-version: macOS
-           DEST: "arch=x86_64"
+           DEST: "arch=arm64"
            SCHEME: "Swinject-macOS"
            SDK: "macosx"
            ACTION: "test"
            PLATFORM: "OSX"
          - platform-version: tvOS
-           DEST: "OS=14.3,name=Apple TV 4K"
+           DEST: "OS=18.4,name=Apple TV 4K"
            SCHEME: "Swinject-tvOS"
            SDK: "appletvsimulator"
            ACTION: "test"
            PLATFORM: "tvOS"
          - platform-version: watchOS
-           DEST: "OS=7.2,name=Apple Watch Series 6 - 44mm"
+           DEST: "OS=11.4,name=Apple Watch Series 10 - 46mm"
            SCHEME: "Swinject-watchOS"
            SDK: "watchsimulator"
            ACTION: "build"

.github/workflows/SPM Testing.yml

@@ -1,17 +1,23 @@
 # This is the First Workflow for Testing with Github Actions
 
 name: SPM Check
+
 on:
-  workflow_dispatch:
-env:
-  DEVELOPER_DIR: /Applications/Xcode_12.4.app/Contents/Developer
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
 jobs:
   spm-check:
-    runs-on: macos-10.15
+    env:
+      DEVELOPER_DIR: /Applications/Xcode_16.4.app/Contents/Developer
+    runs-on: macos-15
     steps:
-    - uses: actions/checkout@v2
-    - name: Setup Package File
-      run: mv .Package.Test.swift Package.swift
+    - uses: actions/checkout@v4
+    - uses: swift-actions/setup-swift@v2
+      with:
+        swift-version: "6.0.3"
     - name: Build
       run: swift build -v
     - name: Run tests

.swiftformat

@@ -1,4 +1,4 @@
---swiftversion 5.0
+--swiftversion 6.0
 --exclude .Package.Test.swift
 --exclude Package.swift
 --header "\n Copyright © {created.year} Swinject Contributors. All rights reserved.\n"

Package.swift

@@ -1,21 +1,19 @@
-// swift-tools-version:5.0
+// swift-tools-version:6.0.0
 
 import PackageDescription
 
 let package = Package(
     name: "Swinject",
     platforms: [
-        .macOS(.v10_10),
-        .iOS(.v9),
-        .tvOS(.v9),
-        .watchOS(.v2)
+        .macOS(.v10_13),
+        .iOS(.v12),
+        .tvOS(.v12),
+        .watchOS(.v4),
+        .visionOS(.v1)
     ],
     products: [
         .library(name: "Swinject",
                  targets: ["Swinject"]),
-        .library(name: "Swinject-Dynamic",
-                 type: .dynamic,
-                 targets: ["Swinject"]),
     ],
     targets: [
         .target(name: "Swinject",

README.md

@@ -5,7 +5,6 @@
 Swinject
 ========
 
-[![Travis CI Com](https://travis-ci.com/Swinject/Swinject.svg?branch=master)](https://travis-ci.com/Swinject/Swinject)
 ![Github Actions](https://github.com/1ucas/Swinject/actions/workflows/Project%20Testing.yml/badge.svg?branch=master)
 [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
 [![CocoaPods Version](https://img.shields.io/cocoapods/v/Swinject.svg?style=flat)](http://cocoapods.org/pods/Swinject)
@@ -18,6 +17,8 @@ Swinject is a lightweight [dependency injection](https://en.wikipedia.org/wiki/D
 
 Dependency injection (DI) is a software design pattern that implements Inversion of Control (IoC) for resolving dependencies. In the pattern, Swinject helps your app split into loosely-coupled components, which can be developed, tested and maintained more easily. Swinject is powered by the Swift generic type system and first class functions to define dependencies of your app simply and fluently.
 
+Swinject is maintained by the [Faire Wholesale Inc.](https://github.com/Faire?view_as=public) mobile platform team.
+
 ## Features
 
 - [x] [Pure Swift Type Support](./Documentation/README.md#user-content-pure-swift-type-support)
@@ -280,7 +281,7 @@ The DI container features of Swinject are inspired by:
 
 and highly inspired by:
 
-- [Funq](http://funq.codeplex.com) - [Daniel Cazzulino](http://www.codeplex.com/site/users/view/dcazzulino) and [the project team](http://funq.codeplex.com/team/view).
+- [Funq](https://github.com/kzu/funq) - [Daniel Cazzulino](https://github.com/kzu).
 
 ## License
 

Sources/Behavior.swift

@@ -5,15 +5,16 @@
 /// Protocol for adding functionality to the container
 public protocol Behavior {
     /// This will be invoked on each behavior added to the `container` for each `entry` added to the container using
-    /// one of the `register()` or type forwading methods
+    /// one of the `register()` or type forwarding methods
     ///
     /// - Parameters:
     ///     - container: container into which an `entry` has been registered
     ///     - type: Type which will be resolved using the `entry`
     ///     - entry: ServiceEntry registered to the `container`
     ///     - name: name under which the service has been registered to the `container`
     ///
-    /// - Remark: `Type` and `Service` can be different types in the case of type forwarding
+    /// - Remark: `Type` and `Service` can be different types in the case of type forwarding (commonly used as `.implements()`).
+    /// `Type` will represent the forwarded type key, and `Service` will represent the destination.
     func container<Type, Service>(
         _ container: Container,
         didRegisterType type: Type.Type,

Sources/Container.Arguments.erb

@@ -18,7 +18,7 @@
 
 import Foundation
 
-// MARK: - Registeration with Arguments
+// MARK: - Registration with Arguments
 extension Container {
 <% (1..arg_count).each do |i| %>
 <%   arg_types = (1..i).map { |n| "Arg#{n}" }.join(", ") %>

Sources/Container.Arguments.swift

@@ -12,7 +12,7 @@
 
 import Foundation
 
-// MARK: - Registeration with Arguments
+// MARK: - Registration with Arguments
 
 extension Container {
     /// Adds a registration for the specified service with the factory closure to specify how the service is resolved with dependencies.

Sources/Container.Logging.swift

@@ -2,19 +2,11 @@
 //  Copyright © 2019 Swinject Contributors. All rights reserved.
 //
 
-public typealias LoggingFunctionType = (String) -> Void
-
+import Foundation
 public extension Container {
-    /// Function to be used for logging debugging data.
-    /// Default implementation writes to standard output.
-    static var loggingFunction: LoggingFunctionType? {
-        get { return _loggingFunction }
-        set { _loggingFunction = newValue }
-    }
-
     internal static func log(_ message: String) {
-        _loggingFunction?(message)
+        if ProcessInfo.processInfo.environment["SWINJECT_LOGGING_ENABLED"] == "1" {
+            print(message)
+        }
     }
 }
-
-private var _loggingFunction: LoggingFunctionType? = { print($0) }

Sources/Container.TypeForwarding.swift

@@ -25,7 +25,9 @@ extension Container {
             name: name,
             option: nil
         )
-        services[key] = service
-        behaviors.forEach { $0.container(self, didRegisterType: type, toService: service, withName: name) }
+        syncIfEnabled {
+            services[key] = service
+            behaviors.forEach { $0.container(self, didRegisterType: type, toService: service, withName: name) }
+        }
     }
 }