瀏覽代碼

Merge branch 'swift5'

Marcin Krzyzanowski 6 年之前
父節點
當前提交
94a1971569
共有 6 個文件被更改,包括 11 次插入13 次删除
  1. 1 1
      .swift-version
  2. 1 1
      CryptoSwift.podspec
  3. 5 8
      CryptoSwift.xcodeproj/project.pbxproj
  4. 1 1
      README.md
  5. 2 1
      config/CryptoSwift-Shared.xcconfig
  6. 1 1
      config/Project-Shared.xcconfig

+ 1 - 1
.swift-version

@@ -1 +1 @@
-4.2.1
+5.0

+ 1 - 1
CryptoSwift.podspec

@@ -9,7 +9,7 @@ Pod::Spec.new do |s|
   s.authors      = {'Marcin Krzyżanowski' => 'marcin@krzyzanowskim.com'}
   s.social_media_url = "https://twitter.com/krzyzanowskim"
   s.cocoapods_version = '>= 1.4.0'
-  s.swift_version = "4.2"
+  s.swift_version = "5.0"
   s.ios.deployment_target = "8.0"
   s.osx.deployment_target = "10.10"
   s.watchos.deployment_target = "2.0"

+ 5 - 8
CryptoSwift.xcodeproj/project.pbxproj

@@ -792,27 +792,27 @@
 				TargetAttributes = {
 					75211F91207249D8004E41F8 = {
 						CreatedOnToolsVersion = 9.3;
-						LastSwiftMigration = 1000;
+						LastSwiftMigration = 1020;
 						ProvisioningStyle = Automatic;
 					};
 					754BE45419693E190098E6F3 = {
 						CreatedOnToolsVersion = 6.0;
-						LastSwiftMigration = 1000;
+						LastSwiftMigration = 1020;
 						ProvisioningStyle = Manual;
 					};
 					754BE45F19693E190098E6F3 = {
 						CreatedOnToolsVersion = 6.0;
-						LastSwiftMigration = 1000;
+						LastSwiftMigration = 1020;
 						ProvisioningStyle = Manual;
 					};
 					7564F04E2072EAEB00CA5A96 = {
-						LastSwiftMigration = 1000;
+						LastSwiftMigration = 1020;
 						ProvisioningStyle = Manual;
 						TestTargetID = 75211F91207249D8004E41F8;
 					};
 					7595C1492072E48C00EA1A5F = {
 						CreatedOnToolsVersion = 9.3;
-						LastSwiftMigration = 1000;
+						LastSwiftMigration = 1020;
 						ProvisioningStyle = Manual;
 					};
 				};
@@ -1121,7 +1121,6 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 75211FB020724A10004E41F8 /* Project-Debug.xcconfig */;
 			buildSettings = {
-				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 			};
 			name = Debug;
 		};
@@ -1129,7 +1128,6 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 75211FAA20724A0F004E41F8 /* Project-Release.xcconfig */;
 			buildSettings = {
-				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 			};
 			name = Release;
 		};
@@ -1198,7 +1196,6 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 75211FA620724A0F004E41F8 /* Project-Test.xcconfig */;
 			buildSettings = {
-				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 			};
 			name = Test;
 		};

+ 1 - 1
README.md

@@ -1,6 +1,6 @@
 [![Platform](https://img.shields.io/badge/Platforms-iOS%20%7C%20Android%20%7CmacOS%20%7C%20watchOS%20%7C%20tvOS%20%7C%20Linux-4E4E4E.svg?colorA=28a745)](#installation)
 
-[![Swift support](https://img.shields.io/badge/Swift-3.1%20%7C%203.2%20%7C%204.0%20%7C%204.1-lightgrey.svg?colorA=28a745&colorB=4E4E4E)](#swift-versions-support)
+[![Swift support](https://img.shields.io/badge/Swift-3.1%20%7C%203.2%20%7C%204.0%20%7C%204.1%20%7C%204.2%20%7C%205.0-lightgrey.svg?colorA=28a745&colorB=4E4E4E)](#swift-versions-support)
 [![CocoaPods Compatible](https://img.shields.io/cocoapods/v/CryptoSwift.svg?style=flat&label=CocoaPods&colorA=28a745&&colorB=4E4E4E)](https://cocoapods.org/pods/CryptoSwift)
 [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-brightgreen.svg?style=flat&colorA=28a745&&colorB=4E4E4E)](https://github.com/Carthage/Carthage)
 [![Swift Package Manager compatible](https://img.shields.io/badge/SPM-compatible-brightgreen.svg?style=flat&colorA=28a745&&colorB=4E4E4E)](https://github.com/apple/swift-package-manager)

+ 2 - 1
config/CryptoSwift-Shared.xcconfig

@@ -5,6 +5,7 @@
 // https://github.com/dempseyatgithub/BuildSettingExtractor
 //
 
+CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES
 
 // Require Only App-Extension-Safe API
 // 
@@ -139,7 +140,7 @@ SKIP_INSTALL = YES
 // 
 // 
 
-SWIFT_VERSION = 4.2
+SWIFT_VERSION = 5.0
 
 
 

+ 1 - 1
config/Project-Shared.xcconfig

@@ -479,7 +479,7 @@ SWIFT_COMPILATION_MODE = wholemodule
 // 
 // 
 
-SWIFT_VERSION = 4.2
+SWIFT_VERSION = 5.0