Skip to content
This repository has been archived by the owner on Sep 18, 2024. It is now read-only.

Fork sync 27 mar2024 #4

Open
wants to merge 14 commits into
base: master
Choose a base branch
from
Open
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
19 changes: 11 additions & 8 deletions AppAuth.podspec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Pod::Spec.new do |s|

s.name = "AppAuth"
s.version = "1.6.2"
s.version = "1.7.3"
s.summary = "AppAuth for iOS and macOS is a client SDK for communicating with OAuth 2.0 and OpenID Connect providers."

s.description = <<-DESC
Expand Down Expand Up @@ -43,30 +43,33 @@ It follows the OAuth 2.0 for Native Apps best current practice

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

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

externalUserAgent.source_files = "Source/AppAuth.h", "Source/AppAuth/*.{h,m}"
externalUserAgent.source_files = "Sources/AppAuth.h", "Sources/AppAuth/*.{h,m}"

# iOS
externalUserAgent.ios.source_files = "Source/AppAuth/iOS/**/*.{h,m}"
externalUserAgent.ios.source_files = "Sources/AppAuth/iOS/**/*.{h,m}"
externalUserAgent.ios.deployment_target = ios_deployment_target
externalUserAgent.ios.frameworks = "SafariServices"
externalUserAgent.ios.weak_frameworks = "AuthenticationServices"

# macOS
externalUserAgent.osx.source_files = "Source/AppAuth/macOS/**/*.{h,m}"
externalUserAgent.osx.source_files = "Sources/AppAuth/macOS/**/*.{h,m}"
externalUserAgent.osx.deployment_target = osx_deployment_target
externalUserAgent.osx.weak_frameworks = "AuthenticationServices"
end

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

Expand Down
68 changes: 53 additions & 15 deletions AppAuth.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -546,6 +546,12 @@
60140F801DE4344200DA0DC3 /* OIDRegistrationResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 60140F7F1DE4344200DA0DC3 /* OIDRegistrationResponse.m */; };
60140F831DE43BAF00DA0DC3 /* OIDRegistrationRequestTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 60140F821DE43BAF00DA0DC3 /* OIDRegistrationRequestTests.m */; };
60140F861DE43CC700DA0DC3 /* OIDRegistrationResponseTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 60140F851DE43CC700DA0DC3 /* OIDRegistrationResponseTests.m */; };
73F574342B7C42690023FFF0 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 73F574332B7C42690023FFF0 /* PrivacyInfo.xcprivacy */; };
73F574352B7C42690023FFF0 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 73F574332B7C42690023FFF0 /* PrivacyInfo.xcprivacy */; };
73F574362B7C42690023FFF0 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 73F574332B7C42690023FFF0 /* PrivacyInfo.xcprivacy */; };
73F574372B7C42690023FFF0 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 73F574332B7C42690023FFF0 /* PrivacyInfo.xcprivacy */; };
73F574382B7C42690023FFF0 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 73F574332B7C42690023FFF0 /* PrivacyInfo.xcprivacy */; };
73F574392B7C42690023FFF0 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 73F574332B7C42690023FFF0 /* PrivacyInfo.xcprivacy */; };
A5EEF29720D821120044F470 /* OIDTokenUtilitiesTests.m in Sources */ = {isa = PBXBuildFile; fileRef = A5EEF1FD20CF07760044F470 /* OIDTokenUtilitiesTests.m */; };
A5EEF29820D8211A0044F470 /* OIDTokenUtilitiesTests.m in Sources */ = {isa = PBXBuildFile; fileRef = A5EEF1FD20CF07760044F470 /* OIDTokenUtilitiesTests.m */; };
A5EEF29920D8211B0044F470 /* OIDTokenUtilitiesTests.m in Sources */ = {isa = PBXBuildFile; fileRef = A5EEF1FD20CF07760044F470 /* OIDTokenUtilitiesTests.m */; };
Expand Down Expand Up @@ -827,6 +833,7 @@
60140F821DE43BAF00DA0DC3 /* OIDRegistrationRequestTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OIDRegistrationRequestTests.m; sourceTree = "<group>"; };
60140F841DE43C8C00DA0DC3 /* OIDRegistrationResponseTests.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OIDRegistrationResponseTests.h; sourceTree = "<group>"; };
60140F851DE43CC700DA0DC3 /* OIDRegistrationResponseTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OIDRegistrationResponseTests.m; sourceTree = "<group>"; };
73F574332B7C42690023FFF0 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
A5EEF1FD20CF07760044F470 /* OIDTokenUtilitiesTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OIDTokenUtilitiesTests.m; sourceTree = "<group>"; };
A6CEB1172007E384009D492A /* OIDEndSessionRequestTests.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OIDEndSessionRequestTests.h; sourceTree = "<group>"; };
A6CEB1182007E384009D492A /* OIDEndSessionRequestTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OIDEndSessionRequestTests.m; sourceTree = "<group>"; };
Expand Down Expand Up @@ -993,6 +1000,7 @@
2D47AAD7249A86E30059B5A4 /* AppAuthTV */ = {
isa = PBXGroup;
children = (
7322C49B2BA20BFA00DF9B2F /* Resources */,
2D47AAD9249A87010059B5A4 /* OIDTVAuthorizationRequest.h */,
2D47AADD249A87010059B5A4 /* OIDTVAuthorizationRequest.m */,
2D47AADC249A87010059B5A4 /* OIDTVAuthorizationResponse.h */,
Expand Down Expand Up @@ -1050,7 +1058,7 @@
children = (
341742291C5D84D0000EF209 /* Frameworks */,
341741FB1C5D82D3000EF209 /* UnitTests */,
341741AE1C5D8243000EF209 /* Source */,
341741AE1C5D8243000EF209 /* Sources */,
340E737D1C5D819B0076B1F6 /* Products */,
);
indentWidth = 2;
Expand Down Expand Up @@ -1082,7 +1090,7 @@
name = Products;
sourceTree = "<group>";
};
341741AE1C5D8243000EF209 /* Source */ = {
341741AE1C5D8243000EF209 /* Sources */ = {
isa = PBXGroup;
children = (
348970992178F40600ABEED4 /* CoreFramework */,
Expand All @@ -1095,7 +1103,7 @@
3489709E21791B0C00ABEED4 /* AppAuthCore.h */,
2D47AADB249A87010059B5A4 /* AppAuthTV.h */,
);
path = Source;
path = Sources;
sourceTree = "<group>";
};
341741FB1C5D82D3000EF209 /* UnitTests */ = {
Expand Down Expand Up @@ -1176,9 +1184,32 @@
path = LoopbackHTTPServer;
sourceTree = "<group>";
};
7322C4992BA2095100DF9B2F /* Resources */ = {
isa = PBXGroup;
children = (
73F574332B7C42690023FFF0 /* PrivacyInfo.xcprivacy */,
);
path = Resources;
sourceTree = "<group>";
};
7322C49A2BA20BEF00DF9B2F /* Resources */ = {
isa = PBXGroup;
children = (
);
path = Resources;
sourceTree = "<group>";
};
7322C49B2BA20BFA00DF9B2F /* Resources */ = {
isa = PBXGroup;
children = (
);
path = Resources;
sourceTree = "<group>";
};
8A9B9D5E24561EC40055353E /* AppAuthCore */ = {
isa = PBXGroup;
children = (
7322C4992BA2095100DF9B2F /* Resources */,
341741B41C5D8243000EF209 /* OIDAuthorizationRequest.h */,
341741B51C5D8243000EF209 /* OIDAuthorizationRequest.m */,
341741B61C5D8243000EF209 /* OIDAuthorizationResponse.h */,
Expand Down Expand Up @@ -1240,6 +1271,7 @@
8A9B9D632456227D0055353E /* AppAuth */ = {
isa = PBXGroup;
children = (
7322C49A2BA20BEF00DF9B2F /* Resources */,
340DAE241D581FE700EC285B /* macOS */,
F6F60FAF1D2BFEF000325CB3 /* iOS */,
);
Expand Down Expand Up @@ -1937,6 +1969,7 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
73F574392B7C42690023FFF0 /* PrivacyInfo.xcprivacy in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -1965,13 +1998,15 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
73F574382B7C42690023FFF0 /* PrivacyInfo.xcprivacy in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
343AAA521E83463400F9D36E /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
73F574342B7C42690023FFF0 /* PrivacyInfo.xcprivacy in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -1986,13 +2021,15 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
73F574352B7C42690023FFF0 /* PrivacyInfo.xcprivacy in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
343AAAA41E83489A00F9D36E /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
73F574362B7C42690023FFF0 /* PrivacyInfo.xcprivacy in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -2007,6 +2044,7 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
73F574372B7C42690023FFF0 /* PrivacyInfo.xcprivacy in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -2654,7 +2692,7 @@
"DEBUG=1",
"$(inherited)",
);
INFOPLIST_FILE = "$(SRCROOT)/Source/TVFramework/Info.plist";
INFOPLIST_FILE = Sources/TVFramework/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
Expand Down Expand Up @@ -2686,7 +2724,7 @@
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = "$(SRCROOT)/Source/TVFramework/Info.plist";
INFOPLIST_FILE = Sources/TVFramework/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MTL_FAST_MATH = YES;
Expand Down Expand Up @@ -2998,7 +3036,7 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = Source/CoreFramework/Info.plist;
INFOPLIST_FILE = Sources/CoreFramework/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
Expand All @@ -3024,7 +3062,7 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = Source/CoreFramework/Info.plist;
INFOPLIST_FILE = Sources/CoreFramework/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
Expand All @@ -3049,7 +3087,7 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = Source/Framework/Info.plist;
INFOPLIST_FILE = Sources/Framework/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
Expand All @@ -3074,7 +3112,7 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = Source/Framework/Info.plist;
INFOPLIST_FILE = Sources/Framework/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
Expand Down Expand Up @@ -3128,7 +3166,7 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = Source/Framework/Info.plist;
INFOPLIST_FILE = Sources/Framework/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "net.openid.AppAuth-watchOS";
Expand All @@ -3154,7 +3192,7 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = Source/Framework/Info.plist;
INFOPLIST_FILE = Sources/Framework/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "net.openid.AppAuth-watchOS";
Expand All @@ -3179,7 +3217,7 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = Source/Framework/Info.plist;
INFOPLIST_FILE = Sources/Framework/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "net.openid.AppAuth-tvOS";
Expand All @@ -3204,7 +3242,7 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = Source/Framework/Info.plist;
INFOPLIST_FILE = Sources/Framework/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "net.openid.AppAuth-tvOS";
Expand Down Expand Up @@ -3261,7 +3299,7 @@
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_VERSION = A;
INFOPLIST_FILE = Source/Framework/Info.plist;
INFOPLIST_FILE = Sources/Framework/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "net.openid.AppAuth-macOS";
Expand All @@ -3286,7 +3324,7 @@
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_VERSION = A;
INFOPLIST_FILE = Source/Framework/Info.plist;
INFOPLIST_FILE = Sources/Framework/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "net.openid.AppAuth-macOS";
Expand Down
22 changes: 9 additions & 13 deletions AppAuth.xcodeproj/xcshareddata/xcschemes/AppAuth-iOS.xcscheme
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,15 @@
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "340E737B1C5D819B0076B1F6"
BuildableName = "libAppAuth-iOS.a"
BlueprintName = "AppAuth-iOS"
ReferencedContainer = "container:AppAuth.xcodeproj">
</BuildableReference>
</MacroExpansion>
<Testables>
<TestableReference
skipped = "NO">
Expand All @@ -39,17 +48,6 @@
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "340E737B1C5D819B0076B1F6"
BuildableName = "libAppAuth-iOS.a"
BlueprintName = "AppAuth-iOS"
ReferencedContainer = "container:AppAuth.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
Expand All @@ -70,8 +68,6 @@
ReferencedContainer = "container:AppAuth.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
Expand Down
22 changes: 9 additions & 13 deletions AppAuth.xcodeproj/xcshareddata/xcschemes/AppAuth-macOS.xcscheme
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,15 @@
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "340DAE4D1D58216A00EC285B"
BuildableName = "libAppAuth-macOS.a"
BlueprintName = "AppAuth-macOS"
ReferencedContainer = "container:AppAuth.xcodeproj">
</BuildableReference>
</MacroExpansion>
<Testables>
<TestableReference
skipped = "NO">
Expand All @@ -39,17 +48,6 @@
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "340DAE4D1D58216A00EC285B"
BuildableName = "libAppAuth-macOS.a"
BlueprintName = "AppAuth-macOS"
ReferencedContainer = "container:AppAuth.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
Expand All @@ -70,8 +68,6 @@
ReferencedContainer = "container:AppAuth.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
Expand Down
Loading