[APP-1953] Xcode 12.5 support (#77)

iZettle · Jul 27, 2021 · 3af918b · 3af918b
1 parent 4aeee13
commit 3af918b
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -9,7 +9,7 @@ anchors:
   - &test_output_folder test_output
   - &default_executor
     macos:
-      xcode: "12.4.0"
+      xcode: "12.5.0"
 
 env:
   global:
@@ -124,8 +124,8 @@ jobs:
       - run:
           name: Install SwiftLint(<< parameters.version >>)
           command: |
-            brew extract --version='<< parameters.version >>' swiftlint homebrew/cask
-            brew install swiftlint@<< parameters.version >>
+            curl -L -k -o /Users/distiller/Downloads/SwiftLint.pkg https://github.com/realm/SwiftLint/releases/download/<< parameters.version >>/SwiftLint.pkg
+            sudo installer -pkg /Users/distiller/Downloads/SwiftLint.pkg -target /
       # Run SwiftLint.
       - run:
           name: Lint Codebase

diff --git a/Cartfile b/Cartfile
@@ -1 +1 @@
-github "iZettle/Flow" "1.9.0"
+github "iZettle/Flow" "1.9.1"
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1 +1 @@
-github "iZettle/Flow" "1.9.0"
+github "iZettle/Flow" "1.9.1"
diff --git a/Presentation.xcodeproj/project.pbxproj b/Presentation.xcodeproj/project.pbxproj
@@ -479,7 +479,7 @@
 				INFOPLIST_FILE = Presentation/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				MARKETING_VERSION = 1.14.0;
+				MARKETING_VERSION = 1.14.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.iZettle.Presentation;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -500,7 +500,7 @@
 				INFOPLIST_FILE = Presentation/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				MARKETING_VERSION = 1.14.0;
+				MARKETING_VERSION = 1.14.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.iZettle.Presentation;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;

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

diff --git a/PresentationFramework.podspec b/PresentationFramework.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "PresentationFramework"
-  s.version      = "1.14.0"
+  s.version      = "1.14.1"
   s.module_name  = "Presentation"
   s.summary      = "Driving presentations from model to result"
   s.description  = <<-DESC