From 9c47cba27d11f50bb7a85595cd587f612e88a0a6 Mon Sep 17 00:00:00 2001 From: Alexander Batalov Date: Wed, 13 Oct 2021 11:30:17 +0300 Subject: [PATCH 1/3] [network_info_plus] remove reachability --- .../macos/Classes/IPHelper.h | 21 ------------------- .../macos/Classes/NetworkInfoPlusPlugin.swift | 3 --- .../macos/network_info_plus_macos.podspec | 1 - 3 files changed, 25 deletions(-) delete mode 100644 packages/network_info_plus/network_info_plus_macos/macos/Classes/IPHelper.h diff --git a/packages/network_info_plus/network_info_plus_macos/macos/Classes/IPHelper.h b/packages/network_info_plus/network_info_plus_macos/macos/Classes/IPHelper.h deleted file mode 100644 index 9ec17c7a33..0000000000 --- a/packages/network_info_plus/network_info_plus_macos/macos/Classes/IPHelper.h +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright 2019 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#import - -#import "SystemConfiguration/CaptiveNetwork.h" - -#include -#include - diff --git a/packages/network_info_plus/network_info_plus_macos/macos/Classes/NetworkInfoPlusPlugin.swift b/packages/network_info_plus/network_info_plus_macos/macos/Classes/NetworkInfoPlusPlugin.swift index dd92d24416..ba55958f58 100644 --- a/packages/network_info_plus/network_info_plus_macos/macos/Classes/NetworkInfoPlusPlugin.swift +++ b/packages/network_info_plus/network_info_plus_macos/macos/Classes/NetworkInfoPlusPlugin.swift @@ -15,8 +15,6 @@ import Cocoa import CoreWLAN import FlutterMacOS -import SystemConfiguration.CaptiveNetwork - public class NetworkInfoPlusPlugin: NSObject, FlutterPlugin { var cwinterface: CWInterface? @@ -90,4 +88,3 @@ func getWiFiAddress(family: Int32) -> String? { return address } - diff --git a/packages/network_info_plus/network_info_plus_macos/macos/network_info_plus_macos.podspec b/packages/network_info_plus/network_info_plus_macos/macos/network_info_plus_macos.podspec index 15e50ed312..199e99844a 100644 --- a/packages/network_info_plus/network_info_plus_macos/macos/network_info_plus_macos.podspec +++ b/packages/network_info_plus/network_info_plus_macos/macos/network_info_plus_macos.podspec @@ -14,7 +14,6 @@ Pod::Spec.new do |s| s.source = { :http => 'https://github.com/fluttercommunity/plus_plugins/tree/main/packages/network_info_plus_macos' } s.source_files = 'Classes/**/*' s.dependency 'FlutterMacOS' - s.dependency 'Reachability' s.platform = :osx s.osx.deployment_target = '10.11' From f29963da1367a4cced4e9a015b81377b73e3a3d4 Mon Sep 17 00:00:00 2001 From: Alexander Batalov Date: Wed, 13 Oct 2021 11:30:34 +0300 Subject: [PATCH 2/3] update project settings --- .../example/macos/Runner.xcodeproj/project.pbxproj | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/network_info_plus/network_info_plus/example/macos/Runner.xcodeproj/project.pbxproj b/packages/network_info_plus/network_info_plus/example/macos/Runner.xcodeproj/project.pbxproj index 7b217f4432..db9a87e9f8 100644 --- a/packages/network_info_plus/network_info_plus/example/macos/Runner.xcodeproj/project.pbxproj +++ b/packages/network_info_plus/network_info_plus/example/macos/Runner.xcodeproj/project.pbxproj @@ -298,12 +298,10 @@ ); inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh", - "${BUILT_PRODUCTS_DIR}/Reachability/Reachability.framework", "${BUILT_PRODUCTS_DIR}/network_info_plus_macos/network_info_plus_macos.framework", ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Reachability.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/network_info_plus_macos.framework", ); runOnlyForDeploymentPostprocessing = 0; From 21af47addf807feb1146fc46ba706f73f363cb69 Mon Sep 17 00:00:00 2001 From: Alexander Batalov Date: Wed, 13 Oct 2021 11:04:01 +0300 Subject: [PATCH 3/3] add changelog and pump version --- .../package_info_plus/package_info_plus_macos/CHANGELOG.md | 4 ++++ .../package_info_plus/package_info_plus_macos/pubspec.yaml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/package_info_plus/package_info_plus_macos/CHANGELOG.md b/packages/package_info_plus/package_info_plus_macos/CHANGELOG.md index 5bd3a64af9..50dc6feaa7 100644 --- a/packages/package_info_plus/package_info_plus_macos/CHANGELOG.md +++ b/packages/package_info_plus/package_info_plus_macos/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.3.0 + +- Removed `Reachability` dependency + ## 1.2.0 - fix app name on macOS diff --git a/packages/package_info_plus/package_info_plus_macos/pubspec.yaml b/packages/package_info_plus/package_info_plus_macos/pubspec.yaml index 96e157b107..c347083bed 100644 --- a/packages/package_info_plus/package_info_plus_macos/pubspec.yaml +++ b/packages/package_info_plus/package_info_plus_macos/pubspec.yaml @@ -1,6 +1,6 @@ name: package_info_plus_macos description: macOS implementation of the package_info_plus plugin. -version: 1.2.0 +version: 1.3.0 homepage: https://plus.fluttercommunity.dev/ repository: https://github.com/fluttercommunity/plus_plugins/tree/main/packages/