Skip to content

Commit 5563d06

Browse files
mdmathiasmdmathias
authored
Fix missing manifest in bundle using SPM (#833)
1 parent 269c905 commit 5563d06

File tree

119 files changed

+139
-83
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

119 files changed

+139
-83
lines changed

‎AppAuth.podspec‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,33 +43,33 @@ It follows the OAuth 2.0 for Native Apps best current practice
4343

4444
# Subspec for the core AppAuth library classes only, suitable for extensions.
4545
s.subspec 'Core' do |core|
46-
core.source_files = "Source/AppAuthCore.h", "Source/AppAuthCore/*.{h,m}"
46+
core.source_files = "Sources/AppAuthCore.h", "Sources/AppAuthCore/*.{h,m}"
4747
core.resource_bundles = {
48-
"AppAuthCore_Privacy" => ["PrivacyInfo.xcprivacy"]
48+
"AppAuthCore_Privacy" => ["Sources/AppAuthCore/Resources/PrivacyInfo.xcprivacy"]
4949
}
5050
end
5151

5252
# Subspec for the full AppAuth library, including platform-dependent external user agents.
5353
s.subspec 'ExternalUserAgent' do |externalUserAgent|
5454
externalUserAgent.dependency 'AppAuth/Core'
5555

56-
externalUserAgent.source_files = "Source/AppAuth.h", "Source/AppAuth/*.{h,m}"
56+
externalUserAgent.source_files = "Sources/AppAuth.h", "Sources/AppAuth/*.{h,m}"
5757

5858
# iOS
59-
externalUserAgent.ios.source_files = "Source/AppAuth/iOS/**/*.{h,m}"
59+
externalUserAgent.ios.source_files = "Sources/AppAuth/iOS/**/*.{h,m}"
6060
externalUserAgent.ios.deployment_target = ios_deployment_target
6161
externalUserAgent.ios.frameworks = "SafariServices"
6262
externalUserAgent.ios.weak_frameworks = "AuthenticationServices"
6363

6464
# macOS
65-
externalUserAgent.osx.source_files = "Source/AppAuth/macOS/**/*.{h,m}"
65+
externalUserAgent.osx.source_files = "Sources/AppAuth/macOS/**/*.{h,m}"
6666
externalUserAgent.osx.deployment_target = osx_deployment_target
6767
externalUserAgent.osx.weak_frameworks = "AuthenticationServices"
6868
end
6969

7070
# Subspec for the full AppAuth library, including platform-dependent external user agents.
7171
s.subspec 'TV' do |tv|
72-
tv.source_files = "Source/AppAuthTV.h", "Source/AppAuthTV/*.{h,m}"
72+
tv.source_files = "Sources/AppAuthTV.h", "Sources/AppAuthTV/*.{h,m}"
7373
tv.dependency 'AppAuth/Core'
7474
end
7575

‎AppAuth.xcodeproj/project.pbxproj‎

Lines changed: 40 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1000,6 +1000,7 @@
10001000
2D47AAD7249A86E30059B5A4 /* AppAuthTV */ = {
10011001
isa = PBXGroup;
10021002
children = (
1003+
7322C49B2BA20BFA00DF9B2F /* Resources */,
10031004
2D47AAD9249A87010059B5A4 /* OIDTVAuthorizationRequest.h */,
10041005
2D47AADD249A87010059B5A4 /* OIDTVAuthorizationRequest.m */,
10051006
2D47AADC249A87010059B5A4 /* OIDTVAuthorizationResponse.h */,
@@ -1055,10 +1056,9 @@
10551056
340E73731C5D819B0076B1F6 = {
10561057
isa = PBXGroup;
10571058
children = (
1058-
73F574332B7C42690023FFF0 /* PrivacyInfo.xcprivacy */,
10591059
341742291C5D84D0000EF209 /* Frameworks */,
10601060
341741FB1C5D82D3000EF209 /* UnitTests */,
1061-
341741AE1C5D8243000EF209 /* Source */,
1061+
341741AE1C5D8243000EF209 /* Sources */,
10621062
340E737D1C5D819B0076B1F6 /* Products */,
10631063
);
10641064
indentWidth = 2;
@@ -1090,7 +1090,7 @@
10901090
name = Products;
10911091
sourceTree = "<group>";
10921092
};
1093-
341741AE1C5D8243000EF209 /* Source */ = {
1093+
341741AE1C5D8243000EF209 /* Sources */ = {
10941094
isa = PBXGroup;
10951095
children = (
10961096
348970992178F40600ABEED4 /* CoreFramework */,
@@ -1103,7 +1103,7 @@
11031103
3489709E21791B0C00ABEED4 /* AppAuthCore.h */,
11041104
2D47AADB249A87010059B5A4 /* AppAuthTV.h */,
11051105
);
1106-
path = Source;
1106+
path = Sources;
11071107
sourceTree = "<group>";
11081108
};
11091109
341741FB1C5D82D3000EF209 /* UnitTests */ = {
@@ -1184,9 +1184,32 @@
11841184
path = LoopbackHTTPServer;
11851185
sourceTree = "<group>";
11861186
};
1187+
7322C4992BA2095100DF9B2F /* Resources */ = {
1188+
isa = PBXGroup;
1189+
children = (
1190+
73F574332B7C42690023FFF0 /* PrivacyInfo.xcprivacy */,
1191+
);
1192+
path = Resources;
1193+
sourceTree = "<group>";
1194+
};
1195+
7322C49A2BA20BEF00DF9B2F /* Resources */ = {
1196+
isa = PBXGroup;
1197+
children = (
1198+
);
1199+
path = Resources;
1200+
sourceTree = "<group>";
1201+
};
1202+
7322C49B2BA20BFA00DF9B2F /* Resources */ = {
1203+
isa = PBXGroup;
1204+
children = (
1205+
);
1206+
path = Resources;
1207+
sourceTree = "<group>";
1208+
};
11871209
8A9B9D5E24561EC40055353E /* AppAuthCore */ = {
11881210
isa = PBXGroup;
11891211
children = (
1212+
7322C4992BA2095100DF9B2F /* Resources */,
11901213
341741B41C5D8243000EF209 /* OIDAuthorizationRequest.h */,
11911214
341741B51C5D8243000EF209 /* OIDAuthorizationRequest.m */,
11921215
341741B61C5D8243000EF209 /* OIDAuthorizationResponse.h */,
@@ -1248,6 +1271,7 @@
12481271
8A9B9D632456227D0055353E /* AppAuth */ = {
12491272
isa = PBXGroup;
12501273
children = (
1274+
7322C49A2BA20BEF00DF9B2F /* Resources */,
12511275
340DAE241D581FE700EC285B /* macOS */,
12521276
F6F60FAF1D2BFEF000325CB3 /* iOS */,
12531277
);
@@ -2668,7 +2692,7 @@
26682692
"DEBUG=1",
26692693
"$(inherited)",
26702694
);
2671-
INFOPLIST_FILE = "$(SRCROOT)/Source/TVFramework/Info.plist";
2695+
INFOPLIST_FILE = Sources/TVFramework/Info.plist;
26722696
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
26732697
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
26742698
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
@@ -2700,7 +2724,7 @@
27002724
DYLIB_CURRENT_VERSION = 1;
27012725
DYLIB_INSTALL_NAME_BASE = "@rpath";
27022726
GCC_C_LANGUAGE_STANDARD = gnu11;
2703-
INFOPLIST_FILE = "$(SRCROOT)/Source/TVFramework/Info.plist";
2727+
INFOPLIST_FILE = Sources/TVFramework/Info.plist;
27042728
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
27052729
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
27062730
MTL_FAST_MATH = YES;
@@ -3012,7 +3036,7 @@
30123036
DYLIB_COMPATIBILITY_VERSION = 1;
30133037
DYLIB_CURRENT_VERSION = 1;
30143038
DYLIB_INSTALL_NAME_BASE = "@rpath";
3015-
INFOPLIST_FILE = Source/CoreFramework/Info.plist;
3039+
INFOPLIST_FILE = Sources/CoreFramework/Info.plist;
30163040
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
30173041
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
30183042
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
@@ -3038,7 +3062,7 @@
30383062
DYLIB_COMPATIBILITY_VERSION = 1;
30393063
DYLIB_CURRENT_VERSION = 1;
30403064
DYLIB_INSTALL_NAME_BASE = "@rpath";
3041-
INFOPLIST_FILE = Source/CoreFramework/Info.plist;
3065+
INFOPLIST_FILE = Sources/CoreFramework/Info.plist;
30423066
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
30433067
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
30443068
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
@@ -3063,7 +3087,7 @@
30633087
DYLIB_COMPATIBILITY_VERSION = 1;
30643088
DYLIB_CURRENT_VERSION = 1;
30653089
DYLIB_INSTALL_NAME_BASE = "@rpath";
3066-
INFOPLIST_FILE = Source/Framework/Info.plist;
3090+
INFOPLIST_FILE = Sources/Framework/Info.plist;
30673091
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
30683092
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
30693093
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
@@ -3088,7 +3112,7 @@
30883112
DYLIB_COMPATIBILITY_VERSION = 1;
30893113
DYLIB_CURRENT_VERSION = 1;
30903114
DYLIB_INSTALL_NAME_BASE = "@rpath";
3091-
INFOPLIST_FILE = Source/Framework/Info.plist;
3115+
INFOPLIST_FILE = Sources/Framework/Info.plist;
30923116
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
30933117
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
30943118
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
@@ -3142,7 +3166,7 @@
31423166
DYLIB_COMPATIBILITY_VERSION = 1;
31433167
DYLIB_CURRENT_VERSION = 1;
31443168
DYLIB_INSTALL_NAME_BASE = "@rpath";
3145-
INFOPLIST_FILE = Source/Framework/Info.plist;
3169+
INFOPLIST_FILE = Sources/Framework/Info.plist;
31463170
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
31473171
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
31483172
PRODUCT_BUNDLE_IDENTIFIER = "net.openid.AppAuth-watchOS";
@@ -3168,7 +3192,7 @@
31683192
DYLIB_COMPATIBILITY_VERSION = 1;
31693193
DYLIB_CURRENT_VERSION = 1;
31703194
DYLIB_INSTALL_NAME_BASE = "@rpath";
3171-
INFOPLIST_FILE = Source/Framework/Info.plist;
3195+
INFOPLIST_FILE = Sources/Framework/Info.plist;
31723196
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
31733197
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
31743198
PRODUCT_BUNDLE_IDENTIFIER = "net.openid.AppAuth-watchOS";
@@ -3193,7 +3217,7 @@
31933217
DYLIB_COMPATIBILITY_VERSION = 1;
31943218
DYLIB_CURRENT_VERSION = 1;
31953219
DYLIB_INSTALL_NAME_BASE = "@rpath";
3196-
INFOPLIST_FILE = Source/Framework/Info.plist;
3220+
INFOPLIST_FILE = Sources/Framework/Info.plist;
31973221
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
31983222
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
31993223
PRODUCT_BUNDLE_IDENTIFIER = "net.openid.AppAuth-tvOS";
@@ -3218,7 +3242,7 @@
32183242
DYLIB_COMPATIBILITY_VERSION = 1;
32193243
DYLIB_CURRENT_VERSION = 1;
32203244
DYLIB_INSTALL_NAME_BASE = "@rpath";
3221-
INFOPLIST_FILE = Source/Framework/Info.plist;
3245+
INFOPLIST_FILE = Sources/Framework/Info.plist;
32223246
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
32233247
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
32243248
PRODUCT_BUNDLE_IDENTIFIER = "net.openid.AppAuth-tvOS";
@@ -3275,7 +3299,7 @@
32753299
DYLIB_CURRENT_VERSION = 1;
32763300
DYLIB_INSTALL_NAME_BASE = "@rpath";
32773301
FRAMEWORK_VERSION = A;
3278-
INFOPLIST_FILE = Source/Framework/Info.plist;
3302+
INFOPLIST_FILE = Sources/Framework/Info.plist;
32793303
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
32803304
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
32813305
PRODUCT_BUNDLE_IDENTIFIER = "net.openid.AppAuth-macOS";
@@ -3300,7 +3324,7 @@
33003324
DYLIB_CURRENT_VERSION = 1;
33013325
DYLIB_INSTALL_NAME_BASE = "@rpath";
33023326
FRAMEWORK_VERSION = A;
3303-
INFOPLIST_FILE = Source/Framework/Info.plist;
3327+
INFOPLIST_FILE = Sources/Framework/Info.plist;
33043328
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
33053329
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
33063330
PRODUCT_BUNDLE_IDENTIFIER = "net.openid.AppAuth-macOS";

‎Package.swift‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,16 @@ let package = Package(
4343
targets: [
4444
.target(
4545
name: "AppAuthCore",
46-
path: "Source/AppAuthCore",
47-
resources: [.copy("../../PrivacyInfo.xcprivacy")],
46+
path: "Sources/AppAuthCore",
47+
resources: [.copy("Resources/PrivacyInfo.xcprivacy")],
4848
publicHeadersPath: ""
4949
),
5050
.target(
5151
name: "AppAuth",
5252
dependencies: ["AppAuthCore"],
53-
path: "Source/AppAuth",
53+
path: "Sources/AppAuth",
5454
sources: ["iOS", "macOS"],
55-
resources: [.copy("../../PrivacyInfo.xcprivacy")],
55+
resources: [.copy("Resources/PrivacyInfo.xcprivacy")],
5656
publicHeadersPath: "",
5757
cSettings: [
5858
.headerSearchPath("iOS"),
@@ -63,8 +63,8 @@ let package = Package(
6363
.target(
6464
name: "AppAuthTV",
6565
dependencies: ["AppAuthCore"],
66-
path: "Source/AppAuthTV",
67-
resources: [.copy("../../PrivacyInfo.xcprivacy")],
66+
path: "Sources/AppAuthTV",
67+
resources: [.copy("Resources/PrivacyInfo.xcprivacy")],
6868
publicHeadersPath: ""
6969
),
7070
.testTarget(

‎Source/AppAuth.h‎ renamed to ‎Sources/AppAuth.h‎

File renamed without changes.

‎PrivacyInfo.xcprivacy‎ renamed to ‎Sources/AppAuth/Resources/PrivacyInfo.xcprivacy‎

File renamed without changes.

‎Source/AppAuth/iOS/OIDAuthState+IOS.h‎ renamed to ‎Sources/AppAuth/iOS/OIDAuthState+IOS.h‎

File renamed without changes.

‎Source/AppAuth/iOS/OIDAuthState+IOS.m‎ renamed to ‎Sources/AppAuth/iOS/OIDAuthState+IOS.m‎

File renamed without changes.

‎Source/AppAuth/iOS/OIDAuthorizationService+IOS.h‎ renamed to ‎Sources/AppAuth/iOS/OIDAuthorizationService+IOS.h‎

File renamed without changes.

‎Source/AppAuth/iOS/OIDAuthorizationService+IOS.m‎ renamed to ‎Sources/AppAuth/iOS/OIDAuthorizationService+IOS.m‎

File renamed without changes.

‎Source/AppAuth/iOS/OIDExternalUserAgentCatalyst.h‎ renamed to ‎Sources/AppAuth/iOS/OIDExternalUserAgentCatalyst.h‎

File renamed without changes.

0 commit comments

Comments
 (0)