From ee64dc7574d6a714a2323ae405cb2d557c317d4b Mon Sep 17 00:00:00 2001 From: Daniel Jalkut Date: Mon, 4 Feb 2019 13:39:48 -0500 Subject: [PATCH] Update imports to use framework-style imports to avoid warnings when CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES. Add CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER to xcconfig file to protect against any changes that would introduce such warnings for clients who have the waring enabled. --- Autoupdate/AppInstaller.m | 2 +- Autoupdate/SUGuidedPackageInstaller.m | 2 +- Autoupdate/SUInstaller.m | 2 +- Autoupdate/SUPackageInstaller.m | 2 +- Autoupdate/SUPipedUnarchiver.m | 2 +- Autoupdate/SUPlainInstaller.m | 4 +-- Autoupdate/SUUnarchiverNotifier.m | 2 +- Configurations/ConfigCommon.xcconfig | 1 + Downloader/SPUDownloader.m | 4 +-- Sparkle/SPUAutomaticUpdateDriver.m | 4 +-- Sparkle/SPUBasicUpdateDriver.m | 2 +- Sparkle/SPUCoreBasedUpdateDriver.h | 2 +- Sparkle/SPUCoreBasedUpdateDriver.m | 2 +- Sparkle/SPUDownloadData.h | 2 +- Sparkle/SPUDownloadData.m | 2 +- Sparkle/SPUDownloadDriver.m | 4 +-- Sparkle/SPUInstallerDriver.m | 2 +- Sparkle/SPUScheduledUpdateDriver.m | 4 +-- Sparkle/SPUStandardUpdaterController.h | 2 +- Sparkle/SPUStandardUpdaterController.m | 2 +- Sparkle/SPUStandardUserDriver.h | 6 ++-- Sparkle/SPUStandardUserDriver.m | 8 ++--- Sparkle/SPUStandardUserDriverDelegate.h | 2 +- Sparkle/SPUUIBasedUpdateDriver.m | 6 ++-- Sparkle/SPUURLDownload.m | 4 +-- Sparkle/SPUUpdatePermissionRequest.h | 2 +- Sparkle/SPUUpdatePermissionRequest.m | 2 +- Sparkle/SPUUpdater.h | 4 +-- Sparkle/SPUUpdater.m | 6 ++-- Sparkle/SPUUpdaterDelegate.h | 2 +- Sparkle/SPUUpdaterSettings.h | 2 +- Sparkle/SPUUserDriver.h | 4 +-- Sparkle/SPUUserDriverCoreComponent.h | 4 +-- Sparkle/SPUUserDriverCoreComponent.m | 2 +- Sparkle/SPUUserInitiatedUpdateDriver.m | 2 +- Sparkle/SUAppcast.h | 2 +- Sparkle/SUAppcast.m | 11 +++--- Sparkle/SUAppcastDriver.m | 2 +- Sparkle/SUAppcastItem.h | 2 +- Sparkle/SUAppcastItem.m | 4 +-- Sparkle/SUConstants.m | 2 +- Sparkle/SUErrors.h | 2 +- Sparkle/SUFileManager.h | 2 +- Sparkle/SUFileManager.m | 2 +- Sparkle/SUStandardVersionComparator.h | 4 +-- Sparkle/SUStandardVersionComparator.m | 4 +-- Sparkle/SUUpdateAlert.h | 4 +-- Sparkle/SUUpdateAlert.m | 6 ++-- Sparkle/SUUpdatePermissionPrompt.m | 4 +-- Sparkle/SUUpdatePermissionResponse.h | 2 +- Sparkle/SUUpdatePermissionResponse.m | 2 +- Sparkle/SUUpdater.h | 8 ++--- Sparkle/SUUpdater.m | 10 +++--- Sparkle/SUUpdaterDelegate.h | 2 +- Sparkle/SUVersionComparisonProtocol.h | 2 +- Sparkle/SUVersionDisplayProtocol.h | 2 +- Sparkle/Sparkle.h | 40 ++++++++++++---------- Sparkle/SparkleCore.h | 14 ++++---- TestAppHelper/main.m | 2 +- Tests/SUUpdaterTest.m | 6 ++-- Tests/SUVersionComparisonTest.m | 2 +- Tests/Sparkle Unit Tests-Bridging-Header.h | 7 ++-- generate_appcast/Appcast-Bridging-Header.h | 4 +-- sparkle-cli/SPUCommandLineUserDriver.m | 2 +- 64 files changed, 133 insertions(+), 128 deletions(-) diff --git a/Autoupdate/AppInstaller.m b/Autoupdate/AppInstaller.m index 20cce980..b01196b7 100644 --- a/Autoupdate/AppInstaller.m +++ b/Autoupdate/AppInstaller.m @@ -21,7 +21,7 @@ #import "SUFileManager.h" #import "SPUInstallationInfo.h" #import "SUAppcastItem.h" -#import "SUErrors.h" +#import #import "SUInstallerCommunicationProtocol.h" #import "AgentConnection.h" #import "SPUInstallerAgentProtocol.h" diff --git a/Autoupdate/SUGuidedPackageInstaller.m b/Autoupdate/SUGuidedPackageInstaller.m index cd43bbf4..6fd7c41d 100644 --- a/Autoupdate/SUGuidedPackageInstaller.m +++ b/Autoupdate/SUGuidedPackageInstaller.m @@ -8,7 +8,7 @@ #import #import "SUGuidedPackageInstaller.h" -#import "SUErrors.h" +#import #include "AppKitPrevention.h" diff --git a/Autoupdate/SUInstaller.m b/Autoupdate/SUInstaller.m index bede6aa1..0b767e7f 100644 --- a/Autoupdate/SUInstaller.m +++ b/Autoupdate/SUInstaller.m @@ -13,7 +13,7 @@ #import "SUHost.h" #import "SUConstants.h" #import "SULog.h" -#import "SUErrors.h" +#import #import "SPUInstallationType.h" diff --git a/Autoupdate/SUPackageInstaller.m b/Autoupdate/SUPackageInstaller.m index 251a0561..f97a9bbc 100644 --- a/Autoupdate/SUPackageInstaller.m +++ b/Autoupdate/SUPackageInstaller.m @@ -8,7 +8,7 @@ #import "SUPackageInstaller.h" #import "SUConstants.h" -#import "SUErrors.h" +#import #import "SULog.h" diff --git a/Autoupdate/SUPipedUnarchiver.m b/Autoupdate/SUPipedUnarchiver.m index 1aa17163..83c2e67c 100644 --- a/Autoupdate/SUPipedUnarchiver.m +++ b/Autoupdate/SUPipedUnarchiver.m @@ -9,7 +9,7 @@ #import "SUPipedUnarchiver.h" #import "SUUnarchiverNotifier.h" #import "SULog.h" -#import "SUErrors.h" +#import #include "AppKitPrevention.h" diff --git a/Autoupdate/SUPlainInstaller.m b/Autoupdate/SUPlainInstaller.m index b0821a55..8a8f9909 100644 --- a/Autoupdate/SUPlainInstaller.m +++ b/Autoupdate/SUPlainInstaller.m @@ -11,8 +11,8 @@ #import "SUConstants.h" #import "SUHost.h" #import "SULog.h" -#import "SUErrors.h" -#import "SUVersionComparisonProtocol.h" +#import +#import #import "SUStandardVersionComparator.h" diff --git a/Autoupdate/SUUnarchiverNotifier.m b/Autoupdate/SUUnarchiverNotifier.m index 643f0eb9..16559860 100644 --- a/Autoupdate/SUUnarchiverNotifier.m +++ b/Autoupdate/SUUnarchiverNotifier.m @@ -8,7 +8,7 @@ #import "SUUnarchiverNotifier.h" #import "SULocalizations.h" -#import "SUErrors.h" +#import #include "AppKitPrevention.h" diff --git a/Configurations/ConfigCommon.xcconfig b/Configurations/ConfigCommon.xcconfig index 1c073baa..81cdadba 100644 --- a/Configurations/ConfigCommon.xcconfig +++ b/Configurations/ConfigCommon.xcconfig @@ -60,6 +60,7 @@ CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES = YES CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES CLANG_WARN_OBJC_MISSING_PROPERTY_SYNTHESIS = YES CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = YES +CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES CLANG_WARN_UNREACHABLE_CODE = YES GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES diff --git a/Downloader/SPUDownloader.m b/Downloader/SPUDownloader.m index 9e7d2d2a..88cdeacc 100644 --- a/Downloader/SPUDownloader.m +++ b/Downloader/SPUDownloader.m @@ -10,8 +10,8 @@ #import "SPUDownloaderDelegate.h" #import "SPULocalCacheDirectory.h" #import "SPUURLRequest.h" -#import "SPUDownloadData.h" -#import "SUErrors.h" +#import +#import #include "AppKitPrevention.h" diff --git a/Sparkle/SPUAutomaticUpdateDriver.m b/Sparkle/SPUAutomaticUpdateDriver.m index 1242de9e..ef911903 100644 --- a/Sparkle/SPUAutomaticUpdateDriver.m +++ b/Sparkle/SPUAutomaticUpdateDriver.m @@ -13,8 +13,8 @@ #import "SPUCoreBasedUpdateDriver.h" #import "SULog.h" #import "SUAppcastItem.h" -#import "SPUUserDriver.h" -#import "SUErrors.h" +#import +#import #include "AppKitPrevention.h" diff --git a/Sparkle/SPUBasicUpdateDriver.m b/Sparkle/SPUBasicUpdateDriver.m index 686981ed..ed860c99 100644 --- a/Sparkle/SPUBasicUpdateDriver.m +++ b/Sparkle/SPUBasicUpdateDriver.m @@ -9,7 +9,7 @@ #import "SPUBasicUpdateDriver.h" #import "SUAppcastDriver.h" #import "SPUUpdaterDelegate.h" -#import "SUErrors.h" +#import #import "SULog.h" #import "SULocalizations.h" #import "SUHost.h" diff --git a/Sparkle/SPUCoreBasedUpdateDriver.h b/Sparkle/SPUCoreBasedUpdateDriver.h index 012e7d43..2eca7939 100644 --- a/Sparkle/SPUCoreBasedUpdateDriver.h +++ b/Sparkle/SPUCoreBasedUpdateDriver.h @@ -7,7 +7,7 @@ // #import -#import "SPUStatusCompletionResults.h" +#import #import "SPUUpdateDriver.h" NS_ASSUME_NONNULL_BEGIN diff --git a/Sparkle/SPUCoreBasedUpdateDriver.m b/Sparkle/SPUCoreBasedUpdateDriver.m index 5847b825..0522054a 100644 --- a/Sparkle/SPUCoreBasedUpdateDriver.m +++ b/Sparkle/SPUCoreBasedUpdateDriver.m @@ -13,7 +13,7 @@ #import "SPUInstallerDriver.h" #import "SPUDownloadDriver.h" #import "SULog.h" -#import "SUErrors.h" +#import #import "SPUResumableUpdate.h" #import "SPUDownloadedUpdate.h" #import "SPUInformationalUpdate.h" diff --git a/Sparkle/SPUDownloadData.h b/Sparkle/SPUDownloadData.h index 41cd5743..a316fc4d 100644 --- a/Sparkle/SPUDownloadData.h +++ b/Sparkle/SPUDownloadData.h @@ -12,7 +12,7 @@ #import #endif -#import "SUExport.h" +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Sparkle/SPUDownloadData.m b/Sparkle/SPUDownloadData.m index 0d090dbe..9a910d09 100644 --- a/Sparkle/SPUDownloadData.m +++ b/Sparkle/SPUDownloadData.m @@ -6,7 +6,7 @@ // Copyright © 2016 Sparkle Project. All rights reserved. // -#import "SPUDownloadData.h" +#import #include "AppKitPrevention.h" diff --git a/Sparkle/SPUDownloadDriver.m b/Sparkle/SPUDownloadDriver.m index 79dc4435..c1b4981e 100644 --- a/Sparkle/SPUDownloadDriver.m +++ b/Sparkle/SPUDownloadDriver.m @@ -15,10 +15,10 @@ #import "SULocalizations.h" #import "SUHost.h" #import "SULog.h" -#import "SUErrors.h" +#import #import "SPUURLRequest.h" #import "SPUDownloadedUpdate.h" -#import "SPUDownloadData.h" +#import #include "AppKitPrevention.h" diff --git a/Sparkle/SPUInstallerDriver.m b/Sparkle/SPUInstallerDriver.m index 07bf26e6..fb76daae 100644 --- a/Sparkle/SPUInstallerDriver.m +++ b/Sparkle/SPUInstallerDriver.m @@ -14,7 +14,7 @@ #import "SUAppcastItem.h" #import "SULog.h" #import "SULocalizations.h" -#import "SUErrors.h" +#import #import "SUHost.h" #import "SUFileManager.h" #import "SPUSecureCoding.h" diff --git a/Sparkle/SPUScheduledUpdateDriver.m b/Sparkle/SPUScheduledUpdateDriver.m index e241b490..9e7bd922 100644 --- a/Sparkle/SPUScheduledUpdateDriver.m +++ b/Sparkle/SPUScheduledUpdateDriver.m @@ -8,9 +8,9 @@ #import "SPUScheduledUpdateDriver.h" #import "SUHost.h" -#import "SUErrors.h" +#import #import "SPUUpdaterDelegate.h" -#import "SPUUserDriver.h" +#import #include "AppKitPrevention.h" diff --git a/Sparkle/SPUStandardUpdaterController.h b/Sparkle/SPUStandardUpdaterController.h index 2448de41..b2916bb8 100644 --- a/Sparkle/SPUStandardUpdaterController.h +++ b/Sparkle/SPUStandardUpdaterController.h @@ -12,7 +12,7 @@ #import #endif -#import "SUExport.h" +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Sparkle/SPUStandardUpdaterController.m b/Sparkle/SPUStandardUpdaterController.m index d079c3f0..84c4c82b 100644 --- a/Sparkle/SPUStandardUpdaterController.m +++ b/Sparkle/SPUStandardUpdaterController.m @@ -9,7 +9,7 @@ #import "SPUStandardUpdaterController.h" #import "SPUUpdater.h" #import "SUHost.h" -#import "SPUStandardUserDriver.h" +#import #import "SUConstants.h" #import "SULog.h" diff --git a/Sparkle/SPUStandardUserDriver.h b/Sparkle/SPUStandardUserDriver.h index 7f1a03a7..f04ce4e0 100644 --- a/Sparkle/SPUStandardUserDriver.h +++ b/Sparkle/SPUStandardUserDriver.h @@ -12,9 +12,9 @@ #import #endif -#import "SPUUserDriver.h" -#import "SPUStandardUserDriverProtocol.h" -#import "SUExport.h" +#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Sparkle/SPUStandardUserDriver.m b/Sparkle/SPUStandardUserDriver.m index b3e3891b..16c501f0 100644 --- a/Sparkle/SPUStandardUserDriver.m +++ b/Sparkle/SPUStandardUserDriver.m @@ -6,11 +6,11 @@ // Copyright © 2016 Sparkle Project. All rights reserved. // -#import "SPUStandardUserDriver.h" -#import "SPUUserDriverCoreComponent.h" -#import "SPUStandardUserDriverDelegate.h" +#import +#import +#import #import "SUAppcastItem.h" -#import "SUVersionDisplayProtocol.h" +#import #import "SUHost.h" #import "SUUpdatePermissionPrompt.h" #import "SUStatusController.h" diff --git a/Sparkle/SPUStandardUserDriverDelegate.h b/Sparkle/SPUStandardUserDriverDelegate.h index c64f0ff8..710023ed 100644 --- a/Sparkle/SPUStandardUserDriverDelegate.h +++ b/Sparkle/SPUStandardUserDriverDelegate.h @@ -12,7 +12,7 @@ #import #endif -#import "SUExport.h" +#import @protocol SUVersionDisplay; diff --git a/Sparkle/SPUUIBasedUpdateDriver.m b/Sparkle/SPUUIBasedUpdateDriver.m index c826f289..33932533 100644 --- a/Sparkle/SPUUIBasedUpdateDriver.m +++ b/Sparkle/SPUUIBasedUpdateDriver.m @@ -8,14 +8,14 @@ #import "SPUUIBasedUpdateDriver.h" #import "SPUCoreBasedUpdateDriver.h" -#import "SPUUserDriver.h" +#import #import "SUHost.h" #import "SUConstants.h" #import "SPUUpdaterDelegate.h" #import "SUAppcastItem.h" -#import "SUErrors.h" +#import #import "SPUURLDownload.h" -#import "SPUDownloadData.h" +#import #import "SPUResumableUpdate.h" diff --git a/Sparkle/SPUURLDownload.m b/Sparkle/SPUURLDownload.m index 911befed..67ceae78 100644 --- a/Sparkle/SPUURLDownload.m +++ b/Sparkle/SPUURLDownload.m @@ -9,11 +9,11 @@ #import "SPUURLDownload.h" #import "SPUXPCServiceInfo.h" #import "SPUURLRequest.h" -#import "SPUDownloadData.h" +#import #import "SPUDownloaderProtocol.h" #import "SPUDownloaderDelegate.h" #import "SPUDownloader.h" -#import "SUErrors.h" +#import #include "AppKitPrevention.h" diff --git a/Sparkle/SPUUpdatePermissionRequest.h b/Sparkle/SPUUpdatePermissionRequest.h index fc3d662a..8d5af6e5 100644 --- a/Sparkle/SPUUpdatePermissionRequest.h +++ b/Sparkle/SPUUpdatePermissionRequest.h @@ -12,7 +12,7 @@ #import #endif -#import "SUExport.h" +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Sparkle/SPUUpdatePermissionRequest.m b/Sparkle/SPUUpdatePermissionRequest.m index aea0f70f..321f3a95 100644 --- a/Sparkle/SPUUpdatePermissionRequest.m +++ b/Sparkle/SPUUpdatePermissionRequest.m @@ -6,7 +6,7 @@ // Copyright © 2016 Sparkle Project. All rights reserved. // -#import "SPUUpdatePermissionRequest.h" +#import #include "AppKitPrevention.h" diff --git a/Sparkle/SPUUpdater.h b/Sparkle/SPUUpdater.h index 2e7a42f1..54e3cb3d 100644 --- a/Sparkle/SPUUpdater.h +++ b/Sparkle/SPUUpdater.h @@ -11,8 +11,8 @@ #else #import #endif -#import "SUExport.h" -#import "SPUUserDriver.h" +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Sparkle/SPUUpdater.m b/Sparkle/SPUUpdater.m index ac4c3aea..c33e7b9d 100644 --- a/Sparkle/SPUUpdater.m +++ b/Sparkle/SPUUpdater.m @@ -10,8 +10,8 @@ #import "SPUUpdaterDelegate.h" #import "SPUUpdaterSettings.h" #import "SUHost.h" -#import "SPUUpdatePermissionRequest.h" -#import "SUUpdatePermissionResponse.h" +#import +#import #import "SPUUpdateDriver.h" #import "SUConstants.h" #import "SULog.h" @@ -24,7 +24,7 @@ #import "SPUProbeInstallStatus.h" #import "SUAppcastItem.h" #import "SPUInstallationInfo.h" -#import "SUErrors.h" +#import #import "SPUXPCServiceInfo.h" #import "SPUUpdaterCycle.h" #import "SPUUpdaterTimer.h" diff --git a/Sparkle/SPUUpdaterDelegate.h b/Sparkle/SPUUpdaterDelegate.h index 5efa5488..09132e74 100644 --- a/Sparkle/SPUUpdaterDelegate.h +++ b/Sparkle/SPUUpdaterDelegate.h @@ -12,7 +12,7 @@ #import #endif -#import "SUExport.h" +#import @protocol SUVersionComparison; @class SPUUpdater, SUAppcast, SUAppcastItem; diff --git a/Sparkle/SPUUpdaterSettings.h b/Sparkle/SPUUpdaterSettings.h index 5b62289c..3e3c3f1a 100644 --- a/Sparkle/SPUUpdaterSettings.h +++ b/Sparkle/SPUUpdaterSettings.h @@ -12,7 +12,7 @@ #import #endif -#import "SUExport.h" +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Sparkle/SPUUserDriver.h b/Sparkle/SPUUserDriver.h index 52cfd656..89e84156 100644 --- a/Sparkle/SPUUserDriver.h +++ b/Sparkle/SPUUserDriver.h @@ -12,8 +12,8 @@ #import #endif -#import "SPUStatusCompletionResults.h" -#import "SUExport.h" +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Sparkle/SPUUserDriverCoreComponent.h b/Sparkle/SPUUserDriverCoreComponent.h index c2e7a431..9e16e0da 100644 --- a/Sparkle/SPUUserDriverCoreComponent.h +++ b/Sparkle/SPUUserDriverCoreComponent.h @@ -12,8 +12,8 @@ #import #endif -#import "SPUStatusCompletionResults.h" -#import "SUExport.h" +#import +#import @protocol SPUStandardUserDriverDelegate; diff --git a/Sparkle/SPUUserDriverCoreComponent.m b/Sparkle/SPUUserDriverCoreComponent.m index ecac239e..abc51980 100644 --- a/Sparkle/SPUUserDriverCoreComponent.m +++ b/Sparkle/SPUUserDriverCoreComponent.m @@ -6,7 +6,7 @@ // Copyright © 2016 Sparkle Project. All rights reserved. // -#import "SPUUserDriverCoreComponent.h" +#import #include "AppKitPrevention.h" diff --git a/Sparkle/SPUUserInitiatedUpdateDriver.m b/Sparkle/SPUUserInitiatedUpdateDriver.m index dd1b0064..952034d8 100644 --- a/Sparkle/SPUUserInitiatedUpdateDriver.m +++ b/Sparkle/SPUUserInitiatedUpdateDriver.m @@ -8,7 +8,7 @@ #import "SPUUserInitiatedUpdateDriver.h" #import "SPUUIBasedUpdateDriver.h" -#import "SPUUserDriver.h" +#import #include "AppKitPrevention.h" diff --git a/Sparkle/SUAppcast.h b/Sparkle/SUAppcast.h index 4562708e..f34dfa3e 100644 --- a/Sparkle/SUAppcast.h +++ b/Sparkle/SUAppcast.h @@ -14,7 +14,7 @@ #else #import #endif -#import "SUExport.h" +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Sparkle/SUAppcast.m b/Sparkle/SUAppcast.m index 861eb28e..4fdf3f4e 100644 --- a/Sparkle/SUAppcast.m +++ b/Sparkle/SUAppcast.m @@ -6,16 +6,17 @@ // Copyright 2006 Andy Matuschak. All rights reserved. // -#import "SUAppcast.h" -#import "SUAppcastItem.h" -#import "SUVersionComparisonProtocol.h" +#import +#import +#import +#import #import "SUConstants.h" #import "SULog.h" -#import "SUErrors.h" +#import #import "SULocalizations.h" #import "SPUXPCServiceInfo.h" #import "SPUURLDownload.h" -#import "SPUDownloadData.h" +#import #include "AppKitPrevention.h" diff --git a/Sparkle/SUAppcastDriver.m b/Sparkle/SUAppcastDriver.m index 1dfc9f80..20ac69b3 100644 --- a/Sparkle/SUAppcastDriver.m +++ b/Sparkle/SUAppcastDriver.m @@ -9,7 +9,7 @@ #import "SUAppcastDriver.h" #import "SUAppcast.h" #import "SUAppcastItem.h" -#import "SUVersionComparisonProtocol.h" +#import #import "SUStandardVersionComparator.h" #import "SUOperatingSystem.h" #import "SPUUpdaterDelegate.h" diff --git a/Sparkle/SUAppcastItem.h b/Sparkle/SUAppcastItem.h index f4a6a323..52d2a33c 100644 --- a/Sparkle/SUAppcastItem.h +++ b/Sparkle/SUAppcastItem.h @@ -14,7 +14,7 @@ #else #import #endif -#import "SUExport.h" +#import SU_EXPORT @interface SUAppcastItem : NSObject @property (copy, readonly) NSString *title; diff --git a/Sparkle/SUAppcastItem.m b/Sparkle/SUAppcastItem.m index 16e7ff70..dd7c1489 100644 --- a/Sparkle/SUAppcastItem.m +++ b/Sparkle/SUAppcastItem.m @@ -6,8 +6,8 @@ // Copyright 2006 Andy Matuschak. All rights reserved. // -#import "SUAppcastItem.h" -#import "SUVersionComparisonProtocol.h" +#import +#import #import "SULog.h" #import "SUConstants.h" #import "SPUInstallationType.h" diff --git a/Sparkle/SUConstants.m b/Sparkle/SUConstants.m index ef3a93dd..d6bf46b8 100644 --- a/Sparkle/SUConstants.m +++ b/Sparkle/SUConstants.m @@ -7,7 +7,7 @@ // #import "SUConstants.h" -#import "SUErrors.h" +#import #ifndef DEBUG #define DEBUG 0 diff --git a/Sparkle/SUErrors.h b/Sparkle/SUErrors.h index c0fc4d06..cc6d5785 100644 --- a/Sparkle/SUErrors.h +++ b/Sparkle/SUErrors.h @@ -14,7 +14,7 @@ #else #import #endif -#import "SUExport.h" +#import /** * Error domain used by Sparkle diff --git a/Sparkle/SUFileManager.h b/Sparkle/SUFileManager.h index e465eeda..be81c529 100644 --- a/Sparkle/SUFileManager.h +++ b/Sparkle/SUFileManager.h @@ -7,7 +7,7 @@ // #import -#import "SUExport.h" +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Sparkle/SUFileManager.m b/Sparkle/SUFileManager.m index 5bafe942..af8a448f 100644 --- a/Sparkle/SUFileManager.m +++ b/Sparkle/SUFileManager.m @@ -7,7 +7,7 @@ // #import "SUFileManager.h" -#import "SUErrors.h" +#import #include #include diff --git a/Sparkle/SUStandardVersionComparator.h b/Sparkle/SUStandardVersionComparator.h index 23d17c5d..cf7093b1 100644 --- a/Sparkle/SUStandardVersionComparator.h +++ b/Sparkle/SUStandardVersionComparator.h @@ -14,8 +14,8 @@ #else #import #endif -#import "SUExport.h" -#import "SUVersionComparisonProtocol.h" +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Sparkle/SUStandardVersionComparator.m b/Sparkle/SUStandardVersionComparator.m index a2958e82..6b85a0bd 100644 --- a/Sparkle/SUStandardVersionComparator.m +++ b/Sparkle/SUStandardVersionComparator.m @@ -6,8 +6,8 @@ // Copyright 2007 Andy Matuschak. All rights reserved. // -#import "SUVersionComparisonProtocol.h" -#import "SUStandardVersionComparator.h" +#import +#import #include "AppKitPrevention.h" diff --git a/Sparkle/SUUpdateAlert.h b/Sparkle/SUUpdateAlert.h index 09f9cbf7..2103d511 100644 --- a/Sparkle/SUUpdateAlert.h +++ b/Sparkle/SUUpdateAlert.h @@ -10,8 +10,8 @@ #define SUUPDATEALERT_H #import -#import "SUVersionDisplayProtocol.h" -#import "SPUStatusCompletionResults.h" +#import +#import @protocol SUUpdateAlertDelegate; diff --git a/Sparkle/SUUpdateAlert.m b/Sparkle/SUUpdateAlert.m index 3bcdbdee..9628bb24 100644 --- a/Sparkle/SUUpdateAlert.m +++ b/Sparkle/SUUpdateAlert.m @@ -18,10 +18,10 @@ #import "SUConstants.h" #import "SULog.h" #import "SULocalizations.h" -#import "SUAppcastItem.h" -#import "SPUDownloadData.h" +#import +#import #import "SUApplicationInfo.h" -#import "SPUUpdaterSettings.h" +#import #import "SUSystemUpdateInfo.h" #import "SUTouchBarForwardDeclarations.h" #import "SUTouchBarButtonGroup.h" diff --git a/Sparkle/SUUpdatePermissionPrompt.m b/Sparkle/SUUpdatePermissionPrompt.m index a6cc540d..d7366783 100644 --- a/Sparkle/SUUpdatePermissionPrompt.m +++ b/Sparkle/SUUpdatePermissionPrompt.m @@ -7,8 +7,8 @@ // #import "SUUpdatePermissionPrompt.h" -#import "SPUUpdatePermissionRequest.h" -#import "SUUpdatePermissionResponse.h" +#import +#import #import "SULocalizations.h" #import "SUHost.h" diff --git a/Sparkle/SUUpdatePermissionResponse.h b/Sparkle/SUUpdatePermissionResponse.h index 2bb0eff3..e9fe947d 100644 --- a/Sparkle/SUUpdatePermissionResponse.h +++ b/Sparkle/SUUpdatePermissionResponse.h @@ -12,7 +12,7 @@ #import #endif -#import "SUExport.h" +#import /*! This class represents a response for permission to check updates. diff --git a/Sparkle/SUUpdatePermissionResponse.m b/Sparkle/SUUpdatePermissionResponse.m index 832e3774..823ba25f 100644 --- a/Sparkle/SUUpdatePermissionResponse.m +++ b/Sparkle/SUUpdatePermissionResponse.m @@ -6,7 +6,7 @@ // Copyright © 2016 Sparkle Project. All rights reserved. // -#import "SUUpdatePermissionResponse.h" +#import #include "AppKitPrevention.h" diff --git a/Sparkle/SUUpdater.h b/Sparkle/SUUpdater.h index 531e687e..eae3405d 100644 --- a/Sparkle/SUUpdater.h +++ b/Sparkle/SUUpdater.h @@ -14,10 +14,10 @@ #else #import #endif -#import "SUExport.h" -#import "SUVersionComparisonProtocol.h" -#import "SUVersionDisplayProtocol.h" -#import "SUUpdaterDelegate.h" +#import +#import +#import +#import @class SUAppcastItem, SUAppcast, NSMenuItem; diff --git a/Sparkle/SUUpdater.m b/Sparkle/SUUpdater.m index 74ae4748..96345b54 100644 --- a/Sparkle/SUUpdater.m +++ b/Sparkle/SUUpdater.m @@ -6,11 +6,11 @@ // Copyright 2006 Andy Matuschak. All rights reserved. // -#import "SUUpdater.h" -#import "SPUUpdater.h" -#import "SPUStandardUserDriver.h" -#import "SPUStandardUserDriverDelegate.h" -#import "SPUUpdaterDelegate.h" +#import +#import +#import +#import +#import #import "SULog.h" @interface SUUpdater () diff --git a/Sparkle/SUUpdaterDelegate.h b/Sparkle/SUUpdaterDelegate.h index c508aa98..52aa9b6f 100644 --- a/Sparkle/SUUpdaterDelegate.h +++ b/Sparkle/SUUpdaterDelegate.h @@ -12,7 +12,7 @@ #import #endif -#import "SUExport.h" +#import @protocol SUVersionComparison, SUVersionDisplay; @class SUUpdater, SUAppcast, SUAppcastItem; diff --git a/Sparkle/SUVersionComparisonProtocol.h b/Sparkle/SUVersionComparisonProtocol.h index 018cd23b..afa11f7c 100644 --- a/Sparkle/SUVersionComparisonProtocol.h +++ b/Sparkle/SUVersionComparisonProtocol.h @@ -15,7 +15,7 @@ #import #endif -#import "SUExport.h" +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Sparkle/SUVersionDisplayProtocol.h b/Sparkle/SUVersionDisplayProtocol.h index 14e10652..b3bf3f7b 100644 --- a/Sparkle/SUVersionDisplayProtocol.h +++ b/Sparkle/SUVersionDisplayProtocol.h @@ -12,7 +12,7 @@ #import #endif -#import "SUExport.h" +#import /*! Applies special display formatting to version numbers. diff --git a/Sparkle/Sparkle.h b/Sparkle/Sparkle.h index 6d49d65e..3b4bfe63 100644 --- a/Sparkle/Sparkle.h +++ b/Sparkle/Sparkle.h @@ -12,25 +12,27 @@ // This list should include the shared headers. It doesn't matter if some of them aren't shared (unless // there are name-space collisions) so we can list all of them to start with: -#import "SUAppcast.h" -#import "SUAppcastItem.h" -#import "SUStandardVersionComparator.h" -#import "SPUUpdater.h" -#import "SPUUpdaterDelegate.h" -#import "SPUUpdaterSettings.h" -#import "SPUStandardUpdaterController.h" -#import "SUVersionComparisonProtocol.h" -#import "SUVersionDisplayProtocol.h" -#import "SUErrors.h" -#import "SPUUpdatePermissionRequest.h" -#import "SUUpdatePermissionResponse.h" -#import "SPUUserDriver.h" -#import "SPUStandardUserDriver.h" -#import "SPUStandardUserDriverDelegate.h" -#import "SPUUserDriverCoreComponent.h" -#import "SPUDownloadData.h" +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import + +#import // deprecated +#import // deprecated -#import "SUUpdater.h" // deprecated -#import "SUUpdaterDelegate.h" // deprecated #endif diff --git a/Sparkle/SparkleCore.h b/Sparkle/SparkleCore.h index c69d87ee..a312673d 100644 --- a/Sparkle/SparkleCore.h +++ b/Sparkle/SparkleCore.h @@ -20,12 +20,12 @@ #import "SPUUpdater.h" #import "SPUUpdaterDelegate.h" #import "SPUUpdaterSettings.h" -#import "SUVersionComparisonProtocol.h" -#import "SUErrors.h" -#import "SPUUpdatePermissionRequest.h" -#import "SUUpdatePermissionResponse.h" -#import "SPUUserDriver.h" -#import "SPUUserDriverCoreComponent.h" -#import "SPUDownloadData.h" +#import +#import +#import +#import +#import +#import +#import #endif diff --git a/TestAppHelper/main.m b/TestAppHelper/main.m index 1b3e35ac..9e9fd5a9 100644 --- a/TestAppHelper/main.m +++ b/TestAppHelper/main.m @@ -8,7 +8,7 @@ #import #import "TestAppHelper.h" -#import "SPUUserDriver.h" +#import @interface ServiceDelegate : NSObject @end diff --git a/Tests/SUUpdaterTest.m b/Tests/SUUpdaterTest.m index 6ded7404..8b3cdca6 100644 --- a/Tests/SUUpdaterTest.m +++ b/Tests/SUUpdaterTest.m @@ -8,9 +8,9 @@ #import #import "SUConstants.h" -#import "SPUUpdater.h" -#import "SPUStandardUserDriver.h" -#import "SPUUpdaterDelegate.h" +#import +#import +#import @interface SUUpdaterTest : XCTestCase @property (strong) SPUUpdater *updater; diff --git a/Tests/SUVersionComparisonTest.m b/Tests/SUVersionComparisonTest.m index 649b7f77..1ea8cfce 100644 --- a/Tests/SUVersionComparisonTest.m +++ b/Tests/SUVersionComparisonTest.m @@ -6,7 +6,7 @@ // Copyright 2008 Andy Matuschak. All rights reserved. // -#import "SUStandardVersionComparator.h" +#import #import diff --git a/Tests/Sparkle Unit Tests-Bridging-Header.h b/Tests/Sparkle Unit Tests-Bridging-Header.h index 5938acd2..206dd25c 100644 --- a/Tests/Sparkle Unit Tests-Bridging-Header.h +++ b/Tests/Sparkle Unit Tests-Bridging-Header.h @@ -8,11 +8,12 @@ #import "SUPipedUnarchiver.h" #import "SUBinaryDeltaCommon.h" #import "SUFileManager.h" +#import #import "SUAppcast.h" -#import "SUAppcastItem.h" +#import #import "SUAppcastDriver.h" -#import "SUVersionComparisonProtocol.h" -#import "SUStandardVersionComparator.h" +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/generate_appcast/Appcast-Bridging-Header.h b/generate_appcast/Appcast-Bridging-Header.h index c7d7bf74..916d1e79 100644 --- a/generate_appcast/Appcast-Bridging-Header.h +++ b/generate_appcast/Appcast-Bridging-Header.h @@ -1,8 +1,8 @@ #import -#import "SUStandardVersionComparator.h" +#import #import "SUConstants.h" -#import "SUErrors.h" +#import #import "SUUnarchiver.h" #import "SUBinaryDeltaUnarchiver.h" #import "SUBinaryDeltaCreate.h" diff --git a/sparkle-cli/SPUCommandLineUserDriver.m b/sparkle-cli/SPUCommandLineUserDriver.m index a5a5334c..57f6cd6e 100644 --- a/sparkle-cli/SPUCommandLineUserDriver.m +++ b/sparkle-cli/SPUCommandLineUserDriver.m @@ -9,7 +9,7 @@ #import "SPUCommandLineUserDriver.h" #import #import -#import "SPUUserDriverCoreComponent.h" +#import #define SCHEDULED_UPDATE_TIMER_THRESHOLD 2.0 // seconds