fixup! Run CI with Xcode 12.5.1 & Swift 5.4

realm · Sep 9, 2021 · af40b10 · af40b10
1 parent 4755cf1
commit af40b10
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 #### Breaking
 
-* SwiftLint now requires Swift 5.3 or higher to build.  
+* SwiftLint now requires Swift 5.4 or higher to build.  
   [JP Simard](https://github.com/jpsim)
 
 #### Experimental

diff --git a/Makefile b/Makefile
@@ -126,7 +126,7 @@ docker_image:
 	docker build --force-rm --tag swiftlint .
 
 docker_test:
-	docker run -v `pwd`:`pwd` -w `pwd` --name swiftlint --rm swift:5.3 swift test --parallel
+	docker run -v `pwd`:`pwd` -w `pwd` --name swiftlint --rm swift:5.4 swift test --parallel
 
 docker_htop:
 	docker run -it --rm --pid=container:swiftlint terencewestphal/htop || reset

diff --git a/README.md b/README.md
@@ -60,7 +60,7 @@ running it.
 ### Installing from source:
 
 You can also build and install from source by cloning this project and running
-`make install` (Xcode 12 or later).
+`make install` (Xcode 12.5 or later).
 
 ## Usage
 

diff --git a/README_CN.md b/README_CN.md
@@ -45,7 +45,7 @@ $ mint install realm/SwiftLint
 
 ### 编译源代码：
 
-你也可以通过 Clone SwiftLint 的 Git 仓库到本地然后执行 `make install` (Xcode 11.4+) 编译源代码的方式来安装。
+你也可以通过 Clone SwiftLint 的 Git 仓库到本地然后执行 `make install` (Xcode 12.5+) 编译源代码的方式来安装。
 
 ## 用法
 

diff --git a/README_KR.md b/README_KR.md
@@ -44,7 +44,7 @@ $ mint install realm/SwiftLint
 
 ### 소스를 직접 컴파일하는 경우:
 
-본 프로젝트를 클론해서 빌드할 수도 있습니다. `make install` 명령을 사용합니다. (Xcode 11.4 이후 버전)
+본 프로젝트를 클론해서 빌드할 수도 있습니다. `make install` 명령을 사용합니다. (Xcode 12.5 이후 버전)
 
 ## 사용 방법
 

diff --git a/Source/SwiftLintFramework/Rules/Lint/UnusedDeclarationRuleExamples.swift b/Source/SwiftLintFramework/Rules/Lint/UnusedDeclarationRuleExamples.swift
@@ -25,10 +25,10 @@ struct UnusedDeclarationRuleExamples {
         }
 
         let changes = [Change.insert(0), .delete(0)]
-        changes.deletes()
+        _ = changes.deletes()
         """),
         Example("""
-        struct Item {}
+        struct Item: Codable {}
         struct ResponseModel: Codable {
             let items: [Item]
 
@@ -79,7 +79,7 @@ struct UnusedDeclarationRuleExamples {
           indirect case optional(Component?)
         }
 
-        @_functionBuilder
+        @resultBuilder
         struct ComponentBuilder {
           static func buildExpression(_ string: StaticString) -> Component {
             return .string(string)

diff --git a/Tests/SwiftLintFrameworkTests/SwiftVersionTests.swift b/Tests/SwiftLintFrameworkTests/SwiftVersionTests.swift
@@ -6,6 +6,8 @@ final class SwiftVersionTests: XCTestCase {
     func testDetectSwiftVersion() {
         #if compiler(>=5.5.0)
             let version = "5.5.0"
+        #elseif compiler(>=5.4.2)
+            let version = "5.4.2"
         #elseif compiler(>=5.4.1)
             let version = "5.4.1"
         #elseif compiler(>=5.4.0)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -8,8 +8,6 @@ jobs:
   strategy:
     maxParallel: 10
     matrix:
-      swift53:
-        containerImage: swift:5.3
       swift54:
         containerImage: swift:5.4
   container: $[ variables['containerImage'] ]
@@ -23,8 +21,6 @@ jobs:
   strategy:
     maxParallel: 10
     matrix:
-      xcode124:
-        DEVELOPER_DIR: /Applications/Xcode_12.4.app
       xcode125:
         DEVELOPER_DIR: /Applications/Xcode_12.5.1.app
   steps:
@@ -51,8 +47,6 @@ jobs:
   strategy:
     maxParallel: 10
     matrix:
-      xcode124:
-        DEVELOPER_DIR: /Applications/Xcode_12.4.app
       xcode125:
         DEVELOPER_DIR: /Applications/Xcode_12.5.1.app
   steps: