Skip to content

Commit

Permalink
Merge branch 'develop' into release/1.1.x
Browse files Browse the repository at this point in the history
  • Loading branch information
kober32 committed Oct 5, 2022
2 parents 98a73b9 + 756039f commit 96e4d1e
Show file tree
Hide file tree
Showing 9 changed files with 36 additions and 20 deletions.
6 changes: 5 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,13 @@ on:
jobs:
build:
name: Build
runs-on: macos-11.0
runs-on: macos-12
steps:
- name: Checkout the repo
uses: actions/checkout@v2
- name: Set proper xcode version
uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: '14.0'
- name: Building
run: ./scripts/build.sh
12 changes: 10 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,27 @@ on:
jobs:
pod:
name: Pod Lib Lint
runs-on: macos-11.0
runs-on: macos-12
steps:
- name: Checkout the repo
uses: actions/checkout@v2
- name: Set proper xcode version
uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: '14.0'
- name: Build the framework
run: ./scripts/build.sh
- name: Lint
run: pod lib lint --allow-warnings
swift:
name: Swift Lint
runs-on: macos-11.0
runs-on: macos-12
steps:
- name: Checkout the repo
uses: actions/checkout@v2
- name: Set proper xcode version
uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: '14.0'
- name: Lint
run: swiftlint --strict
6 changes: 5 additions & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,17 @@ on:
jobs:
publish:
name: Publish
runs-on: macos-11.0
runs-on: macos-12
steps:
- name: Checkout the repo
uses: actions/checkout@v2
- name: Make sure we're on the proper branch
run: |
[[ $GITHUB_REF == refs/heads/${{ github.event.inputs.confirmBranch }} ]] || exit 1
- name: Set proper xcode version
uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: '14.0'
- name: Build the framework
env:
GITHUB_ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
4 changes: 2 additions & 2 deletions Cartfile
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
binary "https://raw.githubusercontent.com/wultra/powerauth-mobile-sdk-spm/34043c100c398fd765dd0fc7829ca5419e6adacd/PowerAuth2.json" ~> 1.7.0
binary "https://raw.githubusercontent.com/wultra/powerauth-mobile-sdk-spm/34043c100c398fd765dd0fc7829ca5419e6adacd/PowerAuthCore.json" ~> 1.7.0
binary "https://raw.githubusercontent.com/wultra/powerauth-mobile-sdk-spm/develop/PowerAuth2.json" ~> 1.7.3
binary "https://raw.githubusercontent.com/wultra/powerauth-mobile-sdk-spm/develop/PowerAuthCore.json" ~> 1.7.3
4 changes: 2 additions & 2 deletions Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
binary "https://raw.githubusercontent.com/wultra/powerauth-mobile-sdk-spm/34043c100c398fd765dd0fc7829ca5419e6adacd/PowerAuth2.json" "1.7.1"
binary "https://raw.githubusercontent.com/wultra/powerauth-mobile-sdk-spm/34043c100c398fd765dd0fc7829ca5419e6adacd/PowerAuthCore.json" "1.7.1"
binary "https://raw.githubusercontent.com/wultra/powerauth-mobile-sdk-spm/develop/PowerAuth2.json" "1.7.3"
binary "https://raw.githubusercontent.com/wultra/powerauth-mobile-sdk-spm/develop/PowerAuthCore.json" "1.7.3"
6 changes: 3 additions & 3 deletions Deploy/WultraPowerAuthNetworking.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ Pod::Spec.new do |s|
s.source = { :git => 'https://github.com/wultra/networking-apple.git', :tag => s.version }
s.source_files = 'Sources/WultraPowerauthNetworking/**/*.swift'
s.platform = :ios
s.swift_version = "5.0"
s.ios.deployment_target = '10.0'
s.swift_version = "5.7"
s.ios.deployment_target = '11.0'

s.dependency 'PowerAuth2', '>= 1.7'
s.dependency 'PowerAuth2', '>= 1.7.3'
end
8 changes: 4 additions & 4 deletions Package.swift
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
// swift-tools-version:5.4
// swift-tools-version:5.7

import PackageDescription

let package = Package(
name: "WultraPowerAuthNetworking",
platforms: [
.iOS(.v10),
.tvOS(.v10)
.iOS(.v11),
.tvOS(.v11)
],
products: [
.library(
Expand All @@ -15,7 +15,7 @@ let package = Package(
targets: ["WultraPowerAuthNetworking"])
],
dependencies: [
.package(name: "PowerAuth2", url: "https://github.com/wultra/powerauth-mobile-sdk-spm.git", .upToNextMinor(from: "1.7.0"))
.package(name: "PowerAuth2", url: "https://github.com/wultra/powerauth-mobile-sdk-spm.git", .upToNextMinor(from: "1.7.3"))
],
targets: [
.target(
Expand Down
6 changes: 3 additions & 3 deletions Sources/WultraPowerauthNetworking/WPNLogger.swift
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public class WPNLogger {

/// Prints simple message to the debug console.
static func print(_ message: @autoclosure () -> String) {
#if DEBUG
#if DEBUG || WPN_ENABLE_LOGGING
if verboseLevel == .all {
Swift.print("[WPN] \(message().limit(characterLimit))")
}
Expand All @@ -48,7 +48,7 @@ public class WPNLogger {

/// Prints warning message to the debug console.
static func warning(_ message: @autoclosure () -> String) {
#if DEBUG
#if DEBUG || WPN_ENABLE_LOGGING
if verboseLevel.rawValue >= VerboseLevel.warnings.rawValue {
Swift.print("[WPN] WARNING: \(message().limit(characterLimit))")
}
Expand All @@ -57,7 +57,7 @@ public class WPNLogger {

/// Prints error message to the debug console.
static func error(_ message: @autoclosure () -> String) {
#if DEBUG
#if DEBUG || WPN_ENABLE_LOGGING
if verboseLevel != .off {
Swift.print("[WPN] ERROR: \(message().limit(characterLimit))")
}
Expand Down
4 changes: 2 additions & 2 deletions WultraPowerAuthNetworking.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ Pod::Spec.new do |s|
s.source = { :git => 'https://github.com/wultra/networking-apple.git', :tag => s.version }
s.source_files = 'Sources/WultraPowerauthNetworking/**/*.swift'
s.platform = :ios
s.swift_version = "5.0"
s.ios.deployment_target = '10.0'
s.swift_version = "5.7"
s.ios.deployment_target = '11.0'

s.dependency 'PowerAuth2', '>= 1.7'
end

0 comments on commit 96e4d1e

Please sign in to comment.