Skip to content

Commit

Permalink
Remove AblyDeltaCodec import from public API
Browse files Browse the repository at this point in the history 
Resolves #1438, in which Jazzy would emit an error about not being able
to find the ARTDeltaCodec.h header, which was being transitively
imported by our umbrella header. I think the simplest solution is to
remove this transitive import, which doesn't need to be there (the
library's use of ARTDeltaCodec is an implementation detail).
  • Loading branch information
@lawrence-forooghian
lawrence-forooghian committed Jan 30, 2025
1 parent 35805d0 commit 30344e2
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 10 deletions.
16 changes: 8 additions & 8 deletions Ably.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -845,9 +845,9 @@
D737F829263AF4CE0064FA05 /* ARTFallbackHosts.m in Sources */ = {isa = PBXBuildFile; fileRef = D737F825263AF4CE0064FA05 /* ARTFallbackHosts.m */; };
D737F82A263AF4CE0064FA05 /* ARTFallbackHosts.m in Sources */ = {isa = PBXBuildFile; fileRef = D737F825263AF4CE0064FA05 /* ARTFallbackHosts.m */; };
D737F82B263AF4CE0064FA05 /* ARTFallbackHosts.m in Sources */ = {isa = PBXBuildFile; fileRef = D737F825263AF4CE0064FA05 /* ARTFallbackHosts.m */; };
D73B655523EF2B2900D459A6 /* ARTDeltaCodec.h in Headers */ = {isa = PBXBuildFile; fileRef = D73B655323EF2B2900D459A6 /* ARTDeltaCodec.h */; settings = {ATTRIBUTES = (Public, ); }; };
D73B655623EF2B2900D459A6 /* ARTDeltaCodec.h in Headers */ = {isa = PBXBuildFile; fileRef = D73B655323EF2B2900D459A6 /* ARTDeltaCodec.h */; settings = {ATTRIBUTES = (Public, ); }; };
D73B655723EF2B2900D459A6 /* ARTDeltaCodec.h in Headers */ = {isa = PBXBuildFile; fileRef = D73B655323EF2B2900D459A6 /* ARTDeltaCodec.h */; settings = {ATTRIBUTES = (Public, ); }; };
D73B655523EF2B2900D459A6 /* ARTDeltaCodec.h in Headers */ = {isa = PBXBuildFile; fileRef = D73B655323EF2B2900D459A6 /* ARTDeltaCodec.h */; settings = {ATTRIBUTES = (Private, ); }; };
D73B655623EF2B2900D459A6 /* ARTDeltaCodec.h in Headers */ = {isa = PBXBuildFile; fileRef = D73B655323EF2B2900D459A6 /* ARTDeltaCodec.h */; settings = {ATTRIBUTES = (Private, ); }; };
D73B655723EF2B2900D459A6 /* ARTDeltaCodec.h in Headers */ = {isa = PBXBuildFile; fileRef = D73B655323EF2B2900D459A6 /* ARTDeltaCodec.h */; settings = {ATTRIBUTES = (Private, ); }; };
D73B655823EF2B2900D459A6 /* ARTDeltaCodec.m in Sources */ = {isa = PBXBuildFile; fileRef = D73B655423EF2B2900D459A6 /* ARTDeltaCodec.m */; };
D73B655923EF2B2900D459A6 /* ARTDeltaCodec.m in Sources */ = {isa = PBXBuildFile; fileRef = D73B655423EF2B2900D459A6 /* ARTDeltaCodec.m */; };
D73B655A23EF2B2900D459A6 /* ARTDeltaCodec.m in Sources */ = {isa = PBXBuildFile; fileRef = D73B655423EF2B2900D459A6 /* ARTDeltaCodec.m */; };
Expand Down Expand Up @@ -914,9 +914,9 @@
D798554823EB96C000946BE2 /* DeltaCodecTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D798554723EB96C000946BE2 /* DeltaCodecTests.swift */; };
D798554923EB96C000946BE2 /* DeltaCodecTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D798554723EB96C000946BE2 /* DeltaCodecTests.swift */; };
D798554A23EB96C000946BE2 /* DeltaCodecTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D798554723EB96C000946BE2 /* DeltaCodecTests.swift */; };
D798556023ECCDAF00946BE2 /* ARTVCDiffDecoder.h in Headers */ = {isa = PBXBuildFile; fileRef = D798555E23ECCDAF00946BE2 /* ARTVCDiffDecoder.h */; settings = {ATTRIBUTES = (Public, ); }; };
D798556123ECCDAF00946BE2 /* ARTVCDiffDecoder.h in Headers */ = {isa = PBXBuildFile; fileRef = D798555E23ECCDAF00946BE2 /* ARTVCDiffDecoder.h */; settings = {ATTRIBUTES = (Public, ); }; };
D798556223ECCDAF00946BE2 /* ARTVCDiffDecoder.h in Headers */ = {isa = PBXBuildFile; fileRef = D798555E23ECCDAF00946BE2 /* ARTVCDiffDecoder.h */; settings = {ATTRIBUTES = (Public, ); }; };
D798556023ECCDAF00946BE2 /* ARTVCDiffDecoder.h in Headers */ = {isa = PBXBuildFile; fileRef = D798555E23ECCDAF00946BE2 /* ARTVCDiffDecoder.h */; settings = {ATTRIBUTES = (Private, ); }; };
D798556123ECCDAF00946BE2 /* ARTVCDiffDecoder.h in Headers */ = {isa = PBXBuildFile; fileRef = D798555E23ECCDAF00946BE2 /* ARTVCDiffDecoder.h */; settings = {ATTRIBUTES = (Private, ); }; };
D798556223ECCDAF00946BE2 /* ARTVCDiffDecoder.h in Headers */ = {isa = PBXBuildFile; fileRef = D798555E23ECCDAF00946BE2 /* ARTVCDiffDecoder.h */; settings = {ATTRIBUTES = (Private, ); }; };
D7AE18C91E5B40C900478D82 /* ARTPushAdmin.h in Headers */ = {isa = PBXBuildFile; fileRef = D7AE18C71E5B40C900478D82 /* ARTPushAdmin.h */; settings = {ATTRIBUTES = (Public, ); }; };
D7AE18CA1E5B40C900478D82 /* ARTPushAdmin.m in Sources */ = {isa = PBXBuildFile; fileRef = D7AE18C81E5B40C900478D82 /* ARTPushAdmin.m */; };
D7AE18CE1E5B40FE00478D82 /* ARTPushDeviceRegistrations.h in Headers */ = {isa = PBXBuildFile; fileRef = D7AE18CC1E5B40FE00478D82 /* ARTPushDeviceRegistrations.h */; settings = {ATTRIBUTES = (Public, ); }; };
Expand Down Expand Up @@ -1348,7 +1348,7 @@
D73691FE1DB788C40062C150 /* ARTAuthDetails.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ARTAuthDetails.m; sourceTree = "<group>"; };
D737F824263AF4CE0064FA05 /* ARTFallbackHosts.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ARTFallbackHosts.h; path = PrivateHeaders/Ably/ARTFallbackHosts.h; sourceTree = "<group>"; };
D737F825263AF4CE0064FA05 /* ARTFallbackHosts.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ARTFallbackHosts.m; sourceTree = "<group>"; };
D73B655323EF2B2900D459A6 /* ARTDeltaCodec.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ARTDeltaCodec.h; path = include/Ably/ARTDeltaCodec.h; sourceTree = "<group>"; };
D73B655323EF2B2900D459A6 /* ARTDeltaCodec.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ARTDeltaCodec.h; path = PrivateHeaders/Ably/ARTDeltaCodec.h; sourceTree = "<group>"; };
D73B655423EF2B2900D459A6 /* ARTDeltaCodec.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ARTDeltaCodec.m; sourceTree = "<group>"; };
D746AE1A1BBB5207003ECEF8 /* ARTDataQuery.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ARTDataQuery.h; path = include/Ably/ARTDataQuery.h; sourceTree = "<group>"; };
D746AE1B1BBB5207003ECEF8 /* ARTDataQuery+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "ARTDataQuery+Private.h"; path = "PrivateHeaders/Ably/ARTDataQuery+Private.h"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1410,7 +1410,7 @@
D785C4281E549E33008FEC05 /* ARTPushChannelSubscription.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ARTPushChannelSubscription.m; sourceTree = "<group>"; };
D78D780821271FB10016808B /* ARTHTTPPaginatedResponse+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "ARTHTTPPaginatedResponse+Private.h"; path = "PrivateHeaders/Ably/ARTHTTPPaginatedResponse+Private.h"; sourceTree = "<group>"; };
D798554723EB96C000946BE2 /* DeltaCodecTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeltaCodecTests.swift; sourceTree = "<group>"; };
D798555E23ECCDAF00946BE2 /* ARTVCDiffDecoder.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ARTVCDiffDecoder.h; path = include/Ably/ARTVCDiffDecoder.h; sourceTree = "<group>"; };
D798555E23ECCDAF00946BE2 /* ARTVCDiffDecoder.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ARTVCDiffDecoder.h; path = PrivateHeaders/Ably/ARTVCDiffDecoder.h; sourceTree = "<group>"; };
D7AE18C71E5B40C900478D82 /* ARTPushAdmin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ARTPushAdmin.h; path = include/Ably/ARTPushAdmin.h; sourceTree = "<group>"; };
D7AE18C81E5B40C900478D82 /* ARTPushAdmin.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ARTPushAdmin.m; sourceTree = "<group>"; };
D7AE18CC1E5B40FE00478D82 /* ARTPushDeviceRegistrations.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ARTPushDeviceRegistrations.h; path = include/Ably/ARTPushDeviceRegistrations.h; sourceTree = "<group>"; };
Expand Down
2 changes: 2 additions & 0 deletions Source/Ably.modulemap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,5 +110,7 @@ framework module Ably {
header "ARTWebSocketFactory.h"
header "ARTAttachRetryState.h"
header "ARTConnectRetryState.h"
header "ARTVCDiffDecoder.h"
header "ARTDeltaCodec.h"
}
}
0 Source/include/Ably/ARTDeltaCodec.h → Source/PrivateHeaders/Ably/ARTDeltaCodec.h
View file
File renamed without changes.
0 Source/include/Ably/ARTVCDiffDecoder.h → ...ce/PrivateHeaders/Ably/ARTVCDiffDecoder.h
View file
File renamed without changes.
2 changes: 2 additions & 0 deletions Source/include/Ably.modulemap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,5 +108,7 @@ framework module Ably {
header "Ably/ARTWebSocketFactory.h"
header "Ably/ARTAttachRetryState.h"
header "Ably/ARTConnectRetryState.h"
header "Ably/ARTVCDiffDecoder.h"
header "Ably/ARTDeltaCodec.h"
}
}
2 changes: 0 additions & 2 deletions Source/include/Ably/Ably.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,6 @@ FOUNDATION_EXPORT const unsigned char ablyVersionString[];
#import <Ably/ARTDeviceIdentityTokenDetails.h>
#import <Ably/ARTDeviceStorage.h>
#import <Ably/ARTLocalDevice.h>
#import <Ably/ARTVCDiffDecoder.h>
#import <Ably/ARTDeltaCodec.h>
#import <Ably/ARTPendingMessage.h>
#import <Ably/ARTStringifiable.h>
#import <Ably/ARTClientInformation.h>

0 comments on commit 30344e2

Please sign in to comment.