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
16 changes: 13 additions & 3 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
@@ -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"
Expand Down Expand Up @@ -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} \
Expand Down
6 changes: 3 additions & 3 deletions PINRemoteImage.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -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 */; };
Expand Down Expand Up @@ -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 */,
);
Expand Down Expand Up @@ -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 */,
Expand Down
2 changes: 1 addition & 1 deletion Source/Classes/PINRemoteImageManager.m
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#import <objc/runtime.h>

#import <PINRemoteImage/PINAlternateRepresentationProvider.h>
#import "PINRemoteImageManagerConfiguration.h"
#import <PINRemoteImage/PINRemoteImageManagerConfiguration.h>
#import "PINRemoteLock.h"
#import <PINRemoteImage/PINProgressiveImage.h>
#import "PINRemoteImageCallbacks.h"
Expand Down
3 changes: 1 addition & 2 deletions Source/Classes/PINRemoteImageManagerConfiguration.m
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
//
//

#import "PINRemoteImageManagerConfiguration.h"

#import <PINRemoteImage/PINRemoteImageManagerConfiguration.h>
#import <PINRemoteImage/PINRemoteImageManager.h>

@implementation PINRemoteImageManagerConfiguration
Expand Down
1 change: 1 addition & 0 deletions Source/Classes/include/PINRemoteImage/PINRemoteImage.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,4 @@
#import <PINRemoteImage/PINImage+ScaledImage.h>
#import <PINRemoteImage/NSHTTPURLResponse+MaxAge.h>
#import <PINRemoteImage/PINRemoteImageDataConvertible.h>
#import <PINRemoteImage/PINRemoteImageManagerConfiguration.h>
2 changes: 1 addition & 1 deletion Tests/PINRemoteImageTests.m
Original file line number Diff line number Diff line change
Expand Up @@ -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.");
Expand Down