From dbc9f060f1ac4d4f5f9a296ff05ab49bf1c8caac Mon Sep 17 00:00:00 2001 From: Vlad Velicu Date: Mon, 21 Aug 2023 15:44:35 +0100 Subject: [PATCH] quotes to angle branckets --- Objective-C/CBLArray.h | 2 +- Objective-C/CBLBasicAuthenticator.h | 2 +- Objective-C/CBLCollection.h | 6 +++--- Objective-C/CBLCollectionChangeObservable.h | 4 ++-- Objective-C/CBLCollectionConfiguration.h | 2 +- Objective-C/CBLConflictResolver.h | 2 +- Objective-C/CBLConsoleLogger.h | 2 +- Objective-C/CBLDatabase.h | 6 +++--- Objective-C/CBLDefaults.h | 2 +- Objective-C/CBLDictionary.h | 2 +- Objective-C/CBLDocument.h | 2 +- Objective-C/CBLDocumentFragment.h | 2 +- Objective-C/CBLFileLogger.h | 2 +- Objective-C/CBLFragment.h | 4 ++-- Objective-C/CBLFullTextIndex.h | 2 +- Objective-C/CBLFullTextIndexConfiguration.h | 2 +- Objective-C/CBLIndexable.h | 4 ++-- Objective-C/CBLMutableArray.h | 4 ++-- Objective-C/CBLMutableArrayFragment.h | 2 +- Objective-C/CBLMutableDictionary.h | 4 ++-- Objective-C/CBLMutableDictionaryFragment.h | 2 +- Objective-C/CBLMutableDocument.h | 4 ++-- Objective-C/CBLMutableFragment.h | 10 +++++----- Objective-C/CBLQueryFullTextIndexExpression.h | 2 +- Objective-C/CBLQueryVariableExpression.h | 2 +- Objective-C/CBLReplicator.h | 2 +- Objective-C/CBLReplicatorConfiguration.h | 4 ++-- Objective-C/CBLReplicatorTypes.h | 2 +- Objective-C/CBLSessionAuthenticator.h | 2 +- Objective-C/CBLURLEndpoint.h | 2 +- Objective-C/CBLValueIndex.h | 2 +- Objective-C/CBLValueIndexConfiguration.h | 2 +- Objective-C/Internal/CBLArray+Swift.h | 2 +- Objective-C/Internal/CBLBlob+Swift.h | 2 +- Objective-C/Internal/CBLDictionary+Swift.h | 2 +- Objective-C/Internal/CBLLog+Swift.h | 4 ++-- Objective-C/Internal/CBLNewDictionary.h | 2 +- Objective-C/Internal/CBLQuery+JSON.h | 2 +- Objective-C/Internal/CBLQuery+N1QL.h | 2 +- .../Replicator/CBLCollectionConfiguration+Swift.h | 6 +++--- .../Internal/Replicator/CBLConflictResolverBridge.h | 2 +- .../Replicator/CBLReplicatorConfiguration+Swift.h | 7 ++++++- xcconfigs/Project.xcconfig | 1 + 43 files changed, 66 insertions(+), 60 deletions(-) diff --git a/Objective-C/CBLArray.h b/Objective-C/CBLArray.h index f836c9ad5..704717f8a 100644 --- a/Objective-C/CBLArray.h +++ b/Objective-C/CBLArray.h @@ -18,7 +18,7 @@ // #import -#import "CBLArrayFragment.h" +#import @class CBLBlob; @class CBLDictionary; @class CBLArray; diff --git a/Objective-C/CBLBasicAuthenticator.h b/Objective-C/CBLBasicAuthenticator.h index 00f53ed2f..2d07298e6 100644 --- a/Objective-C/CBLBasicAuthenticator.h +++ b/Objective-C/CBLBasicAuthenticator.h @@ -18,7 +18,7 @@ // #import -#import "CBLAuthenticator.h" +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Objective-C/CBLCollection.h b/Objective-C/CBLCollection.h index 6e2280480..7490fd55c 100644 --- a/Objective-C/CBLCollection.h +++ b/Objective-C/CBLCollection.h @@ -17,9 +17,9 @@ // limitations under the License. // -#import "CBLCollectionChangeObservable.h" -#import "CBLIndexable.h" -#import "CBLCollectionTypes.h" +#import +#import +#import @class CBLDocument; @class CBLDocumentChange; diff --git a/Objective-C/CBLCollectionChangeObservable.h b/Objective-C/CBLCollectionChangeObservable.h index ebd406eca..5334be39d 100644 --- a/Objective-C/CBLCollectionChangeObservable.h +++ b/Objective-C/CBLCollectionChangeObservable.h @@ -17,8 +17,8 @@ // limitations under the License. // -#import "CBLCollectionChange.h" -#import "CBLListenerToken.h" +#import +#import NS_ASSUME_NONNULL_BEGIN /** diff --git a/Objective-C/CBLCollectionConfiguration.h b/Objective-C/CBLCollectionConfiguration.h index c6546fce3..f4ad26b18 100644 --- a/Objective-C/CBLCollectionConfiguration.h +++ b/Objective-C/CBLCollectionConfiguration.h @@ -18,7 +18,7 @@ // #import -#import "CBLReplicatorTypes.h" +#import @protocol CBLConflictResolver; diff --git a/Objective-C/CBLConflictResolver.h b/Objective-C/CBLConflictResolver.h index a9d1455f5..3b225ec06 100644 --- a/Objective-C/CBLConflictResolver.h +++ b/Objective-C/CBLConflictResolver.h @@ -17,7 +17,7 @@ // limitations under the License. // -#import "CBLConflict.h" +#import @class CBLDocument; NS_ASSUME_NONNULL_BEGIN diff --git a/Objective-C/CBLConsoleLogger.h b/Objective-C/CBLConsoleLogger.h index 1dab71803..0ca9766ef 100644 --- a/Objective-C/CBLConsoleLogger.h +++ b/Objective-C/CBLConsoleLogger.h @@ -18,7 +18,7 @@ // #import -#import "CBLLogger.h" +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Objective-C/CBLDatabase.h b/Objective-C/CBLDatabase.h index 681daa6d6..c39c61751 100644 --- a/Objective-C/CBLDatabase.h +++ b/Objective-C/CBLDatabase.h @@ -18,9 +18,9 @@ // #import -#import "CBLLogger.h" -#import "CBLQueryFactory.h" -#import "CBLCollectionTypes.h" +#import +#import +#import @class CBLBlob; @class CBLCollection; @class CBLDatabaseChange; diff --git a/Objective-C/CBLDefaults.h b/Objective-C/CBLDefaults.h index 8ac67b25f..5ab9f70ba 100644 --- a/Objective-C/CBLDefaults.h +++ b/Objective-C/CBLDefaults.h @@ -20,7 +20,7 @@ // THIS IS AN AUTOGENERATED FILE, MANUAL CHANGES SHOULD BE EXPECTED TO // BE OVERWRITTEN -#import "CBLReplicatorTypes.h" +#import #pragma mark - CBLLogFileConfiguration diff --git a/Objective-C/CBLDictionary.h b/Objective-C/CBLDictionary.h index 1ceb4d6b6..2587dbef4 100644 --- a/Objective-C/CBLDictionary.h +++ b/Objective-C/CBLDictionary.h @@ -18,7 +18,7 @@ // #import -#import "CBLDictionaryFragment.h" +#import @class CBLBlob; @class CBLArray; @class CBLDictionary; diff --git a/Objective-C/CBLDocument.h b/Objective-C/CBLDocument.h index ecc8ba53e..1117caeb8 100644 --- a/Objective-C/CBLDocument.h +++ b/Objective-C/CBLDocument.h @@ -18,7 +18,7 @@ // #import -#import "CBLDictionary.h" +#import @class CBLMutableDocument; @class CBLCollection; diff --git a/Objective-C/CBLDocumentFragment.h b/Objective-C/CBLDocumentFragment.h index d8c2ed87e..a7491bada 100644 --- a/Objective-C/CBLDocumentFragment.h +++ b/Objective-C/CBLDocumentFragment.h @@ -18,7 +18,7 @@ // #import -#import "CBLDictionaryFragment.h" +#import @class CBLDocument; NS_ASSUME_NONNULL_BEGIN diff --git a/Objective-C/CBLFileLogger.h b/Objective-C/CBLFileLogger.h index f85a28390..5ae09a046 100644 --- a/Objective-C/CBLFileLogger.h +++ b/Objective-C/CBLFileLogger.h @@ -18,7 +18,7 @@ // #import -#import "CBLLogger.h" +#import @class CBLLogFileConfiguration; NS_ASSUME_NONNULL_BEGIN diff --git a/Objective-C/CBLFragment.h b/Objective-C/CBLFragment.h index d1e0510ee..90a8c3967 100644 --- a/Objective-C/CBLFragment.h +++ b/Objective-C/CBLFragment.h @@ -18,8 +18,8 @@ // #import -#import "CBLArrayFragment.h" -#import "CBLDictionaryFragment.h" +#import +#import @class CBLBlob; @class CBLArray; @class CBLDictionary; diff --git a/Objective-C/CBLFullTextIndex.h b/Objective-C/CBLFullTextIndex.h index c2cd8b76c..db0d7e183 100644 --- a/Objective-C/CBLFullTextIndex.h +++ b/Objective-C/CBLFullTextIndex.h @@ -18,7 +18,7 @@ // #import -#import "CBLIndex.h" +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Objective-C/CBLFullTextIndexConfiguration.h b/Objective-C/CBLFullTextIndexConfiguration.h index 3d3bc6b9f..c18541d8d 100644 --- a/Objective-C/CBLFullTextIndexConfiguration.h +++ b/Objective-C/CBLFullTextIndexConfiguration.h @@ -18,7 +18,7 @@ // #import -#import "CBLIndexConfiguration.h" +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Objective-C/CBLIndexable.h b/Objective-C/CBLIndexable.h index d66e0914f..58f7e9c88 100644 --- a/Objective-C/CBLIndexable.h +++ b/Objective-C/CBLIndexable.h @@ -17,8 +17,8 @@ // limitations under the License. // -#import "CBLIndexConfiguration.h" -#import "CBLIndex.h" +#import +#import NS_ASSUME_NONNULL_BEGIN /** The Indexable interface defines a set of functions for managing the query indexes. */ diff --git a/Objective-C/CBLMutableArray.h b/Objective-C/CBLMutableArray.h index 49ee65195..ed1538da4 100644 --- a/Objective-C/CBLMutableArray.h +++ b/Objective-C/CBLMutableArray.h @@ -18,8 +18,8 @@ // #import -#import "CBLArray.h" -#import "CBLMutableArrayFragment.h" +#import +#import @class CBLMutableDictionary; @class CBLMutableArray; diff --git a/Objective-C/CBLMutableArrayFragment.h b/Objective-C/CBLMutableArrayFragment.h index f9a6ac845..8c1f9b88e 100644 --- a/Objective-C/CBLMutableArrayFragment.h +++ b/Objective-C/CBLMutableArrayFragment.h @@ -17,7 +17,7 @@ // limitations under the License. // -#import "CBLArrayFragment.h" +#import @class CBLMutableFragment; NS_ASSUME_NONNULL_BEGIN diff --git a/Objective-C/CBLMutableDictionary.h b/Objective-C/CBLMutableDictionary.h index 57204f422..7826841ad 100644 --- a/Objective-C/CBLMutableDictionary.h +++ b/Objective-C/CBLMutableDictionary.h @@ -18,8 +18,8 @@ // #import -#import "CBLDictionary.h" -#import "CBLMutableDictionaryFragment.h" +#import +#import @class CBLMutableArray; @class CBLMutableDictionary; diff --git a/Objective-C/CBLMutableDictionaryFragment.h b/Objective-C/CBLMutableDictionaryFragment.h index 1c3b2a9bf..e0299340b 100644 --- a/Objective-C/CBLMutableDictionaryFragment.h +++ b/Objective-C/CBLMutableDictionaryFragment.h @@ -18,7 +18,7 @@ // -#import "CBLDictionaryFragment.h" +#import @class CBLMutableFragment; NS_ASSUME_NONNULL_BEGIN diff --git a/Objective-C/CBLMutableDocument.h b/Objective-C/CBLMutableDocument.h index 3058518e6..ca411f140 100644 --- a/Objective-C/CBLMutableDocument.h +++ b/Objective-C/CBLMutableDocument.h @@ -18,8 +18,8 @@ // #import -#import "CBLDocument.h" -#import "CBLMutableDictionary.h" +#import +#import @class CBLDatabase; NS_ASSUME_NONNULL_BEGIN diff --git a/Objective-C/CBLMutableFragment.h b/Objective-C/CBLMutableFragment.h index 7b5741470..6b5429432 100644 --- a/Objective-C/CBLMutableFragment.h +++ b/Objective-C/CBLMutableFragment.h @@ -18,11 +18,11 @@ // #import -#import "CBLMutableArray.h" -#import "CBLMutableArrayFragment.h" -#import "CBLMutableDictionary.h" -#import "CBLMutableDictionaryFragment.h" -#import "CBLFragment.h" +#import +#import +#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Objective-C/CBLQueryFullTextIndexExpression.h b/Objective-C/CBLQueryFullTextIndexExpression.h index e53c7a141..aaef01dc2 100644 --- a/Objective-C/CBLQueryFullTextIndexExpression.h +++ b/Objective-C/CBLQueryFullTextIndexExpression.h @@ -18,7 +18,7 @@ // #import -#import "CBLQueryFullTextIndexExpressionProtocol.h" +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Objective-C/CBLQueryVariableExpression.h b/Objective-C/CBLQueryVariableExpression.h index c79b97f33..09090648c 100644 --- a/Objective-C/CBLQueryVariableExpression.h +++ b/Objective-C/CBLQueryVariableExpression.h @@ -18,7 +18,7 @@ // #import -#import "CBLQueryExpression.h" +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Objective-C/CBLReplicator.h b/Objective-C/CBLReplicator.h index f0970ec99..f6ddbe330 100644 --- a/Objective-C/CBLReplicator.h +++ b/Objective-C/CBLReplicator.h @@ -18,7 +18,7 @@ // #import -#import "CBLReplicatorTypes.h" +#import @class CBLCollection; @class CBLDatabase; diff --git a/Objective-C/CBLReplicatorConfiguration.h b/Objective-C/CBLReplicatorConfiguration.h index fc8377c33..f76a14b89 100644 --- a/Objective-C/CBLReplicatorConfiguration.h +++ b/Objective-C/CBLReplicatorConfiguration.h @@ -19,8 +19,8 @@ #import #import -#import "CBLDocumentFlags.h" -#import "CBLReplicatorTypes.h" +#import +#import @class CBLAuthenticator; @class CBLCollection; diff --git a/Objective-C/CBLReplicatorTypes.h b/Objective-C/CBLReplicatorTypes.h index 6722dcbcc..17b25025b 100644 --- a/Objective-C/CBLReplicatorTypes.h +++ b/Objective-C/CBLReplicatorTypes.h @@ -18,7 +18,7 @@ // #pragma once -#import "CBLDocumentFlags.h" +#import @class CBLDocument; diff --git a/Objective-C/CBLSessionAuthenticator.h b/Objective-C/CBLSessionAuthenticator.h index 26f278a0c..35678329c 100644 --- a/Objective-C/CBLSessionAuthenticator.h +++ b/Objective-C/CBLSessionAuthenticator.h @@ -18,7 +18,7 @@ // #import -#import "CBLAuthenticator.h" +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Objective-C/CBLURLEndpoint.h b/Objective-C/CBLURLEndpoint.h index 786f9be21..45470fd11 100644 --- a/Objective-C/CBLURLEndpoint.h +++ b/Objective-C/CBLURLEndpoint.h @@ -18,7 +18,7 @@ // #import -#import "CBLEndpoint.h" +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Objective-C/CBLValueIndex.h b/Objective-C/CBLValueIndex.h index a0ab6a973..b0bd7a1cc 100644 --- a/Objective-C/CBLValueIndex.h +++ b/Objective-C/CBLValueIndex.h @@ -18,7 +18,7 @@ // #import -#import "CBLIndex.h" +#import @class CBLQueryExpression; NS_ASSUME_NONNULL_BEGIN diff --git a/Objective-C/CBLValueIndexConfiguration.h b/Objective-C/CBLValueIndexConfiguration.h index 803d0eb61..f765b04b3 100644 --- a/Objective-C/CBLValueIndexConfiguration.h +++ b/Objective-C/CBLValueIndexConfiguration.h @@ -18,7 +18,7 @@ // #import -#import "CBLIndexConfiguration.h" +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Objective-C/Internal/CBLArray+Swift.h b/Objective-C/Internal/CBLArray+Swift.h index a00847615..a91876301 100644 --- a/Objective-C/Internal/CBLArray+Swift.h +++ b/Objective-C/Internal/CBLArray+Swift.h @@ -17,7 +17,7 @@ // limitations under the License. // -#import "CBLArray.h" +#import @interface CBLArray () diff --git a/Objective-C/Internal/CBLBlob+Swift.h b/Objective-C/Internal/CBLBlob+Swift.h index e9f605857..fec4836ee 100644 --- a/Objective-C/Internal/CBLBlob+Swift.h +++ b/Objective-C/Internal/CBLBlob+Swift.h @@ -17,7 +17,7 @@ // limitations under the License. // -#import "CBLBlob.h" +#import @interface CBLBlob () diff --git a/Objective-C/Internal/CBLDictionary+Swift.h b/Objective-C/Internal/CBLDictionary+Swift.h index 40766278b..d486d4eef 100644 --- a/Objective-C/Internal/CBLDictionary+Swift.h +++ b/Objective-C/Internal/CBLDictionary+Swift.h @@ -17,7 +17,7 @@ // limitations under the License. // -#import "CBLDictionary.h" +#import @interface CBLDictionary () diff --git a/Objective-C/Internal/CBLLog+Swift.h b/Objective-C/Internal/CBLLog+Swift.h index 6266f2e23..83f39e2d8 100644 --- a/Objective-C/Internal/CBLLog+Swift.h +++ b/Objective-C/Internal/CBLLog+Swift.h @@ -17,8 +17,8 @@ // limitations under the License. // -#import "CBLLog.h" -#import "CBLLogger.h" +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Objective-C/Internal/CBLNewDictionary.h b/Objective-C/Internal/CBLNewDictionary.h index 2f5df5409..880abcb60 100644 --- a/Objective-C/Internal/CBLNewDictionary.h +++ b/Objective-C/Internal/CBLNewDictionary.h @@ -17,7 +17,7 @@ // limitations under the License. // -#import "CBLMutableDictionary.h" +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Objective-C/Internal/CBLQuery+JSON.h b/Objective-C/Internal/CBLQuery+JSON.h index eed907818..edb1538ab 100644 --- a/Objective-C/Internal/CBLQuery+JSON.h +++ b/Objective-C/Internal/CBLQuery+JSON.h @@ -16,7 +16,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "CBLQuery.h" +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Objective-C/Internal/CBLQuery+N1QL.h b/Objective-C/Internal/CBLQuery+N1QL.h index 587de1572..fc9bc0c2b 100644 --- a/Objective-C/Internal/CBLQuery+N1QL.h +++ b/Objective-C/Internal/CBLQuery+N1QL.h @@ -16,7 +16,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#import "CBLQuery.h" +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Objective-C/Internal/Replicator/CBLCollectionConfiguration+Swift.h b/Objective-C/Internal/Replicator/CBLCollectionConfiguration+Swift.h index ae0e57d9d..11c39d5af 100644 --- a/Objective-C/Internal/Replicator/CBLCollectionConfiguration+Swift.h +++ b/Objective-C/Internal/Replicator/CBLCollectionConfiguration+Swift.h @@ -17,9 +17,9 @@ // limitations under the License. // -#import "CBLCollectionConfiguration.h" -#import "CBLConflictResolver.h" -#import "CBLConflictResolverBridge.h" +#import +#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Objective-C/Internal/Replicator/CBLConflictResolverBridge.h b/Objective-C/Internal/Replicator/CBLConflictResolverBridge.h index a7f8fe7b0..ba186cbd9 100644 --- a/Objective-C/Internal/Replicator/CBLConflictResolverBridge.h +++ b/Objective-C/Internal/Replicator/CBLConflictResolverBridge.h @@ -17,7 +17,7 @@ // limitations under the License. // -#import "CBLConflictResolver.h" +#import NS_ASSUME_NONNULL_BEGIN diff --git a/Objective-C/Internal/Replicator/CBLReplicatorConfiguration+Swift.h b/Objective-C/Internal/Replicator/CBLReplicatorConfiguration+Swift.h index 492375471..5fbb7d22d 100644 --- a/Objective-C/Internal/Replicator/CBLReplicatorConfiguration+Swift.h +++ b/Objective-C/Internal/Replicator/CBLReplicatorConfiguration+Swift.h @@ -17,8 +17,13 @@ // limitations under the License. // -#import "CBLReplicatorConfiguration.h" +#import + +// This is needed as this file is used for both Obj-C and Swift, Swift requiring <>, while Obj-C is looking for "". +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wquoted-include-in-framework-header" #import "CBLConflictResolverBridge.h" +#pragma clang diagnostic pop NS_ASSUME_NONNULL_BEGIN diff --git a/xcconfigs/Project.xcconfig b/xcconfigs/Project.xcconfig index 72f9b27ed..df9ecf91d 100644 --- a/xcconfigs/Project.xcconfig +++ b/xcconfigs/Project.xcconfig @@ -112,6 +112,7 @@ GCC_WARN_UNDECLARED_SELECTOR = YES GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE GCC_WARN_UNUSED_FUNCTION = YES GCC_WARN_UNUSED_VARIABLE = YES +CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES WARNING_CFLAGS = -Wall -Wformat-security -Wmissing-declarations -Woverriding-method-mismatch -Wunguarded-availability -Weffc++ // Sanitizer Behaviors: