Merge pull request #46 from Liftric/chore/update-for-swift-5.4

Update framework for Swift 5.4
Liftric · May 18, 2021 · dd076cb · dd076cb
2 parents 6a3d63a + 4ebaee7
commit dd076cb
Show file tree

Hide file tree

Showing 12 changed files with 32 additions and 19 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -8,9 +8,9 @@ jobs:
     name: Build & Test DIKit
     steps:
     - uses: actions/checkout@v1
-    - uses: YOCKOW/Action-setup-swift@master
+    - uses: fwal/setup-swift@v1
       with:
-        swift-version: "5.2"
+        swift-version: "5.4"
     - name: View Swift Version
       run: swift --version
     - name: Build

diff --git a/DIKit.podspec b/DIKit.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name = "DIKit"
-  s.version = "1.6.0"
+  s.version = "1.6.1"
   s.license = { :type => "MIT", :file => "LICENSE" }
 
   s.summary = "Dependency Injection Framework for Swift."
@@ -10,7 +10,7 @@ Pod::Spec.new do |s|
   s.social_media_url = "http://twitter.com/benjohnde"
 
   s.platform         = :ios, "9.0"
-  s.swift_version    = "5.1"
+  s.swift_version    = "5.4"
 
   s.source           = { :git => "https://github.com/benjohnde/DIKit.git", :tag => "#{s.version}" }
 

diff --git a/DIKit/DIKit.xcodeproj/project.pbxproj b/DIKit/DIKit.xcodeproj/project.pbxproj
@@ -214,7 +214,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0920;
-				LastUpgradeCheck = 1100;
+				LastUpgradeCheck = 1250;
 				ORGANIZATIONNAME = "Ben John";
 				TargetAttributes = {
 					4BD95D872008B1C8009CE38D = {
@@ -371,6 +371,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -433,6 +434,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;

diff --git a/DIKit/DIKit.xcodeproj/xcshareddata/xcschemes/DIKit.xcscheme b/DIKit/DIKit.xcodeproj/xcshareddata/xcschemes/DIKit.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1100"
+   LastUpgradeVersion = "1250"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/DIKit/Sources/DIKitDSL.swift b/DIKit/Sources/DIKitDSL.swift
@@ -7,7 +7,7 @@
 //
 // Copyright © 2019 Ben John. All rights reserved.
 
-@_functionBuilder
+@resultBuilder
 public struct ModuleBuilder {
     public static func buildBlock(_ children: [ComponentProtocol]...) -> [ComponentProtocol] {
         children.flatMap { $0 }
@@ -22,7 +22,7 @@ public func module(@ModuleBuilder makeChildren: () -> [ComponentProtocol]) -> De
     DependencyContainer { container in makeChildren().forEach { c in container.register(c) } }
 }
 
-@_functionBuilder
+@resultBuilder
 public struct ModulesBuilder {
     public static func buildBlock(_ children: DependencyContainer...) -> [DependencyContainer] {
         children.compactMap { $0 }

diff --git a/DIKit/Tests/DIKitDSLTests.swift b/DIKit/Tests/DIKitDSLTests.swift
@@ -4,7 +4,6 @@
 // Ben John
 //
 // - Date: 27.08.20
-// swiftlint:disable nesting
 // Copyright © 2020 Ben John. All rights reserved.
 
 import XCTest

diff --git a/DIKit/Tests/DependencyContainerTests.swift b/DIKit/Tests/DependencyContainerTests.swift
@@ -4,7 +4,6 @@
 // Ben John
 //
 // - Date: 27.08.20
-// swiftlint:disable nesting
 // Copyright © 2020 Ben John. All rights reserved.
 
 import XCTest

diff --git a/DIKit/Tests/LazyInjectTests.swift b/DIKit/Tests/LazyInjectTests.swift
@@ -4,7 +4,6 @@
 // Ben John
 //
 // - Date: 27.08.20
-// swiftlint:disable nesting
 // Copyright © 2020 Ben John. All rights reserved.
 
 import XCTest

diff --git a/DIKit/Tests/OptionalInjectTests.swift b/DIKit/Tests/OptionalInjectTests.swift
@@ -4,7 +4,6 @@
 // Ben John
 //
 // - Date: 27.08.20
-// swiftlint:disable nesting
 // Copyright © 2020 Ben John. All rights reserved.
 
 import XCTest

diff --git a/DIKit/Tests/TaggedComponentTests.swift b/DIKit/Tests/TaggedComponentTests.swift
@@ -4,7 +4,6 @@
 // Ben John
 //
 // - Date: 27.08.20
-// swiftlint:disable nesting
 // Copyright © 2020 Ben John. All rights reserved.
 
 import XCTest

diff --git a/Package.swift b/Package.swift
@@ -1,13 +1,29 @@
-// swift-tools-version:5.1
+// swift-tools-version:5.4
 import PackageDescription
 
 let package = Package(
     name: "DIKit",
     products: [
-        .library(name: "DIKit", targets: ["DIKit"]),
+        .library(
+            name: "DIKit",
+            targets: ["DIKit"]
+        ),
     ],
     targets: [
-        .target(name: "DIKit", dependencies: [], path: "DIKit/Sources"),
-        .testTarget(name: "DIKitTests", dependencies: ["DIKit"], path: "DIKit/Tests"),
+        .target(
+            name: "DIKit",
+            path: "DIKit/Sources",
+            exclude: [
+                "Resources"
+            ]
+        ),
+        .testTarget(
+            name: "DIKitTests",
+            dependencies: ["DIKit"],
+            path: "DIKit/Tests",
+            exclude: [
+                "Info.plist"
+            ]
+        ),
     ]
 )
diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@ We started small, it perfectly fits our use case.
 DIKit can be installed using [Carthage](https://github.com/Carthage/Carthage). After installing Carthage just add DIKit to your Cartfile:
 
 ```ogdl
-github "Liftric/DIKit" ~> 1.6
+github "Liftric/DIKit" ~> 1.6.1
 ```
 
 ### Via CocoaPods
@@ -22,7 +22,7 @@ github "Liftric/DIKit" ~> 1.6
 
 ```ruby
 platform :ios, '9.0'
-pod 'DIKit', '~> 1.6'
+pod 'DIKit', '~> 1.6.1'
 ```
 
 ## Basic usage