* Fix build warning (ref #133)
* Update GitHub Actions build settings for macos-12 / Xcode 13
* Update tvOS destination for CI build
This commit is contained in:
Brannon Jones 2023-01-30 18:32:05 -07:00 коммит произвёл GitHub
Родитель 35042e4dbe
Коммит d38e2f7f15
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
3 изменённых файлов: 12 добавлений и 15 удалений

20
.github/workflows/analyze-test.yml поставляемый
Просмотреть файл

@ -8,9 +8,9 @@ on:
jobs:
ios-analyze-test:
runs-on: macos-latest
runs-on: macos-12
env:
XC_VERSION: ${{ '12.3' }}
XC_VERSION: ${{ '13.4.1' }}
XC_WORKSPACE: ${{ 'WindowsAzureMessaging.xcworkspace' }}
XC_SCHEME: ${{ 'WindowsAzureMessaging iOS Framework' }}
steps:
@ -28,9 +28,9 @@ jobs:
run: /usr/bin/xcodebuild test -workspace "$XC_WORKSPACE" -scheme "$XC_SCHEME" -destination 'platform=iOS Simulator,name=iPhone 11'
tvos-analyze-test:
runs-on: macos-latest
runs-on: macos-12
env:
XC_VERSION: ${{ '12.3' }}
XC_VERSION: ${{ '13.4.1' }}
XC_WORKSPACE: ${{ 'WindowsAzureMessaging.xcworkspace' }}
XC_SCHEME: ${{ 'WindowsAzureMessaging tvOS Framework' }}
steps:
@ -42,15 +42,15 @@ jobs:
run: "sudo xcode-select -switch /Applications/Xcode_$XC_VERSION.app"
- name: iOS Analyze
run: /usr/bin/xcodebuild analyze -workspace "$XC_WORKSPACE" -scheme "$XC_SCHEME" -destination 'platform=tvOS Simulator,name=Apple TV 4K'
run: /usr/bin/xcodebuild analyze -workspace "$XC_WORKSPACE" -scheme "$XC_SCHEME" -destination 'platform=tvOS Simulator,name=Apple TV 4K (2nd generation)'
- name: iOS Test
run: /usr/bin/xcodebuild test -workspace "$XC_WORKSPACE" -scheme "$XC_SCHEME" -destination 'platform=tvOS Simulator,name=Apple TV 4K'
run: /usr/bin/xcodebuild test -workspace "$XC_WORKSPACE" -scheme "$XC_SCHEME" -destination 'platform=tvOS Simulator,name=Apple TV 4K (2nd generation)'
macos-analyze-test:
runs-on: macos-latest
runs-on: macos-12
env:
XC_VERSION: ${{ '12.3' }}
XC_VERSION: ${{ '13.4.1' }}
XC_WORKSPACE: ${{ 'WindowsAzureMessaging.xcworkspace' }}
XC_SCHEME: ${{ 'WindowsAzureMessaging macOS Framework' }}
steps:
@ -68,9 +68,9 @@ jobs:
run: /usr/bin/xcodebuild test -workspace "$XC_WORKSPACE" -scheme "$XC_SCHEME" -destination 'platform=macOS'
mac-catalyst-analyze-test:
runs-on: macos-latest
runs-on: macos-12
env:
XC_VERSION: ${{ '12.3' }}
XC_VERSION: ${{ '13.4.1' }}
XC_WORKSPACE: ${{ 'WindowsAzureMessaging.xcworkspace' }}
XC_SCHEME: ${{ 'WindowsAzureMessaging iOS Framework' }}
steps:

4
.github/workflows/framework-docs.yml поставляемый
Просмотреть файл

@ -8,9 +8,9 @@ on:
jobs:
build-sdk:
runs-on: macos-latest
runs-on: macos-12
env:
XC_VERSION: ${{ '12.3' }}
XC_VERSION: ${{ '13.4.1' }}
XC_WORKSPACE: ${{ 'WindowsAzureMessaging.xcworkspace' }}
XC_SCHEME: ${{ 'All Frameworks' }}
XC_DOC_SCHEME: ${{ 'All Documentation' }}

Просмотреть файл

@ -236,7 +236,6 @@ static const int defaultTimeToExpireinMins = 20;
}
+ (NSString *)ExtractToken:(NSData *)data {
NSString *expireInSeconds;
NSString *token;
NSString *rawStr = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
NSArray *fields = [rawStr componentsSeparatedByString:@"&"];
@ -253,8 +252,6 @@ static const int defaultTimeToExpireinMins = 20;
NSString *value = [SBNotificationHubHelper urlDecode:[subItems objectAtIndex:1]];
if ([key isEqualToString:@"wrap_access_token"]) {
token = [NSString stringWithFormat:@"WRAP access_token=\"%@\"", value];
} else {
expireInSeconds = value;
}
}