Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
96ac83a
Remove target-level `IPHONEOS_DEPLOYMENT_TARGET` setting
mokagio Oct 21, 2022
8c34b62
Extract `IPHONEOS_DEPLOYMENT_TARGET` to `SDKVersions.xcconfig`
mokagio Oct 21, 2022
9f58825
Bump `IPHONEOS_DEPLOYMENT_TARGET` from 13.0 to 14.0
mokagio Oct 21, 2022
357e080
Add `RELEASE-NOTES.txt` entry for dropping iOS 13
mokagio Oct 21, 2022
04a9a44
Use `CLLocationManager` instance property for `authorizationStatus`
mokagio Oct 25, 2022
6de433b
Replace deprecated `CLLocationManagerDelegate` method
mokagio Oct 25, 2022
a60d3d9
Remove iOS 13 only `SchedulingCalendarViewController`
mokagio Oct 25, 2022
1ba9de3
Remove `WordPressTodayWidget` in preparation to drop iOS 13
mokagio Oct 25, 2022
81d2e71
Remove `WordPressAllTimeWidget` in preparation to drop iOS 13
mokagio Oct 27, 2022
76435ca
Remove `WordPressThisWeekWidget` in preparation to drop iOS 13
mokagio Oct 27, 2022
a6c25c8
Remove bundle identifiers for iOS 13 widgets in Jetpack from `Fastfile`
mokagio Oct 25, 2022
f713bf9
Remove leftover references to old `WordPressHomeWidgetToday`
mokagio Oct 25, 2022
658cedf
Remove `WidgetDifferenceCell` — It was used only in the iOS 13 widgets
mokagio Oct 27, 2022
ced1dd3
Remove `WidgetTwoColumnCell` — It was used only in the iOS 13 widgets
mokagio Oct 27, 2022
a8e019d
Remove `WidgetUnconfiguredCell` — It was used only in the iOS 13 widgets
mokagio Oct 27, 2022
02f7361
Remove `WidgetUrlCell` — It was used only in the iOS 13 widgets
mokagio Oct 27, 2022
46ee6b0
Remove `WidgetNoConnectionCell` — It was used only in the iOS 13 widgets
mokagio Oct 27, 2022
d6392db
Remove empty `Shared View` group for widgets
mokagio Oct 27, 2022
08f921a
Update `RELEASE-NOTES.txt` to mention new PR for dropping iOS 13
mokagio Oct 31, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 0 additions & 36 deletions Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -305,42 +305,6 @@ target 'JetpackDraftActionExtension' do
wordpress_ui
end

## Today Widget
## ============
##
target 'WordPressTodayWidget' do
project 'WordPress/WordPress.xcodeproj'

shared_with_all_pods
shared_with_networking_pods

wordpress_ui
end

## All Time Widget
## ============
##
target 'WordPressAllTimeWidget' do
project 'WordPress/WordPress.xcodeproj'

shared_with_all_pods
shared_with_networking_pods

wordpress_ui
end

## This Week Widget
## ============
##
target 'WordPressThisWeekWidget' do
project 'WordPress/WordPress.xcodeproj'

shared_with_all_pods
shared_with_networking_pods

wordpress_ui
end

## Home Screen Widgets
## ============
##
Expand Down
2 changes: 1 addition & 1 deletion Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -880,6 +880,6 @@ SPEC CHECKSUMS:
ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba
ZIPFoundation: ae5b4b813d216d3bf0a148773267fff14bd51d37

PODFILE CHECKSUM: 6e0bd6cd6b3071e696c6a4d965d8c3a3b625b149
PODFILE CHECKSUM: 75e51232bd03e0ad254ba6ef2a301bf766bda30a

COCOAPODS: 1.11.2
1 change: 1 addition & 0 deletions RELEASE-NOTES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
* [*] [internal] Database access change: the 'new Core Data context structure' feature flag is turned on by default. [#19433]
* [***] [Jetpack-only] Widgets are now on Jetpack. Find Today, This Week, and All Time Widgets to display your Stats on your home screen. [#19479]
* [*] Block Editor: Fixed iOS Voice Control support within Image block captions. [https://github.com/WordPress/gutenberg/pull/44850]
* [***] Dropped support for iOS 13. Now supporting iOS 14.0 and above. [#19509]

21.0
-----
Expand Down
5 changes: 3 additions & 2 deletions WordPress/Classes/Utility/LocationService.m
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ - (BOOL)locationServicesDisabled

- (BOOL)locationServicesDenied
{
CLAuthorizationStatus status = [CLLocationManager authorizationStatus];
CLAuthorizationStatus status = self.locationManager.authorizationStatus;
if (status == kCLAuthorizationStatusRestricted || status == kCLAuthorizationStatusDenied) {
return YES;
}
Expand Down Expand Up @@ -201,8 +201,9 @@ - (void)locationManager:(CLLocationManager *)manager didUpdateLocations:(NSArray
[self getAddressForLocation:location];
}

- (void)locationManager:(CLLocationManager *)manager didChangeAuthorizationStatus:(CLAuthorizationStatus)status
- (void)locationManagerDidChangeAuthorization:(CLLocationManager *)manager
{
CLAuthorizationStatus status = manager.authorizationStatus;
if (status == kCLAuthorizationStatusRestricted || status == kCLAuthorizationStatusDenied) {
[self serviceFailed:[NSError errorWithDomain:LocationServiceErrorDomain code:LocationServiceErrorPermissionDenied userInfo:nil]];
}
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ class SchedulingDatePickerViewController: UIViewController, DatePickerSheet, Dat
return item
}()

private lazy var publishButton = UIBarButtonItem(title: NSLocalizedString("Publish immediately", comment: "Immediately publish button title"), style: .plain, target: self, action: #selector(SchedulingCalendarViewController.publishImmediately))
private lazy var publishButton = UIBarButtonItem(title: NSLocalizedString("Publish immediately", comment: "Immediately publish button title"), style: .plain, target: self, action: #selector(SchedulingDatePickerViewController.publishImmediately))

override func viewDidLoad() {
super.viewDidLoad()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,7 @@ class PresentableSchedulingViewControllerProvider: PresentableSchedulingViewCont
}

static func schedulingViewController(with viewModel: PublishSettingsViewModel, updated: @escaping (Date?) -> Void) -> SchedulingViewControllerProtocol {
let schedulingViewController: SchedulingViewControllerProtocol
if #available(iOS 14.0, *) {
schedulingViewController = SchedulingDatePickerViewController()
} else {
schedulingViewController = SchedulingCalendarViewController()
}
let schedulingViewController = SchedulingDatePickerViewController()
schedulingViewController.coordinator = DateCoordinator(date: viewModel.date,
timeZone: viewModel.timeZone,
dateFormatter: viewModel.dateFormatter,
Expand All @@ -64,6 +59,11 @@ class PresentableSchedulingViewControllerProvider: PresentableSchedulingViewCont
}
}

// FIXME: This protocol is redundant as of dropping iOS 13.
//
// It was used as a facade in between `SchedulingCalendarViewController` (iOS 13) and
// `SchedulingDatePickerViewController` (iOS 14+). `SchedulingCalendarViewController` has been
// deleted so we can remove this as well.
protocol SchedulingViewControllerProtocol: UIViewController, UIViewControllerTransitioningDelegate, UIAdaptivePresentationControllerDelegate {
var coordinator: DateCoordinator? { get set }
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import Foundation

/// This struct contains data for the Insights All Time stats to be displayed in the corresponding widget.
/// The data is stored in a plist for the widget to access.
/// This file is shared with WordPressAllTimeWidget, which accesses the data when it is viewed.
///

struct AllTimeWidgetStats: Codable {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import WordPressKit

/// This struct contains data for 'Views This Week' stats to be displayed in the corresponding widget.
/// The data is stored in a plist for the widget to access.
/// This file is shared with WordPressThisWeekWidget, which accesses the data when it is viewed.
///

struct ThisWeekWidgetStats: Codable {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import Foundation

/// This struct contains data for the Insights Today stats to be displayed in the corresponding widget.
/// The data is stored in a plist for the widget to access.
/// This file is shared with WordPressTodayWidget, which accesses the data when it is viewed.
///

struct TodayWidgetStats: Codable {
Expand Down
Loading