Skip to content

Commit f37be18

Browse files
NickEntinNickEntin
committed
Bump deployment targets to iOS 14, watchOS 7, Xcode 14
1 parent 2ce20b8 commit f37be18

16 files changed

+96
-67
lines changed

‎.github/workflows/ci.yml

+2-6
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,13 @@ jobs:
1515
uses: actions/checkout@v2
1616
- name: Bundle Install
1717
run: bundle install
18-
- name: Select Xcode Version
19-
run: sudo xcode-select --switch /Applications/Xcode_13.1.app/Contents/Developer
2018
- name: Build and Test Frameworks
2119
run: |
2220
xcodebuild \
2321
-project Aardvark.xcodeproj \
2422
-scheme "All Frameworks" \
2523
-sdk iphonesimulator \
26-
-destination "platform=iOS Simulator,name=iPhone 13 Pro" \
24+
-destination "platform=iOS Simulator,name=iPhone 14 Pro" \
2725
test
2826
- name: Build Sample App
2927
run: |
@@ -37,14 +35,12 @@ jobs:
3735
build
3836
pod-lint:
3937
name: Pod Lint
40-
runs-on: macOS-11
38+
runs-on: macOS-12
4139
steps:
4240
- name: Checkout Repo
4341
uses: actions/checkout@v2
4442
- name: Bundle Install
4543
run: bundle install
46-
- name: Select Xcode Version
47-
run: sudo xcode-select --switch /Applications/Xcode_13.1.app/Contents/Developer
4844
- name: Lint CoreAardvark Podspec
4945
run: bundle exec pod lib lint --verbose --fail-fast CoreAardvark.podspec
5046
- name: Lint Aardvark Podspec

‎Aardvark.podspec

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
Pod::Spec.new do |s|
22
s.name = 'Aardvark'
3-
s.version = '4.1.0'
3+
s.version = '5.0.0'
44
s.license = 'Apache License, Version 2.0'
55
s.summary = 'Aardvark is a library that makes it dead simple to create actionable bug reports.'
66
s.homepage = 'https://github.com/square/Aardvark'
77
s.authors = 'Square'
88
s.source = { :git => 'https://github.com/square/Aardvark.git', :tag => "Aardvark/#{ s.version.to_s }" }
99

1010
s.swift_version = '5.0'
11-
s.ios.deployment_target = '12.0'
11+
s.ios.deployment_target = '14.0'
1212

1313
s.source_files = 'Sources/Aardvark/**/*.{h,m,swift}'
1414
s.resource_bundle = {'Aardvark' => ['Sources/Aardvark/PrivacyInfo.xcprivacy']}
1515

16-
s.dependency 'CoreAardvark', '~> 3.0'
16+
s.dependency 'CoreAardvark', '~> 4.0'
1717
end

‎Aardvark.xcodeproj/project.pbxproj

+21-21
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 52;
6+
objectVersion = 54;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -1082,7 +1082,7 @@
10821082
GCC_C_LANGUAGE_STANDARD = gnu11;
10831083
INFOPLIST_FILE = Sources/AardvarkLoggingUI/Info.plist;
10841084
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
1085-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
1085+
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
10861086
LD_RUNPATH_SEARCH_PATHS = (
10871087
"$(inherited)",
10881088
"@executable_path/Frameworks",
@@ -1120,7 +1120,7 @@
11201120
GCC_C_LANGUAGE_STANDARD = gnu11;
11211121
INFOPLIST_FILE = Sources/AardvarkLoggingUI/Info.plist;
11221122
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
1123-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
1123+
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
11241124
LD_RUNPATH_SEARCH_PATHS = (
11251125
"$(inherited)",
11261126
"@executable_path/Frameworks",
@@ -1148,7 +1148,7 @@
11481148
DEBUG_INFORMATION_FORMAT = dwarf;
11491149
GCC_C_LANGUAGE_STANDARD = gnu11;
11501150
INFOPLIST_FILE = Sources/AardvarkLoggingUITests/Info.plist;
1151-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
1151+
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
11521152
LD_RUNPATH_SEARCH_PATHS = (
11531153
"$(inherited)",
11541154
"@executable_path/Frameworks",
@@ -1177,7 +1177,7 @@
11771177
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
11781178
GCC_C_LANGUAGE_STANDARD = gnu11;
11791179
INFOPLIST_FILE = Sources/AardvarkLoggingUITests/Info.plist;
1180-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
1180+
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
11811181
LD_RUNPATH_SEARCH_PATHS = (
11821182
"$(inherited)",
11831183
"@executable_path/Frameworks",
@@ -1209,7 +1209,7 @@
12091209
GCC_C_LANGUAGE_STANDARD = gnu11;
12101210
INFOPLIST_FILE = Sources/AardvarkMailUI/Info.plist;
12111211
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
1212-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
1212+
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
12131213
LD_RUNPATH_SEARCH_PATHS = (
12141214
"$(inherited)",
12151215
"@executable_path/Frameworks",
@@ -1248,7 +1248,7 @@
12481248
GCC_C_LANGUAGE_STANDARD = gnu11;
12491249
INFOPLIST_FILE = Sources/AardvarkMailUI/Info.plist;
12501250
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
1251-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
1251+
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
12521252
LD_RUNPATH_SEARCH_PATHS = (
12531253
"$(inherited)",
12541254
"@executable_path/Frameworks",
@@ -1277,7 +1277,7 @@
12771277
DEBUG_INFORMATION_FORMAT = dwarf;
12781278
GCC_C_LANGUAGE_STANDARD = gnu11;
12791279
INFOPLIST_FILE = Sources/AardvarkMailUITests/Info.plist;
1280-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
1280+
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
12811281
LD_RUNPATH_SEARCH_PATHS = (
12821282
"$(inherited)",
12831283
"@executable_path/Frameworks",
@@ -1307,7 +1307,7 @@
13071307
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
13081308
GCC_C_LANGUAGE_STANDARD = gnu11;
13091309
INFOPLIST_FILE = Sources/AardvarkMailUITests/Info.plist;
1310-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
1310+
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
13111311
LD_RUNPATH_SEARCH_PATHS = (
13121312
"$(inherited)",
13131313
"@executable_path/Frameworks",
@@ -1336,7 +1336,7 @@
13361336
GCC_NO_COMMON_BLOCKS = YES;
13371337
INFOPLIST_FILE = "$(SRCROOT)/Sources/Aardvark/Info.plist";
13381338
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
1339-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
1339+
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
13401340
LD_RUNPATH_SEARCH_PATHS = (
13411341
"$(inherited)",
13421342
"@executable_path/Frameworks",
@@ -1368,7 +1368,7 @@
13681368
GCC_NO_COMMON_BLOCKS = YES;
13691369
INFOPLIST_FILE = "$(SRCROOT)/Sources/Aardvark/Info.plist";
13701370
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
1371-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
1371+
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
13721372
LD_RUNPATH_SEARCH_PATHS = (
13731373
"$(inherited)",
13741374
"@executable_path/Frameworks",
@@ -1398,7 +1398,7 @@
13981398
DEBUG_INFORMATION_FORMAT = dwarf;
13991399
DEVELOPMENT_TEAM = EYF346PHUG;
14001400
INFOPLIST_FILE = Sources/CoreAardvarkTests/Info.plist;
1401-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
1401+
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
14021402
LD_RUNPATH_SEARCH_PATHS = (
14031403
"$(inherited)",
14041404
"@executable_path/Frameworks",
@@ -1426,7 +1426,7 @@
14261426
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
14271427
DEVELOPMENT_TEAM = EYF346PHUG;
14281428
INFOPLIST_FILE = Sources/CoreAardvarkTests/Info.plist;
1429-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
1429+
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
14301430
LD_RUNPATH_SEARCH_PATHS = (
14311431
"$(inherited)",
14321432
"@executable_path/Frameworks",
@@ -1452,7 +1452,7 @@
14521452
DEBUG_INFORMATION_FORMAT = dwarf;
14531453
DEVELOPMENT_TEAM = EYF346PHUG;
14541454
INFOPLIST_FILE = Sources/AardvarkTests/Info.plist;
1455-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
1455+
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
14561456
LD_RUNPATH_SEARCH_PATHS = (
14571457
"$(inherited)",
14581458
"@executable_path/Frameworks",
@@ -1479,7 +1479,7 @@
14791479
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
14801480
DEVELOPMENT_TEAM = EYF346PHUG;
14811481
INFOPLIST_FILE = Sources/AardvarkTests/Info.plist;
1482-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
1482+
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
14831483
LD_RUNPATH_SEARCH_PATHS = (
14841484
"$(inherited)",
14851485
"@executable_path/Frameworks",
@@ -1544,7 +1544,7 @@
15441544
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
15451545
GCC_WARN_UNUSED_FUNCTION = YES;
15461546
GCC_WARN_UNUSED_VARIABLE = YES;
1547-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
1547+
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
15481548
MTL_ENABLE_DEBUG_INFO = YES;
15491549
ONLY_ACTIVE_ARCH = YES;
15501550
SDKROOT = iphoneos;
@@ -1597,7 +1597,7 @@
15971597
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
15981598
GCC_WARN_UNUSED_FUNCTION = YES;
15991599
GCC_WARN_UNUSED_VARIABLE = YES;
1600-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
1600+
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
16011601
MTL_ENABLE_DEBUG_INFO = NO;
16021602
SDKROOT = iphoneos;
16031603
SWIFT_COMPILATION_MODE = wholemodule;
@@ -1623,7 +1623,7 @@
16231623
GCC_NO_COMMON_BLOCKS = YES;
16241624
INFOPLIST_FILE = "$(SRCROOT)/Sources/CoreAardvark/Info.plist";
16251625
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
1626-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
1626+
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
16271627
LD_RUNPATH_SEARCH_PATHS = (
16281628
"$(inherited)",
16291629
"@executable_path/Frameworks",
@@ -1638,7 +1638,7 @@
16381638
TARGETED_DEVICE_FAMILY = "1,2";
16391639
VERSIONING_SYSTEM = "apple-generic";
16401640
VERSION_INFO_PREFIX = "";
1641-
WATCHOS_DEPLOYMENT_TARGET = 4.0;
1641+
WATCHOS_DEPLOYMENT_TARGET = 7.0;
16421642
};
16431643
name = Debug;
16441644
};
@@ -1659,7 +1659,7 @@
16591659
GCC_NO_COMMON_BLOCKS = YES;
16601660
INFOPLIST_FILE = "$(SRCROOT)/Sources/CoreAardvark/Info.plist";
16611661
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
1662-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
1662+
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
16631663
LD_RUNPATH_SEARCH_PATHS = (
16641664
"$(inherited)",
16651665
"@executable_path/Frameworks",
@@ -1673,7 +1673,7 @@
16731673
TARGETED_DEVICE_FAMILY = "1,2";
16741674
VERSIONING_SYSTEM = "apple-generic";
16751675
VERSION_INFO_PREFIX = "";
1676-
WATCHOS_DEPLOYMENT_TARGET = 4.0;
1676+
WATCHOS_DEPLOYMENT_TARGET = 7.0;
16771677
};
16781678
name = Release;
16791679
};

‎Aardvark.xcodeproj/xcshareddata/xcschemes/Aardvark.xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1220"
3+
LastUpgradeVersion = "1500"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Aardvark.xcodeproj/xcshareddata/xcschemes/AardvarkLoggingUI.xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1220"
3+
LastUpgradeVersion = "1500"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Aardvark.xcodeproj/xcshareddata/xcschemes/All Frameworks.xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1220"
3+
LastUpgradeVersion = "1500"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Aardvark.xcodeproj/xcshareddata/xcschemes/CoreAardvark.xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1220"
3+
LastUpgradeVersion = "1500"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎AardvarkLoggingUI.podspec

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
Pod::Spec.new do |s|
22
s.name = 'AardvarkLoggingUI'
3-
s.version = '1.0.0'
3+
s.version = '2.0.0'
44
s.license = 'Apache License, Version 2.0'
55
s.summary = 'Aardvark components for viewing logs inside of an iOS app.'
66
s.homepage = 'https://github.com/square/Aardvark'
77
s.authors = 'Square'
88
s.source = { :git => 'https://github.com/square/Aardvark.git', :tag => "AardvarkLoggingUI/#{ s.version.to_s }" }
99

1010
s.swift_version = '5.0'
11-
s.ios.deployment_target = '12.0'
11+
s.ios.deployment_target = '14.0'
1212

1313
s.source_files = 'Sources/AardvarkLoggingUI/**/*.{h,m,swift}'
1414
s.private_header_files = 'Sources/AardvarkLoggingUI/**/*_Testing.h', 'Sources/AardvarkLoggingUI/PrivateCategories/*.h'
1515

16-
s.dependency 'CoreAardvark', '~> 3.0'
16+
s.dependency 'CoreAardvark', '~> 4.0'
1717
end

‎AardvarkMailUI.podspec

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ Pod::Spec.new do |s|
88
s.source = { :git => 'https://github.com/square/Aardvark.git', :tag => "AardvarkMailUI/#{ s.version.to_s }" }
99

1010
s.swift_version = '5.0'
11-
s.ios.deployment_target = '12.0'
11+
s.ios.deployment_target = '14.0'
1212

1313
s.source_files = 'Sources/AardvarkMailUI/**/*.{h,m,swift}'
1414
s.private_header_files = 'Sources/AardvarkMailUI/**/*_Testing.h', 'Sources/AardvarkMailUI/PrivateCategories/*.h'
1515

16-
s.dependency 'Aardvark', '~> 4.1.0'
16+
s.dependency 'Aardvark', '~> 5.0.0'
1717
end

‎AardvarkSample/AardvarkSample.xcodeproj/project.pbxproj

+19-9
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 46;
6+
objectVersion = 54;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -246,8 +246,9 @@
246246
EA3C1DD11D93696D0048C4CD /* Project object */ = {
247247
isa = PBXProject;
248248
attributes = {
249+
BuildIndependentTargetsInParallel = YES;
249250
LastSwiftUpdateCheck = 0800;
250-
LastUpgradeCheck = 1220;
251+
LastUpgradeCheck = 1500;
251252
ORGANIZATIONNAME = "Square, Inc.";
252253
TargetAttributes = {
253254
EA3C1DD81D93696D0048C4CD = {
@@ -448,6 +449,7 @@
448449
DEBUG_INFORMATION_FORMAT = dwarf;
449450
ENABLE_STRICT_OBJC_MSGSEND = YES;
450451
ENABLE_TESTABILITY = YES;
452+
ENABLE_USER_SCRIPT_SANDBOXING = YES;
451453
GCC_C_LANGUAGE_STANDARD = gnu99;
452454
GCC_DYNAMIC_NO_PIC = NO;
453455
GCC_NO_COMMON_BLOCKS = YES;
@@ -462,7 +464,7 @@
462464
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
463465
GCC_WARN_UNUSED_FUNCTION = YES;
464466
GCC_WARN_UNUSED_VARIABLE = YES;
465-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
467+
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
466468
MTL_ENABLE_DEBUG_INFO = YES;
467469
ONLY_ACTIVE_ARCH = YES;
468470
SDKROOT = iphoneos;
@@ -509,6 +511,7 @@
509511
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
510512
ENABLE_NS_ASSERTIONS = NO;
511513
ENABLE_STRICT_OBJC_MSGSEND = YES;
514+
ENABLE_USER_SCRIPT_SANDBOXING = YES;
512515
GCC_C_LANGUAGE_STANDARD = gnu99;
513516
GCC_NO_COMMON_BLOCKS = YES;
514517
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -517,10 +520,11 @@
517520
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
518521
GCC_WARN_UNUSED_FUNCTION = YES;
519522
GCC_WARN_UNUSED_VARIABLE = YES;
520-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
523+
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
521524
MTL_ENABLE_DEBUG_INFO = NO;
522525
SDKROOT = iphoneos;
523-
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
526+
SWIFT_COMPILATION_MODE = wholemodule;
527+
SWIFT_OPTIMIZATION_LEVEL = "-O";
524528
SWIFT_VERSION = 5.0;
525529
VALIDATE_PRODUCT = YES;
526530
};
@@ -534,8 +538,11 @@
534538
CLANG_ENABLE_MODULES = YES;
535539
DEVELOPMENT_TEAM = EYF346PHUG;
536540
INFOPLIST_FILE = AardvarkSample/Info.plist;
537-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
538-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
541+
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
542+
LD_RUNPATH_SEARCH_PATHS = (
543+
"$(inherited)",
544+
"@executable_path/Frameworks",
545+
);
539546
PRODUCT_BUNDLE_IDENTIFIER = com.squareup.AardvarkSample;
540547
PRODUCT_NAME = "$(TARGET_NAME)";
541548
SWIFT_OBJC_BRIDGING_HEADER = "AardvarkSample/AardvarkSample-Bridging-Header.h";
@@ -552,8 +559,11 @@
552559
CLANG_ENABLE_MODULES = YES;
553560
DEVELOPMENT_TEAM = EYF346PHUG;
554561
INFOPLIST_FILE = AardvarkSample/Info.plist;
555-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
556-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
562+
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
563+
LD_RUNPATH_SEARCH_PATHS = (
564+
"$(inherited)",
565+
"@executable_path/Frameworks",
566+
);
557567
PRODUCT_BUNDLE_IDENTIFIER = com.squareup.AardvarkSample;
558568
PRODUCT_NAME = "$(TARGET_NAME)";
559569
SWIFT_OBJC_BRIDGING_HEADER = "AardvarkSample/AardvarkSample-Bridging-Header.h";

0 commit comments

Comments
 (0)