From 8b5d46aa82ff1a2eda220523437946aa5aa2bf29 Mon Sep 17 00:00:00 2001 From: Ross Butler Date: Fri, 30 Jul 2021 15:19:47 +0100 Subject: [PATCH] Release 5.1.0 --- CHANGELOG.md | 9 +++++ Connectivity.podspec | 2 +- Example/Pods/Pods.xcodeproj/project.pbxproj | 8 ++++ .../Connectivity-iOS-Info.plist | 40 +++++++++---------- .../Connectivity-macOS-Info.plist | 40 +++++++++---------- README.md | 10 ++--- 6 files changed, 63 insertions(+), 46 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 760ddd3..cf6c706 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,15 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [5.1.0] - 2021-07-30 +### Added +- Support for determining connection state of Ethernet connections +### Changed +- Support compilation under Xcode 12.5.1. +- OHHTTPStubs 8.0.0 -> 9.1.0 for testing +- Updated documentation in README.md +- Headers search path added to Package.swift with thanks to @larryonoff + ## [5.0.0] - 2020-09-15 ### Added - Support for Xcode 12. diff --git a/Connectivity.podspec b/Connectivity.podspec index db1c58e..5c7a319 100644 --- a/Connectivity.podspec +++ b/Connectivity.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'Connectivity' - s.version = '5.0.0' + s.version = '5.1.0' s.swift_version = '5.0' s.summary = 'Makes Internet connectivity detection more robust by detecting Wi-Fi networks without Internet access.' s.description = <<-DESC diff --git a/Example/Pods/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj index c0113f4..28a621a 100644 --- a/Example/Pods/Pods.xcodeproj/project.pbxproj +++ b/Example/Pods/Pods.xcodeproj/project.pbxproj @@ -1037,7 +1037,9 @@ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.10; + MARKETING_VERSION = 5.1.0; MODULEMAP_FILE = "Target Support Files/Connectivity-macOS/Connectivity-macOS.modulemap"; + PRODUCT_BUNDLE_IDENTIFIER = com.rwbutler.connectivity; PRODUCT_MODULE_NAME = Connectivity; PRODUCT_NAME = Connectivity; SDKROOT = macosx; @@ -1098,7 +1100,9 @@ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MARKETING_VERSION = 5.1.0; MODULEMAP_FILE = "Target Support Files/Connectivity-iOS/Connectivity-iOS.modulemap"; + PRODUCT_BUNDLE_IDENTIFIER = com.rwbutler.connectivity; PRODUCT_MODULE_NAME = Connectivity; PRODUCT_NAME = Connectivity; SDKROOT = iphoneos; @@ -1129,7 +1133,9 @@ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MARKETING_VERSION = 5.1.0; MODULEMAP_FILE = "Target Support Files/Connectivity-iOS/Connectivity-iOS.modulemap"; + PRODUCT_BUNDLE_IDENTIFIER = com.rwbutler.connectivity; PRODUCT_MODULE_NAME = Connectivity; PRODUCT_NAME = Connectivity; SDKROOT = iphoneos; @@ -1380,7 +1386,9 @@ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.10; + MARKETING_VERSION = 5.1.0; MODULEMAP_FILE = "Target Support Files/Connectivity-macOS/Connectivity-macOS.modulemap"; + PRODUCT_BUNDLE_IDENTIFIER = com.rwbutler.connectivity; PRODUCT_MODULE_NAME = Connectivity; PRODUCT_NAME = Connectivity; SDKROOT = macosx; diff --git a/Example/Pods/Target Support Files/Connectivity-iOS/Connectivity-iOS-Info.plist b/Example/Pods/Target Support Files/Connectivity-iOS/Connectivity-iOS-Info.plist index e2771ff..72caab8 100644 --- a/Example/Pods/Target Support Files/Connectivity-iOS/Connectivity-iOS-Info.plist +++ b/Example/Pods/Target Support Files/Connectivity-iOS/Connectivity-iOS-Info.plist @@ -2,25 +2,25 @@ - CFBundleDevelopmentRegion - en - CFBundleExecutable - ${EXECUTABLE_NAME} - CFBundleIdentifier - ${PRODUCT_BUNDLE_IDENTIFIER} - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - ${PRODUCT_NAME} - CFBundlePackageType - FMWK - CFBundleShortVersionString - 5.0.0 - CFBundleSignature - ???? - CFBundleVersion - ${CURRENT_PROJECT_VERSION} - NSPrincipalClass - + CFBundleDevelopmentRegion + en + CFBundleExecutable + ${EXECUTABLE_NAME} + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + ${PRODUCT_NAME} + CFBundlePackageType + FMWK + CFBundleShortVersionString + $(MARKETING_VERSION) + CFBundleSignature + ???? + CFBundleVersion + ${CURRENT_PROJECT_VERSION} + NSPrincipalClass + diff --git a/Example/Pods/Target Support Files/Connectivity-macOS/Connectivity-macOS-Info.plist b/Example/Pods/Target Support Files/Connectivity-macOS/Connectivity-macOS-Info.plist index e2771ff..72caab8 100644 --- a/Example/Pods/Target Support Files/Connectivity-macOS/Connectivity-macOS-Info.plist +++ b/Example/Pods/Target Support Files/Connectivity-macOS/Connectivity-macOS-Info.plist @@ -2,25 +2,25 @@ - CFBundleDevelopmentRegion - en - CFBundleExecutable - ${EXECUTABLE_NAME} - CFBundleIdentifier - ${PRODUCT_BUNDLE_IDENTIFIER} - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - ${PRODUCT_NAME} - CFBundlePackageType - FMWK - CFBundleShortVersionString - 5.0.0 - CFBundleSignature - ???? - CFBundleVersion - ${CURRENT_PROJECT_VERSION} - NSPrincipalClass - + CFBundleDevelopmentRegion + en + CFBundleExecutable + ${EXECUTABLE_NAME} + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + ${PRODUCT_NAME} + CFBundlePackageType + FMWK + CFBundleShortVersionString + $(MARKETING_VERSION) + CFBundleSignature + ???? + CFBundleVersion + ${CURRENT_PROJECT_VERSION} + NSPrincipalClass + diff --git a/README.md b/README.md index e2225e7..9d69259 100644 --- a/README.md +++ b/README.md @@ -174,7 +174,7 @@ If on downloading this small HTML page iOS finds that it contains the word `Succ Apple hosts a number of these pages such that should one of these pages go down, a number of fallbacks can be checked to determine whether connectivity is present or whether our connection is blocked by the presence of a captive portal. Unfortunately iOS exposes no framework to developers which allows us to make use of the operating system’s awareness of captive portals. -Connectivity is an open-source framework which wraps Reachability and endeavours to replicate iOS’s means of detecting captive portals. When Reachability detects Wi-Fi or WWAN connectivity, Connectivity contacts a number of endpoints to determine whether true Internet connectivity is present or whether a captive portal is intercepting the connections. This approach can also be used to determine whether an iOS device is connected to a Wi-Fi router with no Internet access. +Connectivity is an open-source framework which wraps Reachability and endeavours to replicate iOS’s means of detecting captive portals. When Reachability detects Wi-Fi or cellular connectivity, Connectivity contacts a number of endpoints to determine whether true Internet connectivity is present or whether a captive portal is intercepting the connections. This approach can also be used to determine whether an iOS device is connected to a Wi-Fi router with no Internet access. Connectivity provides an interface as close to Reachability as possible so that it is familiar to developers used to working with Reachability. This includes providing the methods `startNotifier()` and `stopNotifier()` to begin checking for changes in Internet connectivity. Once the notifier has been started, you may query for the current connectivity status synchronously using the `status` property (similar to Reachability’s `currentReachabilityStatus`) or asynchronously by registering as an observer with the default NotificationCenter for the notification `kNetworkConnectivityChangedNotification` (in Swift this is accessed through `Notification.Name.ConnectivityDidChange`) — similar to Reachability’s notification `kNetworkReachabilityChangedNotification`. @@ -204,8 +204,8 @@ func updateConnectionStatus(_ status: Connectivity.ConnectivityStatus) { case .connected: case .connectedViaWiFi: case .connectedViaWiFiWithoutInternet: - case .connectedViaWWAN: - case .connectedViaWWANWithoutInternet: + case .connectedViaCellular: + case .connectedViaCellularWithoutInternet: case .notConnected: } @@ -236,9 +236,9 @@ connectivity.checkConnectivity { connectivity in break case .connectedViaWiFiWithoutInternet: break - case .connectedViaWWAN: + case .connectedViaCellular: break - case .connectedViaWWANWithoutInternet: + case .connectedViaCellularWithoutInternet: break case .notConnected: break