Merge remote-tracking branch 'origin/master' into sumup_main

.codecov.yml

@@ -0,0 +1,2 @@
+ignore:
+  - "UnitTests"

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,19 +1,18 @@
 ---
-name: Bug report
-about: Create a report to help us improve
-
+name: Bug Report
+about: Submit a bug report if something isn't working as expected.
+title: ""
+labels: bug, triage
+assignees: ""
 ---
 
-**Are you filing an issue about iOS 12?**
-You can find preliminary support for iOS 12 in the (ios12beta branch)[https://github.com/openid/AppAuth-iOS/tree/ios12beta] and background information in (the associated pull request)[https://github.com/openid/AppAuth-iOS/pull/246]. Please review these materials before filing iOS 12 issues. Thanks.
-
 **Describe the bug**
 A clear and concise description of what the bug is.
 
 **To Reproduce**
 Steps to reproduce the behavior:
 1. Go to '...'
-2. Click on '....'
+2. Tap on '....'
 3. Scroll down to '....'
 4. See error
 
@@ -23,16 +22,10 @@ A clear and concise description of what you expected to happen.
 **Screenshots**
 If applicable, add screenshots to help explain your problem.
 
-**Desktop (please complete the following information):**
- - OS: [e.g. iOS]
- - Browser [e.g. chrome, safari]
- - Version [e.g. 22]
-
-**Smartphone (please complete the following information):**
- - Device: [e.g. iPhone6]
- - OS: [e.g. iOS8.1]
- - Browser [e.g. stock browser, safari]
- - Version [e.g. 22]
+**Environment**
+- Device: [ e.g. iPhone 13, MacBook Pro, etc ]
+- OS: [ e.g. iOS 15, macOS 11, etc ]
+- Browser: [ e.g. Safari, Chrome, etc ]
 
 **Additional context**
 Add any other context about the problem here.

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1 @@
+blank_issues_enabled: false

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,14 +1,13 @@
 ---
-name: Feature request
-about: Suggest an idea for this project
-
+name: Feature Request
+about: Make a feature request if you have a suggestion for something new.
+title: ""
+labels: enhancement, triage
+assignees: ""
 ---
 
-**Are you filing an issue about iOS 12?**
-You can find preliminary support for iOS 12 in the (ios12beta branch)[https://github.com/openid/AppAuth-iOS/tree/ios12beta] and background information in (the associated pull request)[https://github.com/openid/AppAuth-iOS/pull/246]. Please review these materials before filing iOS 12 issues. Thanks.
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+**Is your feature request related to a problem you're having? Please describe.**
+A clear and concise description of what the problem is.
 
 **Describe the solution you'd like**
 A clear and concise description of what you want to happen.

.github/workflows/tests.yml

@@ -0,0 +1,61 @@
+name: tests
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+  workflow_dispatch:
+
+jobs:
+
+  xcode-project-test:
+    runs-on: macos-12
+    strategy:
+      matrix:
+        flags: [
+          "-scheme AppAuth-iOS -destination 'platform=iOS Simulator,name=iPhone 11,OS=16.2' -sdk 'iphonesimulator16.2'",
+          "-scheme AppAuth-macOS -destination 'platform=macOS,arch=x86_64' -sdk 'macosx13.1'",
+          "-scheme AppAuth_macOS -destination 'platform=macOS,arch=x86_64' -sdk 'macosx13.1'",
+          "-scheme AppAuth-tvOS -destination 'platform=tvOS Simulator,name=Apple TV,OS=16.1' -sdk 'appletvsimulator16.1'",
+          "-scheme AppAuth_tvOS -destination 'platform=tvOS Simulator,name=Apple TV,OS=16.1' -sdk 'appletvsimulator16.1'",
+          "-scheme AppAuthTV -destination 'platform=tvOS Simulator,name=Apple TV,OS=16.1' -sdk 'appletvsimulator16.1'"
+        ]
+    steps:
+    - uses: actions/checkout@v3
+    - name: Run unit test targets
+      run: |
+        xcodebuild test \
+          -project AppAuth.xcodeproj \
+          ${{ matrix.flags }}
+
+  pod-lib-lint:
+    runs-on: macos-12
+    strategy:
+      matrix:
+        flags: [
+          '',
+          '--use-libraries',
+          '--use-static-frameworks'
+        ]
+    steps:
+    - uses: actions/checkout@v3
+    - name: Update Bundler
+      run: bundle update --bundler
+    - name: Install Ruby gems with Bundler
+      run: bundle install
+    - name: Lint podspec using local source
+      run: pod lib lint --verbose ${{ matrix.flags }}
+
+  spm-build-test:
+    runs-on: macos-11
+    steps:
+    - uses: actions/checkout@v2
+    - name: Build unit test target
+      run: swift build
+    - name: Run unit test target
+      run: swift test --enable-code-coverage
+    - name: Upload coverage to Codecov
+      uses: codecov/codecov-action@v2

.travis.yml

@@ -24,6 +24,7 @@ jobs:
         - SCHEME=AppAuth_macOS DESTINATION="'platform=macOS,arch=x86_64'" SDK=macosx10.15
         - SCHEME=AppAuth-tvOS DESTINATION="'platform=tvOS Simulator,name=Apple TV,OS=13.0'" SDK=appletvsimulator13.0
         - SCHEME=AppAuth_tvOS DESTINATION="'platform=tvOS Simulator,name=Apple TV,OS=13.0'" SDK=appletvsimulator13.0
+        - SCHEME=AppAuthTV DESTINATION="'platform=tvOS Simulator,name=Apple TV,OS=13.0'" SDK=appletvsimulator13.0
       before_script:
         - sudo gem install xcpretty
       script:

AppAuth.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "AppAuth"
-  s.version      = "1.4.0"
+  s.version      = "1.7.5"
   s.summary      = "AppAuth for iOS and macOS is a client SDK for communicating with OAuth 2.0 and OpenID Connect providers."
 
   s.description  = <<-DESC
@@ -31,30 +31,51 @@ It follows the OAuth 2.0 for Native Apps best current practice
   #       classes of AppAuth with tokens on watchOS and tvOS, but currently the
   #       library won't help you obtain authorization grants on those platforms.
 
-  s.platforms    = { :ios => "7.0", :osx => "10.9", :watchos => "2.0", :tvos => "9.0" }
+  ios_deployment_target = "9.0"
+  osx_deployment_target = "10.12"
+  s.ios.deployment_target = ios_deployment_target
+  s.osx.deployment_target = osx_deployment_target
+  s.watchos.deployment_target = "2.0"
+  s.tvos.deployment_target = "9.0"
 
   s.source       = { :git => "https://github.com/openid/AppAuth-iOS.git", :tag => s.version }
   s.requires_arc = true
 
+  s.pod_target_xcconfig = {
+    'DEFINES_MODULE' => 'YES',
+  }
+
   # Subspec for the core AppAuth library classes only, suitable for extensions.
   s.subspec 'Core' do |core|
-     core.source_files = "Source/*.{h,m}", "Source/AppAuthCore/*.{h,m}"
-     core.exclude_files = "Source/AppAuth.h"
+     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.source_files = "Source/*.{h,m}", "Source/AppAuthCore/*.{h,m}", "Source/AppAuth/*.{h,m}"
+    externalUserAgent.dependency 'AppAuth/Core'
+
+    externalUserAgent.source_files = "Sources/AppAuth.h", "Sources/AppAuth/*.{h,m}"
 
     # iOS
-    externalUserAgent.ios.source_files      = "Source/AppAuth/iOS/**/*.{h,m}"
-    externalUserAgent.ios.deployment_target = "7.0"
+    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.deployment_target = '10.9'    
+    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-dependent external user agents.
+  s.subspec 'TV' do |tv|
+    tv.source_files = "Sources/AppAuthTV.h", "Sources/AppAuthTV/*.{h,m}"
+    tv.dependency 'AppAuth/Core'
+  end
+
+  s.default_subspecs = 'Core', 'ExternalUserAgent'
 end