Move CI to 13.2.1 (#181)

iZettle · Mar 9, 2022 · b1efe55 · b1efe55
1 parent ceb7589
commit b1efe55
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 13 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -9,27 +9,19 @@ anchors:
   - &test_output_folder test_output
   - &default_executor
     macos:
-      xcode: "13.0.0"
+      xcode: "13.2.1"
 
 env:
   global:
     - LC_CTYPE=en_US.UTF-8
     - LANG=en_US.UTF-8
 
 commands:
-  fetch-pod-specs:
-    steps:
-      - run:
-          name: Fetch CocoaPods Specs
-          command: |
-            curl https://cocoapods-specs.circleci.com/fetch-cocoapods-repo-from-s3.sh | bash -s cf
-
   pod-install:
     parameters:
       path:
         type: string
     steps:
-      - fetch-pod-specs # Fetch the podspec repo changes first to be sure to always get the latest pods
       - run:
           command: |
             cd <<parameters.path>>

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# 3.2.1
+
+# 3.3.3
+- Xcode 13.2 compatibility
+
 # 3.3.2
 
 - Include all views, not just sections, in the accessibility elements of a FormView.

diff --git a/Cartfile b/Cartfile
@@ -1 +1 @@
-github "iZettle/Flow" "1.10.0"
+github "iZettle/Flow" "1.10.1"
diff --git a/Form.xcodeproj/project.pbxproj b/Form.xcodeproj/project.pbxproj
@@ -857,7 +857,7 @@
 				INFOPLIST_FILE = Form/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				MARKETING_VERSION = 3.2.0;
+				MARKETING_VERSION = 3.3.3;
 				PRODUCT_BUNDLE_IDENTIFIER = com.iZettle.Form;
 				PRODUCT_NAME = Form;
 				SKIP_INSTALL = YES;
@@ -878,7 +878,7 @@
 				INFOPLIST_FILE = Form/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				MARKETING_VERSION = 3.2.0;
+				MARKETING_VERSION = 3.3.3;
 				PRODUCT_BUNDLE_IDENTIFIER = com.iZettle.Form;
 				PRODUCT_NAME = Form;
 				SKIP_INSTALL = YES;

diff --git a/Form/Info.plist b/Form/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.3.2</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/README.md b/README.md
@@ -3,6 +3,7 @@
 [![Build Status](https://travis-ci.org/iZettle/Form.svg?branch=master)](https://travis-ci.org/iZettle/Form)
 [![Platforms](https://img.shields.io/badge/platform-%20iOS-gray.svg)](https://img.shields.io/badge/platform-%20iOS-gray.svg)
 [![Carthage Compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
+![Xcode version](https://img.shields.io/badge/Xcode-13.2.0-green)
 
 Form is an iOS Swift library for building and styling UIs. A toolbox of highly composable utilities for solving common UI related problems, such as:
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		github "iZettle/Flow" "1.10.0"
		github "iZettle/Flow" "1.10.1"