From f14141e8c458abb25725ad7d7ed31f3c5a8c2a2a Mon Sep 17 00:00:00 2001 From: Dan Fleming Date: Mon, 13 Jul 2026 12:46:05 -0400 Subject: [PATCH] [donotmerge] ci debugging --- Sources/SPTPersistentCacheGarbageCollector.m | 12 +++--------- Sources/SPTPersistentCacheHeader.m | 2 +- Tests/SPTPersistentCacheTests.m | 1 + ci/spotify_os.xcconfig | 2 +- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/Sources/SPTPersistentCacheGarbageCollector.m b/Sources/SPTPersistentCacheGarbageCollector.m index f2c59fe..730cebc 100644 --- a/Sources/SPTPersistentCacheGarbageCollector.m +++ b/Sources/SPTPersistentCacheGarbageCollector.m @@ -65,14 +65,8 @@ - (void)enqueueGarbageCollection:(NSTimer *)timer { __weak __typeof(self) const weakSelf = self; NSBlockOperation *operation = [NSBlockOperation blockOperationWithBlock:^{ - // We want to shadow `self` in this case. - _Pragma("clang diagnostic push"); - _Pragma("clang diagnostic ignored \"-Wshadow\""); - __typeof(weakSelf) const self = weakSelf; - _Pragma("clang diagnostic pop"); - - SPTPersistentCache * const cache = self.cache; - + __typeof(weakSelf) const strongSelf = weakSelf; + SPTPersistentCache * const cache = strongSelf.cache; [cache runRegularGC]; [cache pruneBySize]; }]; @@ -98,7 +92,7 @@ - (void)schedule return; } - self.timer = [NSTimer timerWithTimeInterval:self.options.garbageCollectionInterval + self.timer = [NSTimer timerWithTimeInterval:(NSTimeInterval)self.options.garbageCollectionInterval target:self selector:@selector(enqueueGarbageCollection:) userInfo:nil diff --git a/Sources/SPTPersistentCacheHeader.m b/Sources/SPTPersistentCacheHeader.m index 49a3dc0..4627659 100644 --- a/Sources/SPTPersistentCacheHeader.m +++ b/Sources/SPTPersistentCacheHeader.m @@ -106,7 +106,7 @@ SPTPersistentCacheRecordHeader SPTPersistentCacheRecordHeaderMake(uint64_t ttl, return nil; } - return [NSError spt_persistentDataCacheErrorWithCode:code]; + return [NSError spt_persistentDataCacheErrorWithCode:(SPTPersistentCacheLoadingError)code]; } uint32_t SPTPersistentCacheCalculateHeaderCRC(const SPTPersistentCacheRecordHeader *header) diff --git a/Tests/SPTPersistentCacheTests.m b/Tests/SPTPersistentCacheTests.m index ad297af..7baab45 100644 --- a/Tests/SPTPersistentCacheTests.m +++ b/Tests/SPTPersistentCacheTests.m @@ -18,6 +18,7 @@ Licensed to the Apache Software Foundation (ASF) under one specific language governing permissions and limitations under the License. */ +// small-change #import #if TARGET_OS_IPHONE diff --git a/ci/spotify_os.xcconfig b/ci/spotify_os.xcconfig index 73793e7..2cde4e5 100644 --- a/ci/spotify_os.xcconfig +++ b/ci/spotify_os.xcconfig @@ -75,7 +75,7 @@ YES_FOR_RELEASE = $(YES_FOR_RELEASE_$(CONFIGURATION)) // Warnings: // Attribution: https://github.com/jonreid/XcodeWarnings -WARNING_CFLAGS = -Weverything -Wno-error=deprecated -Wno-objc-missing-property-synthesis -Wno-gnu-conditional-omitted-operand -Wno-gnu -Wno-documentation-unknown-command -Wno-reserved-id-macro -Wno-auto-import -Wno-missing-variable-declarations -Wno-c++98-compat -Werror -Wno-direct-ivar-access -Wno-padded -Wno-declaration-after-statement +WARNING_CFLAGS = -Weverything -Wno-error=deprecated -Wno-objc-missing-property-synthesis -Wno-gnu-conditional-omitted-operand -Wno-gnu -Wno-documentation-unknown-command -Wno-reserved-id-macro -Wno-auto-import -Wno-missing-variable-declarations -Wno-c++98-compat -Werror -Wno-direct-ivar-access -Wno-padded -Wno-declaration-after-statement -Wno-reserved-identifier -Wno-pre-c11-compat -Wno-switch-default // Warnings CLANG_WARN__ARC_BRIDGE_CAST_NONARC = YES