Get ready for Xcode 11/iOS 13 (#209)

* update project settings * Add iOS 13 test target * Actually run tests on iOS 13 * Actually run tests on iOS 13 * swift format * Add missing reference image
jjochen · Sep 6, 2019 · a94b62e · a94b62e
1 parent 689043f
commit a94b62e
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 25 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -2,26 +2,35 @@ version: 2.1
 
 executors:
 
+  ios13-iphone-xs-max:
+    macos:
+      xcode: 11.0.0
+    shell: /bin/bash --login -eo pipefail
+    environment:
+      SIMULATOR_OS: 13.0
+      DESTINATION: platform=iOS Simulator,OS=13.0,name=iPhone Xs Max
+      SIMULATOR: iPhone Xs Max (13.0) [
+
   ios12-iphone-xs-max:
     macos:
-      xcode: 10.2.0
+      xcode: 10.3.0
     shell: /bin/bash --login -eo pipefail
     environment:
-      SIMULATOR_OS: 12.2
-      DESTINATION: platform=iOS Simulator,OS=12.2,name=iPhone XS Max
-      SIMULATOR: iPhone XS Max (12.2) [
+      SIMULATOR_OS: 12.4
+      DESTINATION: platform=iOS Simulator,OS=12.4,name=iPhone Xs Max
+      SIMULATOR: iPhone Xs Max (12.4) [
 
   ios11-iphone-x:
     macos:
-      xcode: 10.2.0
+      xcode: 10.3.0
     shell: /bin/bash --login -eo pipefail
     environment:
       DESTINATION: platform=iOS Simulator,OS=11.2,name=iPhone X
       SIMULATOR: iPhone X (11.2) [
 
   ios10-iphone-7:
     macos:
-      xcode: 10.2.0
+      xcode: 10.3.0
     shell: /bin/bash --login -eo pipefail
     environment:
       DESTINATION: platform=iOS Simulator,OS=10.3.1,name=iPhone 7
@@ -148,6 +157,17 @@ aliases:
 
 jobs:
 
+  build-and-test-ios13-iphonexsmax:
+    executor: ios13-iphone-xs-max
+    steps:
+      - checkout
+      - setup-gems
+      - start-simulator
+      - setup-cocoapods
+      - run-tests
+      - update-codecov
+      - store-reports
+
   build-and-test-ios12-iphonexsmax:
     executor: ios12-iphone-xs-max
     steps:
@@ -229,6 +249,7 @@ workflows:
     jobs:
       - lint-podspec
       - swiftlint
+      - build-and-test-ios13-iphonexsmax
       - build-and-test-ios12-iphonexsmax
       - build-documentation
       - push-podspec: *filter-version-tags-only
diff --git a/...tingActionButton.xcodeproj/xcshareddata/xcschemes/JJFloatingActionButton_Example.xcscheme b/...tingActionButton.xcodeproj/xcshareddata/xcschemes/JJFloatingActionButton_Example.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1100"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,9 +26,18 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
       codeCoverageEnabled = "YES"
-      onlyGenerateCoverageForSpecifiedTargets = "YES"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      onlyGenerateCoverageForSpecifiedTargets = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "198B65FC1FBAE904009A17F2"
+            BuildableName = "JJFloatingActionButton_Example.app"
+            BlueprintName = "JJFloatingActionButton_Example"
+            ReferencedContainer = "container:JJFloatingActionButton.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <CodeCoverageTargets>
          <BuildableReference
             BuildableIdentifier = "primary"
@@ -60,17 +69,6 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "198B65FC1FBAE904009A17F2"
-            BuildableName = "JJFloatingActionButton_Example.app"
-            BlueprintName = "JJFloatingActionButton_Example"
-            ReferencedContainer = "container:JJFloatingActionButton.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -92,8 +90,6 @@
             ReferencedContainer = "container:JJFloatingActionButton.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

diff --git a/Example/Tests/AnimationConfigurationSpec.swift b/Example/Tests/AnimationConfigurationSpec.swift
@@ -123,9 +123,9 @@ class AnimationConfigurationSpec: QuickSpec {
                 }
 
                 it("looks correct when item have background color") {
-                    actionButton.configureDefaultItem({ item in
+                    actionButton.configureDefaultItem { item in
                         item.backgroundColor = .red
-                    })
+                    }
 
                     actionButton.addItem(image: #imageLiteral(resourceName: "Like"))
                     actionButton.addItem(image: #imageLiteral(resourceName: "Baloon"))

diff --git a/...nButton__looks_correct_when_placed_in_view_controller_iPhone12_4_414x896@3x.png b/...nButton__looks_correct_when_placed_in_view_controller_iPhone12_4_414x896@3x.png
diff --git a/...nButton__looks_correct_when_placed_in_view_controller_iPhone13_0_414x896@3x.png b/...nButton__looks_correct_when_placed_in_view_controller_iPhone13_0_414x896@3x.png
diff --git a/Sources/Styles.swift b/Sources/Styles.swift
@@ -107,7 +107,7 @@ fileprivate extension Styles {
     static func drawImage(name: NSString,
                           size: CGSize,
                           fillColor: UIColor = UIColor(red: 0.267, green: 0.267, blue: 0.267, alpha: 1.000),
-                          path: (() -> UIBezierPath)) -> UIImage? {
+                          path: () -> UIBezierPath) -> UIImage? {
         var image = cache.object(forKey: name)
         if image == nil {
             UIGraphicsBeginImageContextWithOptions(size, false, 0)