Upgrade to Swift 5

paircast · Mar 26, 2019 · a0f712a · a0f712a
1 parent 2447e76
commit a0f712a
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 509 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,3 @@
 /.build
 /Packages
-xcuserdata
-project.xcworkspace
+/*.xcodeproj
diff --git a/.swiftlint.yml b/.swiftlint.yml
@@ -15,6 +15,7 @@ whitelist_rules:
   - conditional_returns_on_newline
   - contains_over_first_not_nil
   - control_statement
+  - deployment_target
   - discarded_notification_center_observer
   - discouraged_direct_init
   - discouraged_object_literal
@@ -148,3 +149,8 @@ identifier_name:
     - 'y'
     - 'a'
     - 'b'
+    - 'x1'
+    - 'x2'
+    - 'y1'
+    - 'y2'
+macOS_deployment_target: '10.12'
diff --git a/Aperture.podspec b/Aperture.podspec
@@ -8,6 +8,6 @@ Pod::Spec.new do |s|
 	s.authors = { 'Sindre Sorhus' => '[email protected]', 'Matheus Fernandes' => '[email protected]' }
 	s.source = { :git => 'https://github.com/wulkano/Aperture.git', :tag => "v#{s.version}" }
 	s.source_files = 'Sources/**/*.swift'
-	s.swift_version = '4.2'
+	s.swift_version = '5'
 	s.platform = :macos, '10.12'
 end
diff --git a/Aperture.xcodeproj/Aperture_Info.plist b/Aperture.xcodeproj/Aperture_Info.plist
diff --git a/Aperture.xcodeproj/project.pbxproj b/Aperture.xcodeproj/project.pbxproj