Skip to content

Commit 300e800

Browse files
Merge pull request #124 from iZettle/bump-xcode-versions
Bump Xcode versions for circle ci
2 parents c397d07 + ccf45e0 commit 300e800

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

.circleci/config.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ anchors:
99
- &test_output_folder test_output
1010
- &default_executor
1111
macos:
12-
xcode: "13.2.1"
12+
xcode: "14.0.0"
1313

1414
env:
1515
global:
@@ -132,13 +132,13 @@ jobs:
132132
- store_test_results:
133133
path: swiftlint.html
134134

135-
test-xcode12-ios14:
135+
test-xcode13-ios15:
136136
macos:
137-
xcode: "12.5.0"
137+
xcode: "13.0.0"
138138
steps:
139139
- test_main_project
140140

141-
test-xcode13-ios15:
141+
test-xcode14-ios16:
142142
<<: *default_executor
143143
steps:
144144
- test_main_project
@@ -154,8 +154,8 @@ workflows:
154154
build-and-test:
155155
jobs:
156156
- swiftlint:
157-
version: 0.39.2
158-
- test-xcode12-ios14
157+
version: 0.49.1
159158
- test-xcode13-ios15
159+
- test-xcode14-ios16
160160
- test-example-login
161161

Flow.xcodeproj/project.pbxproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -673,7 +673,7 @@
673673
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
674674
LIBRARY_SEARCH_PATHS = "$(inherited)";
675675
MACOSX_DEPLOYMENT_TARGET = 10.11;
676-
MARKETING_VERSION = 1.10.2;
676+
MARKETING_VERSION = 1.10.3;
677677
OTHER_SWIFT_FLAGS = "-Xfrontend -warn-long-function-bodies=300 -Xfrontend -warn-long-expression-type-checking=300";
678678
PRODUCT_BUNDLE_IDENTIFIER = com.iZettle.Flow;
679679
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -701,7 +701,7 @@
701701
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
702702
LIBRARY_SEARCH_PATHS = "$(inherited)";
703703
MACOSX_DEPLOYMENT_TARGET = 10.11;
704-
MARKETING_VERSION = 1.10.2;
704+
MARKETING_VERSION = 1.10.3;
705705
OTHER_SWIFT_FLAGS = "-Xfrontend -warn-long-function-bodies=300 -Xfrontend -warn-long-expression-type-checking=300";
706706
PRODUCT_BUNDLE_IDENTIFIER = com.iZettle.Flow;
707707
PRODUCT_NAME = "$(TARGET_NAME)";

Flow/Future.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ public extension Future {
323323
var futureUnitTestAliveCount: Int32 = 0
324324

325325
func memPrint(_ str: String, _ count: Int32) {
326-
//print(str, count)
326+
// print(str, count)
327327
}
328328

329329
private extension Future {

0 commit comments

Comments
 (0)