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

General cleanup #28

Merged
merged 7 commits into from
Nov 11, 2024
Merged
Show file tree
Hide file tree
Changes from all 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: 4 additions & 2 deletions .github/workflows/changes-action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,12 @@ jobs:

steps:
- uses: actions/checkout@v2
- name: Boot Simulator
run: xcrun simctl boot 5E4C21FA-303F-461E-81AD-F50D186A79FC
- name: Build Network Monitor
run: xcodebuild build -scheme NetworkMonitor -destination 'platform=iOS Simulator,name=iPhone 12 Pro Max'
run: xcodebuild build -scheme NetworkMonitor -destination 'platform=iOS Simulator,name=iPhone 15 Pro Max'
- name: Test Network Monitor
run: xcodebuild test -scheme NetworkMonitor -destination 'platform=iOS Simulator,name=iPhone 12 Pro Max'
run: xcodebuild clean test -scheme NetworkMonitor -destination 'platform=iOS Simulator,name=iPhone 15 Pro Max'
- name: Install Cocoapods
run: gem install cocoapods
- name: Pod lib lint
Expand Down
4 changes: 2 additions & 2 deletions FNMNetworkMonitor.podspec
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
Pod::Spec.new do |spec|
spec.name = 'FNMNetworkMonitor'
spec.module_name = 'FNMNetworkMonitor'
spec.version = '11.11.1'
spec.version = '12.0.0'
spec.summary = 'A network monitor'
spec.homepage = 'https://github.com/Farfetch/network-monitor-ios'
spec.license = 'MIT'
spec.author = 'Farfetch'
spec.source = { :git => 'https://github.com/Farfetch/network-monitor-ios.git', :tag => spec.version.to_s }

spec.ios.deployment_target = '10.0'
spec.ios.deployment_target = '15.0'
spec.requires_arc = true

spec.cocoapods_version = '>= 1.7'
Expand Down
721 changes: 0 additions & 721 deletions NetworkMonitor.xcodeproj/project.pbxproj

This file was deleted.

This file was deleted.

This file was deleted.

6 changes: 3 additions & 3 deletions NetworkMonitor/Classes/Profile/FNMProfile.swift
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ public typealias FNMProfileResponseAllowable = (FNMProfileResponse) -> Bool

open class FNMProfile: NSObject, Codable {

let request: FNMProfileRequest
let responses: [FNMProfileResponse]
public let request: FNMProfileRequest
public let responses: [FNMProfileResponse]

/// Priority is used as a tiebreaker when we have several possible profiles for the request made.
/// The profile with the highest priority (Uint.min [aka 0] being the highest value and UInt.max the lowest value) will be used.
let priority: UInt
public let priority: UInt

public required init(request: FNMProfileRequest,
responses: [FNMProfileResponse],
Expand Down
11 changes: 5 additions & 6 deletions Package.swift
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
// swift-tools-version:5.0
// swift-tools-version:5.10

import PackageDescription

let package = Package(
name: "NetworkMonitor",
platforms: [
.iOS(.v10),
.iOS(.v15),
],
products: [
.library(
name: "FNMNetworkMonitor",
targets: ["FNMNetworkMonitor"]),
.library(name: "FNMNetworkMonitor", targets: ["FNMNetworkMonitor"])
],
dependencies: [],
targets: [
Expand All @@ -21,7 +19,8 @@ let package = Package(
.testTarget(
name: "NetworkMonitorTests",
dependencies: ["FNMNetworkMonitor"],
path: "Tests"),
path: "Tests",
resources: [.process("Resources")]),
],
swiftLanguageVersions: [.v5]
)
9 changes: 9 additions & 0 deletions Sample/.spm.pods/packages/.umbrella/Package.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
// swift-tools-version:5.7
import PackageDescription

let package = Package(
name: "_umbrella_",
dependencies: [

]
)
14 changes: 14 additions & 0 deletions Sample/Podfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# Sources configuration
source 'https://cdn.cocoapods.org/'

PLATFORM_DEPLOYMENT_TARGET = '15.0'.freeze

platform :ios, PLATFORM_DEPLOYMENT_TARGET
use_frameworks!

workspace 'Sample'

target 'Sample' do

pod 'FNMNetworkMonitor'
end
16 changes: 16 additions & 0 deletions Sample/Podfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
PODS:
- FNMNetworkMonitor (11.11.1)

DEPENDENCIES:
- FNMNetworkMonitor

SPEC REPOS:
trunk:
- FNMNetworkMonitor

SPEC CHECKSUMS:
FNMNetworkMonitor: 8dc090b3d0873c5fec8e389d6568af73683312cd

PODFILE CHECKSUM: ed71bf10e5bc3bdbe6c5632c5a63496350fa381f

COCOAPODS: 1.15.2
Loading
Loading