Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated strict concurrency and Privacy Manifests #50

Closed
Closed
Show file tree
Hide file tree
Changes from 9 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ on:

jobs:
macos-build:
runs-on: macos-latest
runs-on: macOS-13
gazreese marked this conversation as resolved.
Show resolved Hide resolved

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Build (macOS)
run: swift build -v
- name: Run tests
Expand All @@ -22,7 +22,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Build (Ubuntu)
run: swift build -v
- name: Run tests
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict/>
</plist>
2 changes: 1 addition & 1 deletion Example/FlagsmithClient/AppDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ func isSuccess<T,F>(_ result: Result<T,F>) -> Bool {
class AppDelegate: UIResponder, UIApplicationDelegate {

var window: UIWindow?
let concurrentQueue = DispatchQueue(label: "concurrentQueue", attributes: .concurrent)
let concurrentQueue = DispatchQueue(label: "concurrentQueue", qos: .default, attributes: .concurrent)

func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
// Override point for customization after application launch.
Expand Down
6 changes: 3 additions & 3 deletions Example/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PODS:
- FlagsmithClient (3.4.0)
- FlagsmithClient (3.6.0)

DEPENDENCIES:
- FlagsmithClient (from `../`)
Expand All @@ -9,8 +9,8 @@ EXTERNAL SOURCES:
:path: "../"

SPEC CHECKSUMS:
FlagsmithClient: 0f8ed4a38dec385d73cc21a64b791b39bcc8c32b
FlagsmithClient: 101151384696085c085d06b1c202946827e058d6

PODFILE CHECKSUM: 9fc876dee0cf031cae843156b0740a94b4994d8c

COCOAPODS: 1.13.0
COCOAPODS: 1.15.2
13 changes: 9 additions & 4 deletions Example/Pods/Local Podspecs/FlagsmithClient.podspec.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions Example/Pods/Manifest.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

452 changes: 279 additions & 173 deletions Example/Pods/Pods.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 5 additions & 2 deletions FlagsmithClient.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,19 @@

Pod::Spec.new do |s|
s.name = 'FlagsmithClient'
s.version = '3.5.0'
s.version = '3.6.0'
s.summary = 'iOS Client written in Swift for Flagsmith. Ship features with confidence using feature flags and remote config.'
s.homepage = 'https://github.com/Flagsmith/flagsmith-ios-client'
s.license = { :type => 'MIT', :file => 'LICENSE' }
s.author = { 'Kyle Johnson' => '[email protected]' }
s.source = { :git => 'https://github.com/Flagsmith/flagsmith-ios-client.git', :tag => s.version.to_s }
s.social_media_url = 'https://twitter.com/getflagsmith'
s.resource_bundles = {
'FlagSmith_Privacy' => ['Classes/PrivacyInfo.xcprivacy'],
}

s.ios.deployment_target = '12.0'

s.source_files = 'FlagsmithClient/Classes/**/*'
s.swift_versions = '4.0'
s.swift_versions = '5.6'
end
Empty file removed FlagsmithClient/Assets/.gitkeep
Empty file.
2 changes: 1 addition & 1 deletion FlagsmithClient/Classes/Feature.swift
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public struct Feature: Codable, Sendable {
self.description = description
}

public func encode(to encoder: Encoder) throws {
public func encode(to encoder: any Encoder) throws {
var container = encoder.container(keyedBy: CodingKeys.self)
try container.encode(self.name, forKey: .name)
try container.encodeIfPresent(self.type, forKey: .type)
Expand Down
2 changes: 1 addition & 1 deletion FlagsmithClient/Classes/Flag.swift
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public struct Flag: Codable, Sendable {
self.enabled = enabled
}

public func encode(to encoder: Encoder) throws {
public func encode(to encoder: any Encoder) throws {
var container = encoder.container(keyedBy: CodingKeys.self)
try container.encode(self.feature, forKey: .feature)
try container.encode(self.value, forKey: .value)
Expand Down
Loading