Skip to content

Commit 1b9d162

Browse files
jaclyncjaclync
committed
Merge branch 'trunk' into feat/7879-store-creation-webview-feature-flag
* trunk: Conditionally connect InAppPurchaseStore to remote Sync StoreKit configuration with App Store Connect Add product purchase to IAP debug Revert "Include purchasing and transactions in IAP debug" Include purchasing and transactions in IAP debug Add product loading to IAP debug view Use local StoreKit configuration Remove commented out networking code until needed InAppPurchaseStore implementation Hide IAP debug behind experimental feature toggle Add IAP debug view to Hub menu Move release notes to 10.9 Bump deployment version in all projects/targets Bump deployment target for Pods Add mention in release notes about dropping iOS 14 Update usage of UTType identifiers Update use of SwiftUI animation Bump deployment target to 15.0
2 parents 9139d17 + 8083bfc commit 1b9d162

File tree

34 files changed

+498
-41
lines changed

34 files changed

+498
-41
lines changed

‎Experiments/Experiments.xcodeproj/project.pbxproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@
389389
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
390390
GCC_WARN_UNUSED_FUNCTION = YES;
391391
GCC_WARN_UNUSED_VARIABLE = YES;
392-
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
392+
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
393393
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
394394
MTL_FAST_MATH = YES;
395395
ONLY_ACTIVE_ARCH = YES;
@@ -447,7 +447,7 @@
447447
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
448448
GCC_WARN_UNUSED_FUNCTION = YES;
449449
GCC_WARN_UNUSED_VARIABLE = YES;
450-
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
450+
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
451451
MTL_ENABLE_DEBUG_INFO = NO;
452452
MTL_FAST_MATH = YES;
453453
SDKROOT = iphoneos;
@@ -596,7 +596,7 @@
596596
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
597597
GCC_WARN_UNUSED_FUNCTION = YES;
598598
GCC_WARN_UNUSED_VARIABLE = YES;
599-
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
599+
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
600600
MTL_ENABLE_DEBUG_INFO = NO;
601601
MTL_FAST_MATH = YES;
602602
SDKROOT = iphoneos;

‎Fakes/Fakes.xcodeproj/project.pbxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@
254254
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
255255
GCC_WARN_UNUSED_FUNCTION = YES;
256256
GCC_WARN_UNUSED_VARIABLE = YES;
257-
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
257+
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
258258
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
259259
MTL_FAST_MATH = YES;
260260
ONLY_ACTIVE_ARCH = YES;
@@ -312,7 +312,7 @@
312312
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
313313
GCC_WARN_UNUSED_FUNCTION = YES;
314314
GCC_WARN_UNUSED_VARIABLE = YES;
315-
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
315+
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
316316
MTL_ENABLE_DEBUG_INFO = NO;
317317
MTL_FAST_MATH = YES;
318318
SDKROOT = iphoneos;

‎Hardware/Hardware.xcodeproj/project.pbxproj‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -980,7 +980,7 @@
980980
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
981981
GCC_WARN_UNUSED_FUNCTION = YES;
982982
GCC_WARN_UNUSED_VARIABLE = YES;
983-
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
983+
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
984984
LD_RUNPATH_SEARCH_PATHS = "";
985985
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
986986
MTL_FAST_MATH = YES;
@@ -1039,7 +1039,7 @@
10391039
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
10401040
GCC_WARN_UNUSED_FUNCTION = YES;
10411041
GCC_WARN_UNUSED_VARIABLE = YES;
1042-
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
1042+
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
10431043
LD_RUNPATH_SEARCH_PATHS = "";
10441044
MTL_ENABLE_DEBUG_INFO = NO;
10451045
MTL_FAST_MATH = YES;
@@ -1066,6 +1066,7 @@
10661066
DYLIB_INSTALL_NAME_BASE = "@rpath";
10671067
INFOPLIST_FILE = Hardware/Info.plist;
10681068
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
1069+
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
10691070
LD_RUNPATH_SEARCH_PATHS = (
10701071
"$(inherited)",
10711072
"@executable_path/Frameworks",
@@ -1095,6 +1096,7 @@
10951096
DYLIB_INSTALL_NAME_BASE = "@rpath";
10961097
INFOPLIST_FILE = Hardware/Info.plist;
10971098
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
1099+
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
10981100
LD_RUNPATH_SEARCH_PATHS = (
10991101
"$(inherited)",
11001102
"@executable_path/Frameworks",
@@ -1119,6 +1121,7 @@
11191121
CODE_SIGN_STYLE = Automatic;
11201122
DEVELOPMENT_TEAM = PZYM8XX95Q;
11211123
INFOPLIST_FILE = HardwareTests/Info.plist;
1124+
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
11221125
LD_RUNPATH_SEARCH_PATHS = (
11231126
"$(inherited)",
11241127
"@executable_path/Frameworks",
@@ -1142,6 +1145,7 @@
11421145
CODE_SIGN_STYLE = Automatic;
11431146
DEVELOPMENT_TEAM = PZYM8XX95Q;
11441147
INFOPLIST_FILE = HardwareTests/Info.plist;
1148+
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
11451149
LD_RUNPATH_SEARCH_PATHS = (
11461150
"$(inherited)",
11471151
"@executable_path/Frameworks",
@@ -1200,7 +1204,7 @@
12001204
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
12011205
GCC_WARN_UNUSED_FUNCTION = YES;
12021206
GCC_WARN_UNUSED_VARIABLE = YES;
1203-
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
1207+
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
12041208
LD_RUNPATH_SEARCH_PATHS = "";
12051209
MTL_ENABLE_DEBUG_INFO = NO;
12061210
MTL_FAST_MATH = YES;
@@ -1227,6 +1231,7 @@
12271231
DYLIB_INSTALL_NAME_BASE = "@rpath";
12281232
INFOPLIST_FILE = Hardware/Info.plist;
12291233
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
1234+
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
12301235
LD_RUNPATH_SEARCH_PATHS = (
12311236
"$(inherited)",
12321237
"@executable_path/Frameworks",
@@ -1251,6 +1256,7 @@
12511256
CODE_SIGN_STYLE = Automatic;
12521257
DEVELOPMENT_TEAM = PZYM8XX95Q;
12531258
INFOPLIST_FILE = HardwareTests/Info.plist;
1259+
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
12541260
LD_RUNPATH_SEARCH_PATHS = (
12551261
"$(inherited)",
12561262
"@executable_path/Frameworks",
@@ -1272,7 +1278,7 @@
12721278
DEVELOPMENT_TEAM = PZYM8XX95Q;
12731279
ENABLE_PREVIEWS = YES;
12741280
INFOPLIST_FILE = SampleReceiptPrinter/Info.plist;
1275-
IPHONEOS_DEPLOYMENT_TARGET = 14.3;
1281+
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
12761282
LD_RUNPATH_SEARCH_PATHS = (
12771283
"$(inherited)",
12781284
"@executable_path/Frameworks",
@@ -1293,7 +1299,7 @@
12931299
DEVELOPMENT_TEAM = PZYM8XX95Q;
12941300
ENABLE_PREVIEWS = YES;
12951301
INFOPLIST_FILE = SampleReceiptPrinter/Info.plist;
1296-
IPHONEOS_DEPLOYMENT_TARGET = 14.3;
1302+
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
12971303
LD_RUNPATH_SEARCH_PATHS = (
12981304
"$(inherited)",
12991305
"@executable_path/Frameworks",
@@ -1314,7 +1320,7 @@
13141320
DEVELOPMENT_TEAM = PZYM8XX95Q;
13151321
ENABLE_PREVIEWS = YES;
13161322
INFOPLIST_FILE = SampleReceiptPrinter/Info.plist;
1317-
IPHONEOS_DEPLOYMENT_TARGET = 14.3;
1323+
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
13181324
LD_RUNPATH_SEARCH_PATHS = (
13191325
"$(inherited)",
13201326
"@executable_path/Frameworks",

‎Networking/Networking.xcodeproj/project.pbxproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3365,7 +3365,7 @@
33653365
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
33663366
GCC_WARN_UNUSED_FUNCTION = YES;
33673367
GCC_WARN_UNUSED_VARIABLE = YES;
3368-
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
3368+
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
33693369
MTL_ENABLE_DEBUG_INFO = NO;
33703370
SDKROOT = iphoneos;
33713371
SWIFT_COMPILATION_MODE = wholemodule;
@@ -3480,7 +3480,7 @@
34803480
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
34813481
GCC_WARN_UNUSED_FUNCTION = YES;
34823482
GCC_WARN_UNUSED_VARIABLE = YES;
3483-
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
3483+
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
34843484
MTL_ENABLE_DEBUG_INFO = YES;
34853485
ONLY_ACTIVE_ARCH = YES;
34863486
SDKROOT = iphoneos;
@@ -3539,7 +3539,7 @@
35393539
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
35403540
GCC_WARN_UNUSED_FUNCTION = YES;
35413541
GCC_WARN_UNUSED_VARIABLE = YES;
3542-
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
3542+
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
35433543
MTL_ENABLE_DEBUG_INFO = NO;
35443544
SDKROOT = iphoneos;
35453545
SWIFT_COMPILATION_MODE = wholemodule;

‎Networking/Networking/Model/Copiable/Models+Copiable.generated.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ extension CouponReport {
170170
}
171171

172172
extension Customer {
173-
func copy(
173+
public func copy(
174174
customerID: CopiableProp<Int64> = .copy,
175175
email: CopiableProp<String> = .copy,
176176
firstName: NullableCopiableProp<String> = .copy,

‎Podfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ inhibit_all_warnings!
1414
use_frameworks! # Defaulting to use_frameworks! See pre_install hook below for static linking.
1515
use_modular_headers!
1616

17-
app_ios_deployment_target = Gem::Version.new('14.0')
17+
app_ios_deployment_target = Gem::Version.new('15.0')
1818

1919
platform :ios, app_ios_deployment_target.version
2020
workspace 'WooCommerce.xcworkspace'

‎Podfile.lock‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,6 @@ SPEC CHECKSUMS:
178178
ZendeskSupportProvidersSDK: 2bdf8544f7cd0fd4c002546f5704b813845beb2a
179179
ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba
180180

181-
PODFILE CHECKSUM: c6f79426669d379b37648d436ea6e799c3ac6fb2
181+
PODFILE CHECKSUM: f23972827495b155f693625eb8d9703bfc9ad186
182182

183183
COCOAPODS: 1.11.3

‎RELEASE-NOTES.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
10.9
44
-----
5+
- [***] Dropped iOS 14 support. From now we support iOS 15 and later. [https://github.com/woocommerce/woocommerce-ios/pull/7851]
56
- [*] Login: Now you can handle Jetpack site connection for your self-hosted sites from the app. [https://github.com/woocommerce/woocommerce-ios/pull/7847]
67

78

‎Storage/Storage.xcodeproj/project.pbxproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1471,7 +1471,7 @@
14711471
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
14721472
GCC_WARN_UNUSED_FUNCTION = YES;
14731473
GCC_WARN_UNUSED_VARIABLE = YES;
1474-
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
1474+
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
14751475
MTL_ENABLE_DEBUG_INFO = NO;
14761476
SDKROOT = iphoneos;
14771477
SWIFT_COMPILATION_MODE = wholemodule;
@@ -1587,7 +1587,7 @@
15871587
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
15881588
GCC_WARN_UNUSED_FUNCTION = YES;
15891589
GCC_WARN_UNUSED_VARIABLE = YES;
1590-
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
1590+
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
15911591
MTL_ENABLE_DEBUG_INFO = YES;
15921592
ONLY_ACTIVE_ARCH = YES;
15931593
SDKROOT = iphoneos;
@@ -1646,7 +1646,7 @@
16461646
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
16471647
GCC_WARN_UNUSED_FUNCTION = YES;
16481648
GCC_WARN_UNUSED_VARIABLE = YES;
1649-
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
1649+
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
16501650
MTL_ENABLE_DEBUG_INFO = NO;
16511651
SDKROOT = iphoneos;
16521652
SWIFT_COMPILATION_MODE = wholemodule;

‎Storage/Storage/Model/Copiable/Models+Copiable.generated.swift‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ extension GeneralAppSettings {
2626
isViewAddOnsSwitchEnabled: CopiableProp<Bool> = .copy,
2727
isProductSKUInputScannerSwitchEnabled: CopiableProp<Bool> = .copy,
2828
isCouponManagementSwitchEnabled: CopiableProp<Bool> = .copy,
29+
isInAppPurchasesSwitchEnabled: CopiableProp<Bool> = .copy,
2930
knownCardReaders: CopiableProp<[String]> = .copy,
3031
lastEligibilityErrorInfo: NullableCopiableProp<EligibilityErrorInfo> = .copy,
3132
lastJetpackBenefitsBannerDismissedTime: NullableCopiableProp<Date> = .copy,
@@ -36,6 +37,7 @@ extension GeneralAppSettings {
3637
let isViewAddOnsSwitchEnabled = isViewAddOnsSwitchEnabled ?? self.isViewAddOnsSwitchEnabled
3738
let isProductSKUInputScannerSwitchEnabled = isProductSKUInputScannerSwitchEnabled ?? self.isProductSKUInputScannerSwitchEnabled
3839
let isCouponManagementSwitchEnabled = isCouponManagementSwitchEnabled ?? self.isCouponManagementSwitchEnabled
40+
let isInAppPurchasesSwitchEnabled = isInAppPurchasesSwitchEnabled ?? self.isInAppPurchasesSwitchEnabled
3941
let knownCardReaders = knownCardReaders ?? self.knownCardReaders
4042
let lastEligibilityErrorInfo = lastEligibilityErrorInfo ?? self.lastEligibilityErrorInfo
4143
let lastJetpackBenefitsBannerDismissedTime = lastJetpackBenefitsBannerDismissedTime ?? self.lastJetpackBenefitsBannerDismissedTime
@@ -47,6 +49,7 @@ extension GeneralAppSettings {
4749
isViewAddOnsSwitchEnabled: isViewAddOnsSwitchEnabled,
4850
isProductSKUInputScannerSwitchEnabled: isProductSKUInputScannerSwitchEnabled,
4951
isCouponManagementSwitchEnabled: isCouponManagementSwitchEnabled,
52+
isInAppPurchasesSwitchEnabled: isInAppPurchasesSwitchEnabled,
5053
knownCardReaders: knownCardReaders,
5154
lastEligibilityErrorInfo: lastEligibilityErrorInfo,
5255
lastJetpackBenefitsBannerDismissedTime: lastJetpackBenefitsBannerDismissedTime,

0 commit comments

Comments
 (0)