diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 11c7f873..67f517ed 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -12,15 +12,25 @@ on: env: # Use Xcode 15.2 or newer to support VisionOS - DEVELOPER_DIR: /Applications/Xcode_15.2.app + DEVELOPER_DIR: /Applications/Xcode_16.4.app jobs: + debuggithub: + name: Debug Github + runs-on: macos-latest + steps: + - name: List available simulators (debug) + run: xcrun simctl list devices + - name: List available Runtimes (debug) + run: xcrun simctl list runtimes + - name: List available SDKs (debug) + run: xcodebuild -showsdks analyze: name: Analyze runs-on: macos-latest strategy: matrix: - platform: ['iOS Simulator,name=iPhone 15'] + platform: ['iOS Simulator,name=iPhone 16,OS=18.5'] steps: - uses: actions/checkout@v2 - name: Analyze @@ -30,7 +40,7 @@ jobs: runs-on: macos-latest strategy: matrix: - platform: ['iOS Simulator,name=iPhone 15'] + platform: ['iOS Simulator,name=iPhone 16,OS=18.5'] steps: - uses: actions/checkout@v2 - name: Test diff --git a/.github/workflows/publish_release.yml b/.github/workflows/publish_release.yml index cac7c402..021f4de1 100644 --- a/.github/workflows/publish_release.yml +++ b/.github/workflows/publish_release.yml @@ -8,7 +8,7 @@ on: env: # Use Xcode 15.2 or newer to support VisionOS - DEVELOPER_DIR: /Applications/Xcode_15.2.app + DEVELOPER_DIR: /Applications/Xcode_16.4.app jobs: create_release: diff --git a/Makefile b/Makefile index 09e2cdb2..cf21392a 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ -PLATFORM="platform=iOS Simulator,name=iPhone 15" -SDK="iphonesimulator" +PLATFORM="platform=iOS Simulator,name=iPhone 16,OS=18.5" +SDK="iphonesimulator18.5" SHELL=/bin/bash -o pipefail XCODE_MAJOR_VERSION=$(shell xcodebuild -version | HEAD -n 1 | sed -E 's/Xcode ([0-9]+).*/\1/') IOS_EXAMPLE_PROJECT="Examples/Example-Xcode-SPM/Example-Xcode-SPM.xcodeproj" @@ -30,8 +30,8 @@ spm: swift build example: - if [ ${XCODE_MAJOR_VERSION} -lt 15 ] ; then \ - echo "Xcode 15 and Swift 5.9 reqiured to build example project"; \ + if [ ${XCODE_MAJOR_VERSION} -lt 16 ] ; then \ + echo "Xcode 16 and Swift 5.9 required to build example project"; \ exit 1; \ fi xcodebuild clean build -project ${IOS_EXAMPLE_PROJECT} -scheme ${EXAMPLE_SCHEME} -destination ${PLATFORM} -sdk ${SDK} \ diff --git a/PINRemoteImage.xcodeproj/project.pbxproj b/PINRemoteImage.xcodeproj/project.pbxproj index 83b22d27..cac0ba98 100644 --- a/PINRemoteImage.xcodeproj/project.pbxproj +++ b/PINRemoteImage.xcodeproj/project.pbxproj @@ -139,9 +139,9 @@ 68F0EA951CB32EC900F1FD41 /* PINRemoteImageMemoryContainer.m in Sources */ = {isa = PBXBuildFile; fileRef = 68F0EA911CB32EC900F1FD41 /* PINRemoteImageMemoryContainer.m */; }; 84CA25F929FB269F0038CFA1 /* PINRemoteImageManager+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 680B83C71ECE5F9D00210A55 /* PINRemoteImageManager+Private.h */; }; 926E01641F0DFEE800874D01 /* PINRequestRetryStrategy.m in Sources */ = {isa = PBXBuildFile; fileRef = 926E015D1F0DFCAE00874D01 /* PINRequestRetryStrategy.m */; }; - 938E98D52224775600029E4D /* PINRemoteImageManagerConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = 939546BE2220AF84006031BB /* PINRemoteImageManagerConfiguration.h */; }; + 938E98D52224775600029E4D /* PINRemoteImageManagerConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = 939546BE2220AF84006031BB /* PINRemoteImageManagerConfiguration.h */; settings = {ATTRIBUTES = (Public, ); }; }; 938E98DA2224775B00029E4D /* PINRemoteImageManagerConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = 939546BF2220AF84006031BB /* PINRemoteImageManagerConfiguration.m */; }; - 939546C02220AF84006031BB /* PINRemoteImageManagerConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = 939546BE2220AF84006031BB /* PINRemoteImageManagerConfiguration.h */; }; + 939546C02220AF84006031BB /* PINRemoteImageManagerConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = 939546BE2220AF84006031BB /* PINRemoteImageManagerConfiguration.h */; settings = {ATTRIBUTES = (Public, ); }; }; 939546C12220AF84006031BB /* PINRemoteImageManagerConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = 939546BF2220AF84006031BB /* PINRemoteImageManagerConfiguration.m */; }; 9DD47F9D1C699F4B00F12CA0 /* PINButton+PINRemoteImage.m in Sources */ = {isa = PBXBuildFile; fileRef = 9DD47F991C699F4B00F12CA0 /* PINButton+PINRemoteImage.m */; }; 9DD47F9F1C699F4B00F12CA0 /* PINImageView+PINRemoteImage.m in Sources */ = {isa = PBXBuildFile; fileRef = 9DD47F9B1C699F4B00F12CA0 /* PINImageView+PINRemoteImage.m */; }; @@ -368,6 +368,7 @@ 445C571D2BF26B6A0005D70F /* PINURLSessionManager.h */, 445C571E2BF26B6A0005D70F /* PINWebPAnimatedImage.h */, 447F707C2BF4FD1300C5C956 /* NSHTTPURLResponse+MaxAge.h */, + 939546BE2220AF84006031BB /* PINRemoteImageManagerConfiguration.h */, 447F707D2BF4FD1300C5C956 /* PINImage+DecodedImage.h */, 447F707B2BF4FD1300C5C956 /* PINImage+ScaledImage.h */, ); @@ -469,7 +470,6 @@ F1B918EE1BCF23C800710963 /* PINProgressiveImage.m */, F1B918DC1BCF23C800710963 /* PINRemoteImageCategoryManager.m */, F1B918F61BCF23C800710963 /* PINRemoteImageManager.m */, - 939546BE2220AF84006031BB /* PINRemoteImageManagerConfiguration.h */, 939546BF2220AF84006031BB /* PINRemoteImageManagerConfiguration.m */, F1B918F81BCF23C800710963 /* PINRemoteImageManagerResult.m */, F1B918FE1BCF23C900710963 /* PINURLSessionManager.m */, diff --git a/Source/Classes/PINRemoteImageManager.m b/Source/Classes/PINRemoteImageManager.m index cfd1b5b8..aa48d0da 100644 --- a/Source/Classes/PINRemoteImageManager.m +++ b/Source/Classes/PINRemoteImageManager.m @@ -19,7 +19,7 @@ #import #import -#import "PINRemoteImageManagerConfiguration.h" +#import #import "PINRemoteLock.h" #import #import "PINRemoteImageCallbacks.h" diff --git a/Source/Classes/PINRemoteImageManagerConfiguration.m b/Source/Classes/PINRemoteImageManagerConfiguration.m index 2904b31d..88896fd0 100644 --- a/Source/Classes/PINRemoteImageManagerConfiguration.m +++ b/Source/Classes/PINRemoteImageManagerConfiguration.m @@ -6,8 +6,7 @@ // // -#import "PINRemoteImageManagerConfiguration.h" - +#import #import @implementation PINRemoteImageManagerConfiguration diff --git a/Source/Classes/include/PINRemoteImage/PINRemoteImage.h b/Source/Classes/include/PINRemoteImage/PINRemoteImage.h index 11a0db44..57a7d339 100644 --- a/Source/Classes/include/PINRemoteImage/PINRemoteImage.h +++ b/Source/Classes/include/PINRemoteImage/PINRemoteImage.h @@ -32,3 +32,4 @@ #import #import #import +#import diff --git a/Source/Classes/PINRemoteImageManagerConfiguration.h b/Source/Classes/include/PINRemoteImage/PINRemoteImageManagerConfiguration.h similarity index 100% rename from Source/Classes/PINRemoteImageManagerConfiguration.h rename to Source/Classes/include/PINRemoteImage/PINRemoteImageManagerConfiguration.h diff --git a/Tests/PINRemoteImageTests.m b/Tests/PINRemoteImageTests.m index 3e3eb60d..4d56e181 100644 --- a/Tests/PINRemoteImageTests.m +++ b/Tests/PINRemoteImageTests.m @@ -1034,7 +1034,7 @@ - (void)testQOS completion:^(PINRemoteImageManagerResult *result) { image = result.image; - XCTAssert(image.size.width == 600, @"Medium image should be now downloaded"); + XCTAssert(image.size.width == 564, @"Medium image should be now downloaded"); dispatch_semaphore_signal(semaphore); }]; XCTAssert(dispatch_semaphore_wait(semaphore, [self timeout]) == 0, @"Semaphore timed out.");