Merge pull request #8 from powerwolf543/develop

Support Xcode12
powerwolf543 · Nov 20, 2020 · 790aee3 · 790aee3
2 parents 2e56cf5 + 32f4297
commit 790aee3
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 15 deletions.
diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml
@@ -13,7 +13,7 @@ jobs:
       fail-fast: false
       matrix:
         scheme: ["FileExplorer", "Utils"]
-        xcode: ["11.7"]
+        xcode: ["12.2"]
 
     steps:
     - uses: actions/checkout@v2
@@ -22,7 +22,7 @@ jobs:
       run: sudo xcode-select --switch /Applications/Xcode_${{ matrix.xcode }}.app
 
     - name: ${{ matrix.scheme }} tests
-      run: xcodebuild test -scheme ${{ matrix.scheme }} -destination 'platform=OS X,arch=x86_64' -enableCodeCoverage YES
+      run: set -o pipefail && xcodebuild test -scheme ${{ matrix.scheme }} -destination 'platform=OS X,arch=x86_64' -enableCodeCoverage YES | xcpretty
 
     - name: Upload coverage to Codecov
       uses: codecov/codecov-action@v1

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,11 +5,13 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 #### Releases
-- `1.x` Releases - [1.6.1](#161-2020-10-03) | [1.6.0](#160-2020-10-03) | [1.5.0](#150-2018-12-11) | [1.4.0](#140-2017-10-06) | [1.3.0](#130-2016-11-10) | [1.2.0](#120-2016-10-20) | [1.1.0](#110-2016-10-14) 
+- `1.x` Releases - [1.6.2](#162---2020-11-21) | [1.6.1](#161---2020-10-03) | [1.6.0](#160---2020-10-03) | [1.5.0](#150---2018-12-11) | [1.4.0](#140---2017-10-06) | [1.3.0](#130---2016-11-10) | [1.2.0](#120---2016-10-20) | [1.1.0](#110---2016-10-14) 
 
 ## [Unreleased]
+
+## [1.6.2] - 2020-11-21
 ### Updated
-- Xcode12
+- Support Xcode 12.2
 
 ## [1.6.1] - 2020-10-03
 ### Updated

diff --git a/DuplicateFinder.xcodeproj/project.pbxproj b/DuplicateFinder.xcodeproj/project.pbxproj
@@ -133,7 +133,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 1160;
-				LastUpgradeCheck = 1160;
+				LastUpgradeCheck = 1220;
 				ORGANIZATIONNAME = "Nixon Shih";
 				TargetAttributes = {
 					2519329925271E600084D3B7 = {
@@ -243,6 +243,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;
@@ -304,6 +305,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;
@@ -336,6 +338,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = DuplicateFinder/DuplicateFinder.entitlements;
+				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				DEVELOPMENT_TEAM = RF986632CV;
@@ -345,7 +348,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 1.6.1;
+				MARKETING_VERSION = 1.6.2;
 				PRODUCT_BUNDLE_IDENTIFIER = net.nixondesign.DuplicateFinder;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
@@ -357,6 +360,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = DuplicateFinder/DuplicateFinder.entitlements;
+				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
 				DEVELOPMENT_TEAM = RF986632CV;
@@ -366,7 +370,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 1.6.1;
+				MARKETING_VERSION = 1.6.2;
 				PRODUCT_BUNDLE_IDENTIFIER = net.nixondesign.DuplicateFinder;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;

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

diff --git a/FileExplorer/.swiftpm/xcode/xcshareddata/xcschemes/FileExplorer.xcscheme b/FileExplorer/.swiftpm/xcode/xcshareddata/xcschemes/FileExplorer.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1160"
+   LastUpgradeVersion = "1220"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/FileExplorer/Package.swift b/FileExplorer/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:5.2
+// swift-tools-version:5.3
 import PackageDescription
 
 let package = Package(

diff --git a/README.md b/README.md
@@ -31,8 +31,8 @@ Download the newest application on the [releases](https://github.com/powerwolf54
 
 ## Requirements
 
-- Xcode 11.7
-- Swift 5.2
+- Xcode 12.2
+- Swift 5.3
 - MacOS 10.15+
 
 ## Author

diff --git a/Utils/.swiftpm/xcode/xcshareddata/xcschemes/Utils.xcscheme b/Utils/.swiftpm/xcode/xcshareddata/xcschemes/Utils.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1160"
+   LastUpgradeVersion = "1220"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Utils/Package.swift b/Utils/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:5.2
+// swift-tools-version:5.3
 import PackageDescription
 
 let package = Package(

diff --git a/codecov.yml b/codecov.yml
@@ -1,4 +1,7 @@
-comment: no # Do not comment PR with the result
+coverage:
+  status:
+    project: off
+    patch: off
 
 ignore:
   - "FileExplorer/Sources/FileExplorer/PathIterator/DiskPathIterator.swift"