Merge branch 'Swinject-master'

Author: ppamorim

.Package.Test.swift

@@ -0,0 +1,19 @@
+# This is the First Workflow for Testing with Github Actions
+
+name: Pod Lint
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+env:
+  ENCODING: LC_CTYPE=en_US.UTF-8
+jobs:
+  pod-lint:
+    runs-on: macos-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Linting PodSpec for Cocoapods
+        run: export "${{ env. ENCODING }}" | pod lib lint
+        shell: bash

.github/workflows/Pod Lint.yml

@@ -0,0 +1,44 @@
+# This is the First Workflow for Testing with Github Actions
+
+name: Testing
+on:
+  workflow_dispatch:
+env: 
+  PROJECT: Swinject.xcodeproj
+  DEVELOPER_DIR: /Applications/Xcode_12.4.app/Contents/Developer
+jobs:
+  test:
+    runs-on: macos-10.15
+    strategy:
+      matrix:
+       include:
+         - platform-version: iOS
+           DEST: "OS=14.4,name=iPhone 8"
+           SCHEME: "Swinject-iOS"
+           SDK: "iphonesimulator"
+           ACTION: "test"
+           PLATFORM: "iOS"
+         - platform-version: macOS
+           DEST: "arch=x86_64"
+           SCHEME: "Swinject-macOS"
+           SDK: "macosx"
+           ACTION: "test"
+           PLATFORM: "OSX"
+         - platform-version: tvOS
+           DEST: "OS=14.3,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"
+           SCHEME: "Swinject-watchOS"
+           SDK: "watchsimulator"
+           ACTION: "build"
+           PLATFORM: "watchOS"
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+      - name: Testing Framework for - "${{ matrix.PLATFORM }}"
+        run: xcodebuild "${{ matrix.ACTION }}" -project "${{ env.PROJECT }}" -scheme "${{ matrix.SCHEME }}" -sdk "${{ matrix.SDK }}" -destination "${{ matrix.DEST }}" -configuration Release ENABLE_TESTABILITY=YES | xcpretty
+        shell: bash

.github/workflows/Project Testing.yml

@@ -0,0 +1,22 @@
+# This is the First Workflow for Testing with Github Actions
+
+name: SPM Check
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  spm-check:
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@v4
+    - uses: swift-actions/setup-swift@v2
+      with:
+        swift-version: "5.9"
+    - name: Build
+      run: swift build -v
+    - name: Run tests
+      run: swift test -v

.github/workflows/SPM Testing.yml

@@ -5,38 +5,47 @@ env:
     - PROJECT=Swinject.xcodeproj
 git:
   submodules: false
+addons:
+  homebrew:
+    packages:
+    - xcodegen
 matrix:
   include:
-    - env: JOB="LINUX_SPM" SWIFT_VERSION="5.0"
+    - env: JOB="LINUX_SPM" SWIFT_VERSION="5.2.2"
       os: linux
       language: generic
       sudo: required
-      dist: trusty
+      dist: bionic
       before_install:
-        - eval "$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/raw/9f442512a46d7a2af7b850d65a7e9bd31edfb09b/swiftenv-install.sh)"
+        - eval "$(curl -sL https://swiftenv.fuller.li/install.sh)"
+      before_script:
       script:
         - mv .Package.Test.swift Package.swift
         - swift build
         - swift test
     - env: JOB="POD_LINT"
-      osx_image: xcode10.2
+      osx_image: xcode12.5
       before_install:
       script:
         - pod lib lint
-    - env: JOB="XCODE" DEST="OS=10.0,name=iPhone 6" SCHEME="Swinject-iOS" SDK="iphonesimulator" ACTION="test" PLATFORM="iOS"
-      osx_image: xcode10.2
+    - env: JOB="XCODE" DEST="OS=14.0.1,name=iPhone 8" SCHEME="Swinject-iOS" SDK="iphonesimulator" ACTION="test" PLATFORM="iOS"
+      osx_image: xcode12.5
     - env: JOB="XCODE" DEST="arch=x86_64" SCHEME="Swinject-macOS" SDK="macosx" ACTION="test" PLATFORM="OSX"
-      osx_image: xcode10.2
-    - env: JOB="XCODE" DEST="OS=10.0,name=Apple TV 1080p" SCHEME="Swinject-tvOS" SDK="appletvsimulator" ACTION="test" PLATFORM="tvOS"
-      osx_image: xcode10.2
-    - env: JOB="XCODE" DEST="OS=2.2,name=Apple Watch - 42mm" SCHEME="Swinject-watchOS" SDK="watchsimulator" ACTION="build" PLATFORM="watchOS"
-      osx_image: xcode10.2
+      osx_image: xcode12.5
+    - env: JOB="XCODE" DEST="OS=14.0,name=Apple TV 4K" SCHEME="Swinject-tvOS" SDK="appletvsimulator" ACTION="test" PLATFORM="tvOS"
+      osx_image: xcode12.5
+    - env: JOB="XCODE" DEST="OS=7.0,name=Apple Watch Series 6 - 44mm" SCHEME="Swinject-watchOS" SDK="watchsimulator" ACTION="build" PLATFORM="watchOS"
+      osx_image: xcode12.5
 
 before_install:
-  - curl -L -O https://github.com/Carthage/Carthage/releases/download/0.33.0/Carthage.pkg
-  - sudo installer -pkg Carthage.pkg -target /
-  - rm Carthage.pkg
-  - carthage bootstrap --verbose --platform $PLATFORM
+  - xcconfig=$(mktemp /tmp/static.xcconfig.XXXXXX)
+  - trap 'rm -f "$xcconfig"' INT TERM HUP EXIT
+  - echo 'EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_1200 = arm64 arm64e armv7 armv7s armv6 armv8' >> $xcconfig
+  - echo 'EXCLUDED_ARCHS = $(inherited) $(EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_$(EFFECTIVE_PLATFORM_SUFFIX)__NATIVE_ARCH_64_BIT_$(NATIVE_ARCH_64_BIT)__XCODE_$(XCODE_VERSION_MAJOR))' >> $xcconfig
+  - export XCODE_XCCONFIG_FILE="$xcconfig"
+before_script:
+  - rm -r Swinject.xcodeproj
+  - xcodegen generate
 script:
   - set -o pipefail
   - xcodebuild "$ACTION" -project "$PROJECT" -scheme "$SCHEME" -sdk "$SDK" -destination "$DEST" -configuration Release ENABLE_TESTABILITY=YES | xcpretty

.travis.yml

@@ -20,8 +20,6 @@ Pull requests are more appreciated to improve Swinject or to fix problems. Any k
 
 ### Getting Started
 
-Framework dependencies of Swinject are managed with [Carthage](https://github.com/Carthage/Carthage/releases). Make sure you have its latest version installed. The latest installer is available at [the Carthage release page](https://github.com/Carthage/Carthage/releases).
-
 To setup a Swinject repository in your local Mac, run `git clone` command in Terminal.
 
 `git clone --recursive [email protected]:Swinject/Swinject.git`
@@ -30,11 +28,11 @@ Move to the Swinject directory.
 
 `cd Swinject`
 
-Then run `carthage` command to build the frameworks that Swinject uses.
+Now it is ready to open `Swinject.xcodeproj`. Modify the code, run unit tests, and submit your pull request.
 
-`carthage bootstrap`
+### Project Generation
 
-Now it is ready to open `Swinject.xcodeproj`. Modify the code, run unit tests, and submit your pull request.
+If you need to add / change any project settings or files inside the `Sources` folder, remember to also update the `project.yml`, which keeps our project generation in sync with the `Swinject.xcodeproj`. 
 
 ### Code Style
 
@@ -48,3 +46,9 @@ The installation of SwiftLint to your environment is optional. [Hound CI](https:
 Some Swift source files are generated from ERB files, e.g. `Resolver.swift` is generated from `Resolver.erb`, to easily maintain a set of functions that only differ the number of arguments. The generated source files are located under `GeneratedCode` group in the Xcode project. Do not modify the generated code directly, but instead modify the source ERB code. After modifying the ERB code, run `script/gencode` script to generate the Swift code.
 
 **Thank you for contributing!**
+
+## For Maintainers
+
+### Making a new release version
+
+Our release procedure is described as [Makefile](https://github.com/Swinject/Swinject/blob/master/Makefile). Run `make help` coomand for more info.

CONTRIBUTING.md

@@ -61,7 +61,9 @@ protocol LogHandler {
 
 class Logger {
 
-    class var sharedInstance: Logger!
+    static let sharedInstance = Logger()
+    
+    private init() {}
 
     var logHandlers = [LogHandler]()
 

Cartfile.private

@@ -39,7 +39,7 @@ Above holds for reference types - value types are not shared in this object scop
 Custom object scopes can be defined like this:
 ```swift
 extension ObjectScope {
-    static let custom = ObjectScope(storageFactory: PermamentStorage.init)
+    static let custom = ObjectScope(storageFactory: PermanentStorage.init)
 }
 ```
 Instances in `.custom` scope will be shared in the same way as in `.container` scope but can be discarded as needed: