Update Readme and conig (#195)

iZettle · Nov 14, 2023 · 80dad6f · 80dad6f
1 parent 68b83aa
commit 80dad6f
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 10 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -4,12 +4,12 @@
 version: 2.1
 
 anchors:
-  - &test_device "iPhone Xs"
+  - &test_device "iPhone 15"
   - &clean_before_build true
   - &test_output_folder test_output
   - &default_executor
     macos:
-      xcode: "14.0.0"
+      xcode: "15.0.0"
 
 env:
   global:
@@ -47,6 +47,7 @@ commands:
           scheme: "Example"
           path: <<parameters.path>>
           test_output_folder: *test_output_folder
+          simulator: "iPhone 14"
 
   # We introduced two separate commands for projects and workspaces because we didnt find a generic and non-confusing way to introduce
   # a condition to only pass either the project or the workspace environment argument to the fastlane scan
@@ -82,6 +83,9 @@ commands:
         type: string
       test_output_folder:
         type: string
+      simulator:
+        type: string
+        default: *test_device
     steps:
       - run:
           command:  |
@@ -90,7 +94,7 @@ commands:
           environment:
               SCAN_WORKSPACE: <<parameters.workspace>>
               SCAN_SCHEME: <<parameters.scheme>>
-              SCAN_DEVICE: *test_device
+              SCAN_DEVICE: <<parameters.simulator>>
               SCAN_CLEAN: *clean_before_build
       - store_artifacts: # This will by default store an html and junit file as artifacts (See "Artifacts" tab in CircleCI report)
           path: <<parameters.path>>/<<parameters.test_output_folder>> # test_output is the default temporary folder for fastlane scan output
@@ -124,25 +128,33 @@ jobs:
       - store_test_results:
           path: swiftlint.html
 
-  test-xcode13-ios15:
+  test-xcode14-ios16:
     macos:
-      xcode: "13.0.0"
+      xcode: "14.0.0"
     steps:
       - test_main_project
 
-  test-xcode14-ios16:
+  test-xcode15-ios17:
     <<: *default_executor
     steps:
       - test_main_project
 
   test-example-messages:
-    <<: *default_executor
+    # can not use xcode > 14 since we have this error.
+    # deprecate to_default_s: :to_s, deprecator: ActiveSupport.deprecator
+    # to solve it we need to update the podspec.
+    macos:
+      xcode: "14.0.0"
     steps:
       - test_example_project:
           path: Examples/Messages
 
   test-example-demo:
-    <<: *default_executor
+    # can not use xcode > 14 since we have this error.
+    # deprecate to_default_s: :to_s, deprecator: ActiveSupport.deprecator
+    # to solve it we need to update the podspec.
+    macos:
+      xcode: "14.0.0"
     steps:
       - test_example_project:
           path: Examples/Demo
@@ -153,8 +165,9 @@ workflows:
     jobs:
       - swiftlint:
           version: 0.49.1
-      - test-xcode13-ios15
       - test-xcode14-ios16
+      # Disable untill we fix test for Xcode 15
+      # - test-xcode15-ios17
       - test-example-messages
       - test-example-demo
 
diff --git a/README.md b/README.md
@@ -191,4 +191,4 @@ Form was developed, evolved and field-tested over the course of several years, a
 
 ## Collaborate
 
-You can collaborate with us on our Slack workspace. Ask questions, share ideas or maybe just participate in ongoing discussions. To get an invitation, write to us at [ios-oss@izettle.com](mailto:ios-oss@izettle.com)
+You can collaborate with us on our Slack workspace. Ask questions, share ideas or maybe just participate in ongoing discussions. To get an invitation, write to us at [iz-apps-platform-ios@paypal.com](mailto:iz-apps-platform-ios@paypal.com)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -191,4 +191,4 @@ Form was developed, evolved and field-tested over the course of several years, a

		## Collaborate

		You can collaborate with us on our Slack workspace. Ask questions, share ideas or maybe just participate in ongoing discussions. To get an invitation, write to us at [ios-oss@izettle.com](mailto:ios-oss@izettle.com)
		You can collaborate with us on our Slack workspace. Ask questions, share ideas or maybe just participate in ongoing discussions. To get an invitation, write to us at [iz-apps-platform-ios@paypal.com](mailto:iz-apps-platform-ios@paypal.com)