Skip to content

Commit 499237c

Browse files
authored
Merge pull request #100 from iZettle/bump-ios-min-deployment-target
Bump to iOS 14
2 parents 6e231aa + 488c0fb commit 499237c

File tree

4 files changed

+14
-14
lines changed

4 files changed

+14
-14
lines changed

Package.resolved

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
"kind" : "remoteSourceControl",
66
"location" : "https://github.com/iZettle/Flow.git",
77
"state" : {
8-
"revision" : "c3e69f924f046207487948dcad55826343a122d5",
9-
"version" : "1.12.1"
8+
"branch" : "bump-ios-min-deployment-target",
9+
"revision" : "10f5108b34fe528f885d9a97513eb8dc43300d4e"
1010
}
1111
}
1212
],

Package.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import PackageDescription
55
let package = Package(
66
name: "Presentation",
77
platforms: [
8-
.iOS(.v12)
8+
.iOS(.v14)
99
],
1010
products: [
1111
.library(
@@ -15,7 +15,7 @@ let package = Package(
1515
dependencies: [
1616
.package(
1717
url: "https://github.com/iZettle/Flow.git",
18-
.upToNextMajor(from: "1.12.1")
18+
branch: "bump-ios-min-deployment-target"
1919
)
2020
],
2121
targets: [

Presentation.xcodeproj/project.pbxproj

+8-8
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@
390390
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
391391
GCC_WARN_UNUSED_FUNCTION = YES;
392392
GCC_WARN_UNUSED_VARIABLE = YES;
393-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
393+
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
394394
MTL_ENABLE_DEBUG_INFO = YES;
395395
ONLY_ACTIVE_ARCH = YES;
396396
SDKROOT = iphoneos;
@@ -443,7 +443,7 @@
443443
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
444444
GCC_WARN_UNUSED_FUNCTION = YES;
445445
GCC_WARN_UNUSED_VARIABLE = YES;
446-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
446+
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
447447
MTL_ENABLE_DEBUG_INFO = NO;
448448
SDKROOT = iphoneos;
449449
SWIFT_COMPILATION_MODE = wholemodule;
@@ -466,7 +466,7 @@
466466
FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/Carthage/Build/iOS";
467467
INFOPLIST_FILE = Presentation/Info.plist;
468468
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
469-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
469+
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
470470
LD_RUNPATH_SEARCH_PATHS = (
471471
"$(inherited)",
472472
"@executable_path/Frameworks",
@@ -492,7 +492,7 @@
492492
FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/Carthage/Build/iOS";
493493
INFOPLIST_FILE = Presentation/Info.plist;
494494
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
495-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
495+
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
496496
LD_RUNPATH_SEARCH_PATHS = (
497497
"$(inherited)",
498498
"@executable_path/Frameworks",
@@ -519,7 +519,7 @@
519519
"$(inherited)",
520520
);
521521
INFOPLIST_FILE = PresentationTests/Info.plist;
522-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
522+
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
523523
LD_RUNPATH_SEARCH_PATHS = (
524524
"$(inherited)",
525525
"@executable_path/Frameworks",
@@ -541,7 +541,7 @@
541541
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
542542
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
543543
INFOPLIST_FILE = PresentationTests/Info.plist;
544-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
544+
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
545545
LD_RUNPATH_SEARCH_PATHS = (
546546
"$(inherited)",
547547
"@executable_path/Frameworks",
@@ -592,8 +592,8 @@
592592
isa = XCRemoteSwiftPackageReference;
593593
repositoryURL = "https://github.com/iZettle/Flow.git";
594594
requirement = {
595-
kind = upToNextMajorVersion;
596-
minimumVersion = 1.12.1;
595+
branch = "bump-ios-min-deployment-target";
596+
kind = branch;
597597
};
598598
};
599599
/* End XCRemoteSwiftPackageReference section */

Presentation.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
"kind" : "remoteSourceControl",
77
"location" : "https://github.com/iZettle/Flow.git",
88
"state" : {
9-
"revision" : "c3e69f924f046207487948dcad55826343a122d5",
10-
"version" : "1.12.1"
9+
"branch" : "bump-ios-min-deployment-target",
10+
"revision" : "10f5108b34fe528f885d9a97513eb8dc43300d4e"
1111
}
1212
}
1313
],

0 commit comments

Comments
 (0)