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
14 changes: 3 additions & 11 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ on:

jobs:
build:
runs-on: macOS-15
runs-on: macOS-26
env:
XCODE_VERSION: 16.2
dotnetVersion: 9.0.200
XCODE_VERSION: 26.1
dotnetVersion: 10.0.100

steps:
- name: Checkout
Expand Down Expand Up @@ -51,14 +51,6 @@ jobs:
with:
useConfigFile: true

- name: Bootstrap carthage deps
run: |
mkdir -p artfifacts
sh carthage.sh update --use-xcframeworks --platform iOS --log-path artifacts/carthage.log
continue-on-error: true
env:
GITHUB_ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Build NukeProxy XCFramework
run: |
xcodebuild archive -sdk iphoneos -project NukeProxy.xcodeproj -scheme NukeProxy -configuration Release -archivePath Output/Output-iphoneos SKIP_INSTALL=NO
Expand Down
1 change: 0 additions & 1 deletion Cartfile

This file was deleted.

75 changes: 43 additions & 32 deletions NukeProxy.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,34 +3,30 @@
archiveVersion = 1;
classes = {
};
objectVersion = 54;
objectVersion = 90;
objects = {

/* Begin PBXBuildFile section */
123FC3EF2DB8CF3F00217EFA /* NukeExtensions.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = CEBEC60E2DB66ACB00FA295C /* NukeExtensions.xcframework */; };
7D013CDE265D5A2100454172 /* Nuke.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7D013CDD265D5A2100454172 /* Nuke.xcframework */; };
B08309D5241256530090FB75 /* NukeProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = B08309D3241256530090FB75 /* NukeProxy.h */; settings = {ATTRIBUTES = (Public, ); }; };
B08309E7241259650090FB75 /* NukeProxy.swift in Sources */ = {isa = PBXBuildFile; fileRef = B08309E6241259650090FB75 /* NukeProxy.swift */; };
F590BFEC2EC5BCBC00F87EE9 /* Nuke in Frameworks */ = {isa = PBXBuildFile; productRef = F590BFEB2EC5BCBC00F87EE9 /* Nuke */; };
F590BFEE2EC5BCBC00F87EE9 /* NukeExtensions in Frameworks */ = {isa = PBXBuildFile; productRef = F590BFED2EC5BCBC00F87EE9 /* NukeExtensions */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
7D013CDD265D5A2100454172 /* Nuke.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = Nuke.xcframework; path = Carthage/Build/Nuke.xcframework; sourceTree = "<group>"; };
B08309D0241256530090FB75 /* NukeProxy.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = NukeProxy.framework; sourceTree = BUILT_PRODUCTS_DIR; };
B08309D3241256530090FB75 /* NukeProxy.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NukeProxy.h; sourceTree = "<group>"; };
B08309D4241256530090FB75 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
B08309E6241259650090FB75 /* NukeProxy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NukeProxy.swift; sourceTree = "<group>"; };
CEBEC60E2DB66ACB00FA295C /* NukeExtensions.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = NukeExtensions.xcframework; path = Carthage/Build/NukeExtensions.xcframework; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
B08309CD241256530090FB75 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
123FC3EF2DB8CF3F00217EFA /* NukeExtensions.xcframework in Frameworks */,
7D013CDE265D5A2100454172 /* Nuke.xcframework in Frameworks */,
F590BFEC2EC5BCBC00F87EE9 /* Nuke in Frameworks */,
F590BFEE2EC5BCBC00F87EE9 /* NukeExtensions in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */

Expand Down Expand Up @@ -65,8 +61,6 @@
B08309DB241256A70090FB75 /* Frameworks */ = {
isa = PBXGroup;
children = (
CEBEC60E2DB66ACB00FA295C /* NukeExtensions.xcframework */,
7D013CDD265D5A2100454172 /* Nuke.xcframework */,
);
name = Frameworks;
sourceTree = "<group>";
Expand All @@ -76,11 +70,9 @@
/* Begin PBXHeadersBuildPhase section */
B08309CB241256530090FB75 /* Headers */ = {
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
B08309D5241256530090FB75 /* NukeProxy.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXHeadersBuildPhase section */

Expand All @@ -96,10 +88,10 @@
);
buildRules = (
);
dependencies = (
);
name = NukeProxy;
packageProductDependencies = (
F590BFEB2EC5BCBC00F87EE9 /* Nuke */,
F590BFED2EC5BCBC00F87EE9 /* NukeExtensions */,
);
productName = NukeProxy;
productReference = B08309D0241256530090FB75 /* NukeProxy.framework */;
Expand All @@ -122,7 +114,6 @@
};
};
buildConfigurationList = B08309CA241256530090FB75 /* Build configuration list for PBXProject "NukeProxy" */;
compatibilityVersion = "Xcode 9.3";
developmentRegion = en;
hasScannedForEncodings = 0;
knownRegions = (
Expand All @@ -131,7 +122,9 @@
);
mainGroup = B08309C6241256530090FB75;
packageReferences = (
F590BFEA2EC5BCBC00F87EE9 /* XCRemoteSwiftPackageReference "Nuke" */,
);
preferredProjectObjectVersion = 90;
productRefGroup = B08309D1241256530090FB75 /* Products */;
projectDirPath = "";
projectRoot = "";
Expand All @@ -144,26 +137,22 @@
/* Begin PBXResourcesBuildPhase section */
B08309CE241256530090FB75 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXResourcesBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
B08309CC241256530090FB75 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
B08309E7241259650090FB75 /* NukeProxy.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXSourcesBuildPhase section */

/* Begin XCBuildConfiguration section */
B08309D6241256530090FB75 /* Debug */ = {
B08309D6241256530090FB75 /* Debug configuration for PBXProject "NukeProxy" */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
Expand Down Expand Up @@ -216,7 +205,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
ONLY_ACTIVE_ARCH = YES;
Expand All @@ -229,7 +218,7 @@
};
name = Debug;
};
B08309D7241256530090FB75 /* Release */ = {
B08309D7241256530090FB75 /* Release configuration for PBXProject "NukeProxy" */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
Expand Down Expand Up @@ -276,7 +265,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
SDKROOT = iphoneos;
Expand All @@ -289,7 +278,7 @@
};
name = Release;
};
B08309D9241256530090FB75 /* Debug */ = {
B08309D9241256530090FB75 /* Debug configuration for PBXNativeTarget "NukeProxy" */ = {
isa = XCBuildConfiguration;
buildSettings = {
BUILD_LIBRARY_FOR_DISTRIBUTION = YES;
Expand Down Expand Up @@ -322,7 +311,7 @@
};
name = Debug;
};
B08309DA241256530090FB75 /* Release */ = {
B08309DA241256530090FB75 /* Release configuration for PBXNativeTarget "NukeProxy" */ = {
isa = XCBuildConfiguration;
buildSettings = {
BUILD_LIBRARY_FOR_DISTRIBUTION = YES;
Expand Down Expand Up @@ -360,22 +349,44 @@
B08309CA241256530090FB75 /* Build configuration list for PBXProject "NukeProxy" */ = {
isa = XCConfigurationList;
buildConfigurations = (
B08309D6241256530090FB75 /* Debug */,
B08309D7241256530090FB75 /* Release */,
B08309D6241256530090FB75 /* Debug configuration for PBXProject "NukeProxy" */,
B08309D7241256530090FB75 /* Release configuration for PBXProject "NukeProxy" */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
B08309D8241256530090FB75 /* Build configuration list for PBXNativeTarget "NukeProxy" */ = {
isa = XCConfigurationList;
buildConfigurations = (
B08309D9241256530090FB75 /* Debug */,
B08309DA241256530090FB75 /* Release */,
B08309D9241256530090FB75 /* Debug configuration for PBXNativeTarget "NukeProxy" */,
B08309DA241256530090FB75 /* Release configuration for PBXNativeTarget "NukeProxy" */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */

/* Begin XCRemoteSwiftPackageReference section */
F590BFEA2EC5BCBC00F87EE9 /* XCRemoteSwiftPackageReference "Nuke" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/kean/Nuke";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 12.8.0;
};
};
/* End XCRemoteSwiftPackageReference section */

/* Begin XCSwiftPackageProductDependency section */
F590BFEB2EC5BCBC00F87EE9 /* Nuke */ = {
isa = XCSwiftPackageProductDependency;
package = F590BFEA2EC5BCBC00F87EE9 /* XCRemoteSwiftPackageReference "Nuke" */;
productName = Nuke;
};
F590BFED2EC5BCBC00F87EE9 /* NukeExtensions */ = {
isa = XCSwiftPackageProductDependency;
package = F590BFEA2EC5BCBC00F87EE9 /* XCRemoteSwiftPackageReference "Nuke" */;
productName = NukeExtensions;
};
/* End XCSwiftPackageProductDependency section */
};
rootObject = B08309C7241256530090FB75 /* Project object */;
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions NukeProxy/NukeProxy.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@

import Foundation
import UIKit
import Nuke
import NukeExtensions
internal import Nuke
internal import NukeExtensions

@objc(ImagePipeline)
public class ImagePipeline : NSObject {
Expand Down
4 changes: 0 additions & 4 deletions build.sh
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
#!/bin/bash

mkdir -p artifacts

echo "Update carthage deps"
sh carthage.sh update --use-xcframeworks --platform iOS --log-path artifacts/carthage.log

rm -r Output/NukeProxy.xcframework

echo "xcode build"
Expand Down
17 changes: 0 additions & 17 deletions carthage.sh

This file was deleted.

18 changes: 8 additions & 10 deletions src/ImageCaching.Nuke/ImageCaching.Nuke.csproj
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net9.0-ios;net9.0-maccatalyst</TargetFrameworks>
<TargetFrameworks>net9.0-ios;net9.0-maccatalyst;net10.0-ios;net10.0-maccatalyst</TargetFrameworks>
<IsBindingProject>true</IsBindingProject>
<NoBindingEmbedding>true</NoBindingEmbedding>
<RootNamespace>ImageCaching.Nuke</RootNamespace>
<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net9.0-ios'">14.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net9.0-maccatalyst'">14.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net10.0-ios'">14.0</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net10.0-maccatalyst'">14.0</SupportedOSPlatformVersion>
<BindingPlatform>$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)'))</BindingPlatform>
</PropertyGroup>

<PropertyGroup>
<Copyright>Sharpnado 2020</Copyright>
<Copyright>Sharpnado 2025</Copyright>
<PackageProjectUrl>https://github.com/roubachof/NukeProxy</PackageProjectUrl>
<PackageIcon>nuke_small.png</PackageIcon>
<Authors>Jean-Marie Alfonsi, Tomasz Cielecki</Authors>
Expand All @@ -19,6 +21,10 @@
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
</PropertyGroup>

<PropertyGroup Condition=" '$(TF_BUILD)' == 'true' OR '$(GITHUB_ACTIONS)' == 'true' ">
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
<Deterministic>true</Deterministic>
Expand Down Expand Up @@ -48,14 +54,6 @@
<Kind>Framework</Kind>
<SmartLink>False</SmartLink>
</NativeReference>
<NativeReference Include="..\..\Carthage\Build\Nuke.xcframework">
<Kind>Framework</Kind>
<SmartLink>False</SmartLink>
</NativeReference>
<NativeReference Include="..\..\Carthage\Build\NukeExtensions.xcframework">
<Kind>Framework</Kind>
<SmartLink>False</SmartLink>
</NativeReference>
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/Sample/Sample.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net9.0-ios</TargetFramework>
<TargetFramework>net10.0-ios</TargetFramework>
<RootNamespace>Sample</RootNamespace>
<OutputType>Exe</OutputType>

Expand Down
Loading