Merge branch 'master' of https://github.com/openid/AppAuth-iOS

* 'master' of https://github.com/openid/AppAuth-iOS: (22 commits) Update issue templates Bump cocoapods-downloader from 1.5.1 to 1.6.3 (openid#700) Update issue templates (openid#699) Remove empty AppAuthEnterpriseUserAgent folder from Xcode project. (openid#697) Fix changelog typo. Prepare for 1.5.0 release (openid#692) Rollback the EnterpriseUserAgent target. (openid#693) Run tests against the Xcode project (openid#696) Run pod lib lint tests (openid#695) Have swift test generate code coverage. Reenable Codecov. Update tests badge. Set min iOS version to 9 for SPM (openid#690) Document the design principles behind AppAuth Add ASWebAuthenticationSession support in OIDExternalUserAgentMac. (openid#675) Use TARGET_OS_OSX for macOS rather than TARGET_OS_MAC (openid#681) Fix up type in designated initializer (openid#662) Remove unmatched diagnostic pop (openid#641) Fix branch name Update init unavailable doc on OIDServiceDiscovery (openid#640) ... # Conflicts: # AppAuth.xcodeproj/project.pbxproj # AppAuth.xcodeproj/xcshareddata/xcschemes/AppAuthEnterpriseUserAgent.xcscheme # Package.swift
eigentone11 · Jun 15, 2022 · 156376f · 156376f
2 parents 9fa224f + 8582608
commit 156376f
Show file tree

Hide file tree

Showing 30 changed files with 515 additions and 492 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,12 +1,12 @@
 ---
 name: Bug report
-about: Create a report to help us improve
+about: Create a bug report to help us improve
+title: ''
+labels: ''
+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.
 
@@ -23,16 +23,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.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,12 +1,12 @@
 ---
 name: Feature request
 about: Suggest an idea for this project
+title: ''
+labels: ''
+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 [...]
 

diff --git a/.github/workflows/tests.yml b/.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-latest
+    strategy:
+      matrix:
+        flags: [
+          "-scheme AppAuth-iOS -destination 'platform=iOS Simulator,name=iPhone 11,OS=15.2' -sdk 'iphonesimulator15.2'",
+          "-scheme AppAuth-macOS -destination 'platform=macOS,arch=x86_64' -sdk 'macosx12.1'",
+          "-scheme AppAuth_macOS -destination 'platform=macOS,arch=x86_64' -sdk 'macosx12.1'",
+          "-scheme AppAuth-tvOS -destination 'platform=tvOS Simulator,name=Apple TV,OS=15.2' -sdk 'appletvsimulator15.2'",
+          "-scheme AppAuth_tvOS -destination 'platform=tvOS Simulator,name=Apple TV,OS=15.2' -sdk 'appletvsimulator15.2'",
+          "-scheme AppAuthTV -destination 'platform=tvOS Simulator,name=Apple TV,OS=15.2' -sdk 'appletvsimulator15.2'"
+        ]
+    steps:
+    - uses: actions/checkout@v2
+    - name: Run unit test targets
+      run: |
+        xcodebuild test \
+          -project AppAuth.xcodeproj \
+          ${{ matrix.flags }}
+
+  pod-lib-lint:
+    runs-on: macOS-latest
+    strategy:
+      matrix:
+        flags: [
+          '',
+          '--use-libraries',
+          '--use-static-frameworks'
+        ]
+    steps:
+    - uses: actions/checkout@v2
+    - 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-latest
+    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
diff --git a/AppAuth.podspec b/AppAuth.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "AppAuth"
-  s.version      = "1.4.0"
+  s.version      = "1.5.0"
   s.summary      = "AppAuth for iOS and macOS is a client SDK for communicating with OAuth 2.0 and OpenID Connect providers."
 
   s.description  = <<-DESC
@@ -57,17 +57,11 @@ It follows the OAuth 2.0 for Native Apps best current practice
     externalUserAgent.ios.weak_frameworks   = "AuthenticationServices"
 
     # macOS
-    externalUserAgent.osx.source_files = "Source/AppAuth/macOS/**/*.{h,m}"
+    externalUserAgent.osx.source_files      = "Source/AppAuth/macOS/**/*.{h,m}"
     externalUserAgent.osx.deployment_target = '10.9'
+    externalUserAgent.osx.weak_frameworks   = "AuthenticationServices"
   end
 
-  s.subspec 'EnterpriseUserAgent' do |enterpriseUserAgent|
-    enterpriseUserAgent.dependency 'AppAuth/Core'
-
-    enterpriseUserAgent.ios.source_files = "Source/AppAuthEnterpriseUserAgent.h", "Source/AppAuthEnterpriseUserAgent/iOS/**/*.{h,m}"
-    enterpriseUserAgent.ios.deployment_target = "7.0"
-  end
-
   # Subspec for the full AppAuth library, including platform-dependant external user agents.
   s.subspec 'TV' do |tv|
     tv.source_files = "Source/AppAuthTV.h", "Source/AppAuthTV/*.{h,m}"