Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 0 additions & 2 deletions Modules/Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -344,14 +344,12 @@ enum XcodeSupport {
dependencies: [
"Networking",
"WooFoundation",
"Yosemite",
.product(name: "KeychainAccess", package: "KeychainAccess"),
]
),
.xcodeTarget(
XcodeTargetNames.storeWidgetsExtension,
dependencies: [
"Experiments",
"Networking",
"WooFoundation",
.product(name: "KeychainAccess", package: "KeychainAccess"),
Expand Down
4 changes: 2 additions & 2 deletions WooCommerce/Classes/Model/MarkOrderAsReadUseCase.swift
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import Networking
import NetworkingCore
#endif

#if canImport(Yosemite)
#if canImport(Yosemite) && !NOTIFICATION_EXTENSION
import Yosemite
#endif

Expand All @@ -19,7 +19,7 @@ struct MarkOrderAsReadUseCase {
case noNeedToMarkAsRead
}

#if canImport(Yosemite)
#if canImport(Yosemite) && !NOTIFICATION_EXTENSION
/// Async method that marks the order note as read if it is the notification for the last order.
/// We do it in a way that first we syncronize notification to get the remote `Note`
/// and then we compare local `orderID` with the one from remote `Note`.
Expand Down
5 changes: 3 additions & 2 deletions WooCommerce/WooCommerce.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -17748,7 +17748,6 @@
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
Expand Down Expand Up @@ -17853,6 +17852,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "WooCommerce Notification Content Exten Development";
SKIP_INSTALL = YES;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) NOTIFICATION_EXTENSION";
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
Expand Down Expand Up @@ -17880,6 +17880,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "match AppStore com.automattic.woocommerce.notificationcontentextension";
SKIP_INSTALL = YES;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) NOTIFICATION_EXTENSION";
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
Expand Down Expand Up @@ -17907,6 +17908,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "match InHouse com.automattic.alpha.woocommerce.notificationcontentextension";
SKIP_INSTALL = YES;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) NOTIFICATION_EXTENSION";
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
Expand Down Expand Up @@ -18553,7 +18555,6 @@
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
Expand Down