diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index c49aeb5..2b1173c 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -17,9 +17,6 @@ jobs: # Only run this action if the PR isn't a draft and it is labled as a `security` PR if: github.event.pull_request.draft == false && contains(github.event.pull_request.labels.*.name, 'security') - env: - XCODE_VERSION: 'Xcode_16.3' - name: Analyze (${{ matrix.language }}) # Runner size impacts CodeQL analysis time. To learn more, please see: # - https://gh.io/recommended-hardware-resources-for-running-codeql @@ -27,7 +24,7 @@ jobs: # - https://gh.io/using-larger-runners (GitHub.com only) # Consider using larger runners or machines with greater resources for possible analysis time improvements. - runs-on: macos-15 + runs-on: macos-26 timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }} permissions: # required for all workflows @@ -50,8 +47,6 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v4 - - name: Select Xcode - run: sudo xcode-select -s "/Applications/$XCODE_VERSION.app" - name: Initialize CodeQL uses: github/codeql-action/init@v3 with: diff --git a/.github/workflows/xcodebuild.yml b/.github/workflows/xcodebuild.yml index cbe81f3..32c7df3 100644 --- a/.github/workflows/xcodebuild.yml +++ b/.github/workflows/xcodebuild.yml @@ -13,15 +13,10 @@ jobs: build: - env: - XCODE_VERSION: 'Xcode_16.4' - - runs-on: macos-15 + runs-on: macos-26 steps: - uses: actions/checkout@v4 - - name: Select Xcode - run: sudo xcode-select -s "/Applications/$XCODE_VERSION.app" - name: Install SwiftLint run: brew install swiftlint - name: Lint diff --git a/OAuthSample.xcodeproj/project.pbxproj b/OAuthSample.xcodeproj/project.pbxproj index e4245ae..2b27bb3 100644 --- a/OAuthSample.xcodeproj/project.pbxproj +++ b/OAuthSample.xcodeproj/project.pbxproj @@ -202,7 +202,7 @@ attributes = { BuildIndependentTargetsInParallel = 1; LastSwiftUpdateCheck = 1640; - LastUpgradeCheck = 1630; + LastUpgradeCheck = 2600; TargetAttributes = { CE1FE0B52BF66AC400078EB1 = { CreatedOnToolsVersion = 15.3; @@ -345,6 +345,7 @@ MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; + STRING_CATALOG_GENERATE_SYMBOLS = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; }; @@ -400,6 +401,7 @@ LOCALIZATION_PREFERS_STRING_CATALOGS = YES; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; + STRING_CATALOG_GENERATE_SYMBOLS = YES; SWIFT_COMPILATION_MODE = wholemodule; }; name = Release; @@ -414,7 +416,11 @@ CURRENT_PROJECT_VERSION = 1; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_ASSET_PATHS = "\"OAuthSample/Preview Content\""; + ENABLE_APP_SANDBOX = YES; + ENABLE_INCOMING_NETWORK_CONNECTIONS = YES; + ENABLE_OUTGOING_NETWORK_CONNECTIONS = YES; ENABLE_PREVIEWS = YES; + ENABLE_USER_SELECTED_FILES = readonly; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = OAuthSample/Info.plist; "INFOPLIST_KEY_UIApplicationSceneManifest_Generation[sdk=iphoneos*]" = YES; @@ -455,7 +461,11 @@ CURRENT_PROJECT_VERSION = 1; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_ASSET_PATHS = "\"OAuthSample/Preview Content\""; + ENABLE_APP_SANDBOX = YES; + ENABLE_INCOMING_NETWORK_CONNECTIONS = YES; + ENABLE_OUTGOING_NETWORK_CONNECTIONS = YES; ENABLE_PREVIEWS = YES; + ENABLE_USER_SELECTED_FILES = readonly; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = OAuthSample/Info.plist; "INFOPLIST_KEY_UIApplicationSceneManifest_Generation[sdk=iphoneos*]" = YES; diff --git a/OAuthSample/OAuthSample.entitlements b/OAuthSample/OAuthSample.entitlements index 40b639e..0c67376 100644 --- a/OAuthSample/OAuthSample.entitlements +++ b/OAuthSample/OAuthSample.entitlements @@ -1,14 +1,5 @@ - - com.apple.security.app-sandbox - - com.apple.security.files.user-selected.read-only - - com.apple.security.network.client - - com.apple.security.network.server - - + diff --git a/README.md b/README.md index a6e3d55..9d569e7 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ ![Build](https://github.com/codefiesta/OAuthSample/actions/workflows/xcodebuild.yml/badge.svg) -![Xcode 16.4+](https://img.shields.io/badge/Xcode-16.4%2B-gold.svg) +![Xcode 26.0+](https://img.shields.io/badge/Xcode-26.0%2B-gold.svg) ![Swift 6.1+](https://img.shields.io/badge/Swift-6.1%2B-tomato.svg) ![iOS 18.0+](https://img.shields.io/badge/iOS-18.0%2B-crimson.svg) ![macOS 15.0+](https://img.shields.io/badge/macOS-15.0%2B-skyblue.svg)