Skip to content

Commit

Permalink
Merge pull request #124 from iZettle/bump-xcode-versions
Browse files Browse the repository at this point in the history
Bump Xcode versions for circle ci
  • Loading branch information
shchukin-alex authored Sep 30, 2022
2 parents c397d07 + ccf45e0 commit 300e800
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
12 changes: 6 additions & 6 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ anchors:
- &test_output_folder test_output
- &default_executor
macos:
xcode: "13.2.1"
xcode: "14.0.0"

env:
global:
Expand Down Expand Up @@ -132,13 +132,13 @@ jobs:
- store_test_results:
path: swiftlint.html

test-xcode12-ios14:
test-xcode13-ios15:
macos:
xcode: "12.5.0"
xcode: "13.0.0"
steps:
- test_main_project

test-xcode13-ios15:
test-xcode14-ios16:
<<: *default_executor
steps:
- test_main_project
Expand All @@ -154,8 +154,8 @@ workflows:
build-and-test:
jobs:
- swiftlint:
version: 0.39.2
- test-xcode12-ios14
version: 0.49.1
- test-xcode13-ios15
- test-xcode14-ios16
- test-example-login

4 changes: 2 additions & 2 deletions Flow.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -673,7 +673,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
LIBRARY_SEARCH_PATHS = "$(inherited)";
MACOSX_DEPLOYMENT_TARGET = 10.11;
MARKETING_VERSION = 1.10.2;
MARKETING_VERSION = 1.10.3;
OTHER_SWIFT_FLAGS = "-Xfrontend -warn-long-function-bodies=300 -Xfrontend -warn-long-expression-type-checking=300";
PRODUCT_BUNDLE_IDENTIFIER = com.iZettle.Flow;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down Expand Up @@ -701,7 +701,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
LIBRARY_SEARCH_PATHS = "$(inherited)";
MACOSX_DEPLOYMENT_TARGET = 10.11;
MARKETING_VERSION = 1.10.2;
MARKETING_VERSION = 1.10.3;
OTHER_SWIFT_FLAGS = "-Xfrontend -warn-long-function-bodies=300 -Xfrontend -warn-long-expression-type-checking=300";
PRODUCT_BUNDLE_IDENTIFIER = com.iZettle.Flow;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down
2 changes: 1 addition & 1 deletion Flow/Future.swift
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ public extension Future {
var futureUnitTestAliveCount: Int32 = 0

func memPrint(_ str: String, _ count: Int32) {
//print(str, count)
// print(str, count)
}

private extension Future {
Expand Down

0 comments on commit 300e800

Please sign in to comment.