From 47b9640a323f17de4fa88cfbd5e776630ebe8768 Mon Sep 17 00:00:00 2001 From: Miguel Beltran Date: Wed, 9 Dec 2020 13:14:53 +0100 Subject: [PATCH 1/6] renamed message channel --- .../io/flutter/plugins/connectivity/ConnectivityPlugin.java | 4 ++-- .../connectivity_plus/ios/Classes/FLTConnectivityPlugin.m | 4 ++-- .../macos/Classes/ConnectivityPlugin.swift | 4 ++-- .../lib/src/method_channel_connectivity.dart | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/connectivity_plus/android/src/main/java/io/flutter/plugins/connectivity/ConnectivityPlugin.java b/packages/connectivity_plus/android/src/main/java/io/flutter/plugins/connectivity/ConnectivityPlugin.java index b458fa97e2..8467b2b90c 100644 --- a/packages/connectivity_plus/android/src/main/java/io/flutter/plugins/connectivity/ConnectivityPlugin.java +++ b/packages/connectivity_plus/android/src/main/java/io/flutter/plugins/connectivity/ConnectivityPlugin.java @@ -37,8 +37,8 @@ public void onDetachedFromEngine(FlutterPluginBinding binding) { } private void setupChannels(BinaryMessenger messenger, Context context) { - methodChannel = new MethodChannel(messenger, "plugins.flutter.io/connectivity"); - eventChannel = new EventChannel(messenger, "plugins.flutter.io/connectivity_status"); + methodChannel = new MethodChannel(messenger, "dev.fluttercommunity.plus/connectivity"); + eventChannel = new EventChannel(messenger, "dev.fluttercommunity.plus/connectivity_status"); ConnectivityManager connectivityManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE); WifiManager wifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE); diff --git a/packages/connectivity_plus/ios/Classes/FLTConnectivityPlugin.m b/packages/connectivity_plus/ios/Classes/FLTConnectivityPlugin.m index 0a65409b38..7bde5d4e42 100644 --- a/packages/connectivity_plus/ios/Classes/FLTConnectivityPlugin.m +++ b/packages/connectivity_plus/ios/Classes/FLTConnectivityPlugin.m @@ -29,12 +29,12 @@ + (void)registerWithRegistrar:(NSObject*)registrar { FLTConnectivityPlugin* instance = [[FLTConnectivityPlugin alloc] init]; FlutterMethodChannel* channel = - [FlutterMethodChannel methodChannelWithName:@"plugins.flutter.io/connectivity" + [FlutterMethodChannel methodChannelWithName:@"dev.fluttercommunity.plus/connectivity" binaryMessenger:[registrar messenger]]; [registrar addMethodCallDelegate:instance channel:channel]; FlutterEventChannel* streamChannel = - [FlutterEventChannel eventChannelWithName:@"plugins.flutter.io/connectivity_status" + [FlutterEventChannel eventChannelWithName:@"dev.fluttercommunity.plus/connectivity_status" binaryMessenger:[registrar messenger]]; [streamChannel setStreamHandler:instance]; } diff --git a/packages/connectivity_plus_macos/macos/Classes/ConnectivityPlugin.swift b/packages/connectivity_plus_macos/macos/Classes/ConnectivityPlugin.swift index 91d8ae1eb3..7d3814e7fd 100644 --- a/packages/connectivity_plus_macos/macos/Classes/ConnectivityPlugin.swift +++ b/packages/connectivity_plus_macos/macos/Classes/ConnectivityPlugin.swift @@ -29,11 +29,11 @@ public class ConnectivityPlugin: NSObject, FlutterPlugin, FlutterStreamHandler { public static func register(with registrar: FlutterPluginRegistrar) { let channel = FlutterMethodChannel( - name: "plugins.flutter.io/connectivity", + name: "dev.fluttercommunity.plus/connectivity", binaryMessenger: registrar.messenger) let streamChannel = FlutterEventChannel( - name: "plugins.flutter.io/connectivity_status", + name: "dev.fluttercommunity.plus/connectivity_status", binaryMessenger: registrar.messenger) let instance = ConnectivityPlugin() diff --git a/packages/connectivity_plus_platform_interface/lib/src/method_channel_connectivity.dart b/packages/connectivity_plus_platform_interface/lib/src/method_channel_connectivity.dart index 474826d279..2cbc23df6d 100644 --- a/packages/connectivity_plus_platform_interface/lib/src/method_channel_connectivity.dart +++ b/packages/connectivity_plus_platform_interface/lib/src/method_channel_connectivity.dart @@ -15,12 +15,12 @@ class MethodChannelConnectivity extends ConnectivityPlatform { /// The method channel used to interact with the native platform. @visibleForTesting MethodChannel methodChannel = - MethodChannel('plugins.flutter.io/connectivity'); + MethodChannel('dev.fluttercommunity.plus/connectivity'); /// The event channel used to receive ConnectivityResult changes from the native platform. @visibleForTesting EventChannel eventChannel = - EventChannel('plugins.flutter.io/connectivity_status'); + EventChannel('dev.fluttercommunity.plus/connectivity_status'); Stream _onConnectivityChanged; From 6b5386d1eb9ae8b5eeb5e5ac3050241a0153fea0 Mon Sep 17 00:00:00 2001 From: Miguel Beltran Date: Wed, 9 Dec 2020 13:26:10 +0100 Subject: [PATCH 2/6] working Android code --- .../connectivity_plus/android/src/main/AndroidManifest.xml | 2 +- .../fluttercommunity/plus}/connectivity/Connectivity.java | 2 +- .../plus}/connectivity/ConnectivityBroadcastReceiver.java | 2 +- .../plus}/connectivity/ConnectivityMethodChannelHandler.java | 2 +- .../plus}/connectivity/ConnectivityPlugin.java | 2 +- .../plugins/connectivityexample/EmbeddingV1Activity.java | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) rename packages/connectivity_plus/android/src/main/java/{io/flutter/plugins => dev/fluttercommunity/plus}/connectivity/Connectivity.java (98%) rename packages/connectivity_plus/android/src/main/java/{io/flutter/plugins => dev/fluttercommunity/plus}/connectivity/ConnectivityBroadcastReceiver.java (96%) rename packages/connectivity_plus/android/src/main/java/{io/flutter/plugins => dev/fluttercommunity/plus}/connectivity/ConnectivityMethodChannelHandler.java (96%) rename packages/connectivity_plus/android/src/main/java/{io/flutter/plugins => dev/fluttercommunity/plus}/connectivity/ConnectivityPlugin.java (97%) diff --git a/packages/connectivity_plus/android/src/main/AndroidManifest.xml b/packages/connectivity_plus/android/src/main/AndroidManifest.xml index f4eafe489d..777ad1eefa 100644 --- a/packages/connectivity_plus/android/src/main/AndroidManifest.xml +++ b/packages/connectivity_plus/android/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="dev.fluttercommunity.plus.connectivity"> diff --git a/packages/connectivity_plus/android/src/main/java/io/flutter/plugins/connectivity/Connectivity.java b/packages/connectivity_plus/android/src/main/java/dev/fluttercommunity/plus/connectivity/Connectivity.java similarity index 98% rename from packages/connectivity_plus/android/src/main/java/io/flutter/plugins/connectivity/Connectivity.java rename to packages/connectivity_plus/android/src/main/java/dev/fluttercommunity/plus/connectivity/Connectivity.java index 2d07641a42..dc25e34005 100644 --- a/packages/connectivity_plus/android/src/main/java/io/flutter/plugins/connectivity/Connectivity.java +++ b/packages/connectivity_plus/android/src/main/java/dev/fluttercommunity/plus/connectivity/Connectivity.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -package io.flutter.plugins.connectivity; +package dev.fluttercommunity.plus.connectivity; import android.net.ConnectivityManager; import android.net.Network; diff --git a/packages/connectivity_plus/android/src/main/java/io/flutter/plugins/connectivity/ConnectivityBroadcastReceiver.java b/packages/connectivity_plus/android/src/main/java/dev/fluttercommunity/plus/connectivity/ConnectivityBroadcastReceiver.java similarity index 96% rename from packages/connectivity_plus/android/src/main/java/io/flutter/plugins/connectivity/ConnectivityBroadcastReceiver.java rename to packages/connectivity_plus/android/src/main/java/dev/fluttercommunity/plus/connectivity/ConnectivityBroadcastReceiver.java index be8b47eff9..c295d3cc67 100644 --- a/packages/connectivity_plus/android/src/main/java/io/flutter/plugins/connectivity/ConnectivityBroadcastReceiver.java +++ b/packages/connectivity_plus/android/src/main/java/dev/fluttercommunity/plus/connectivity/ConnectivityBroadcastReceiver.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -package io.flutter.plugins.connectivity; +package dev.fluttercommunity.plus.connectivity; import android.content.BroadcastReceiver; import android.content.Context; diff --git a/packages/connectivity_plus/android/src/main/java/io/flutter/plugins/connectivity/ConnectivityMethodChannelHandler.java b/packages/connectivity_plus/android/src/main/java/dev/fluttercommunity/plus/connectivity/ConnectivityMethodChannelHandler.java similarity index 96% rename from packages/connectivity_plus/android/src/main/java/io/flutter/plugins/connectivity/ConnectivityMethodChannelHandler.java rename to packages/connectivity_plus/android/src/main/java/dev/fluttercommunity/plus/connectivity/ConnectivityMethodChannelHandler.java index 931b702d44..d776964c85 100644 --- a/packages/connectivity_plus/android/src/main/java/io/flutter/plugins/connectivity/ConnectivityMethodChannelHandler.java +++ b/packages/connectivity_plus/android/src/main/java/dev/fluttercommunity/plus/connectivity/ConnectivityMethodChannelHandler.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -package io.flutter.plugins.connectivity; +package dev.fluttercommunity.plus.connectivity; import io.flutter.plugin.common.MethodCall; import io.flutter.plugin.common.MethodChannel; diff --git a/packages/connectivity_plus/android/src/main/java/io/flutter/plugins/connectivity/ConnectivityPlugin.java b/packages/connectivity_plus/android/src/main/java/dev/fluttercommunity/plus/connectivity/ConnectivityPlugin.java similarity index 97% rename from packages/connectivity_plus/android/src/main/java/io/flutter/plugins/connectivity/ConnectivityPlugin.java rename to packages/connectivity_plus/android/src/main/java/dev/fluttercommunity/plus/connectivity/ConnectivityPlugin.java index 8467b2b90c..717426acb8 100644 --- a/packages/connectivity_plus/android/src/main/java/io/flutter/plugins/connectivity/ConnectivityPlugin.java +++ b/packages/connectivity_plus/android/src/main/java/dev/fluttercommunity/plus/connectivity/ConnectivityPlugin.java @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -package io.flutter.plugins.connectivity; +package dev.fluttercommunity.plus.connectivity; import android.content.Context; import android.net.ConnectivityManager; diff --git a/packages/connectivity_plus/example/android/app/src/main/java/io/flutter/plugins/connectivityexample/EmbeddingV1Activity.java b/packages/connectivity_plus/example/android/app/src/main/java/io/flutter/plugins/connectivityexample/EmbeddingV1Activity.java index fa10cd5b7f..795af0a5c1 100644 --- a/packages/connectivity_plus/example/android/app/src/main/java/io/flutter/plugins/connectivityexample/EmbeddingV1Activity.java +++ b/packages/connectivity_plus/example/android/app/src/main/java/io/flutter/plugins/connectivityexample/EmbeddingV1Activity.java @@ -5,14 +5,14 @@ package io.flutter.plugins.connectivityexample; import android.os.Bundle; +import dev.fluttercommunity.plus.connectivity.ConnectivityPlugin; import io.flutter.app.FlutterActivity; -import io.flutter.plugins.connectivity.ConnectivityPlugin; public class EmbeddingV1Activity extends FlutterActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); ConnectivityPlugin.registerWith( - registrarFor("io.flutter.plugins.connectivity.ConnectivityPlugin")); + registrarFor("dev.fluttercommunity.plus.connectivity.ConnectivityPlugin")); } } From 11aac51d3bb4377b0a6e08caa42004e8b34394fa Mon Sep 17 00:00:00 2001 From: Miguel Beltran Date: Wed, 9 Dec 2020 13:26:30 +0100 Subject: [PATCH 3/6] temporal path reference --- packages/connectivity_plus/pubspec.yaml | 11 +++++++---- packages/connectivity_plus_macos/pubspec.yaml | 3 ++- packages/connectivity_plus_web/pubspec.yaml | 3 ++- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/packages/connectivity_plus/pubspec.yaml b/packages/connectivity_plus/pubspec.yaml index dc8c1f2bab..79ea4b9b4f 100644 --- a/packages/connectivity_plus/pubspec.yaml +++ b/packages/connectivity_plus/pubspec.yaml @@ -8,7 +8,7 @@ flutter: plugin: platforms: android: - package: io.flutter.plugins.connectivity + package: dev.fluttercommunity.plus.connectivity pluginClass: ConnectivityPlugin ios: pluginClass: FLTConnectivityPlugin @@ -21,9 +21,12 @@ dependencies: flutter: sdk: flutter meta: ^1.0.5 - connectivity_plus_platform_interface: ^0.2.0 - connectivity_plus_macos: ^0.2.0 - connectivity_plus_web: ^0.4.0 + connectivity_plus_platform_interface: + path: ../connectivity_plus_platform_interface + connectivity_plus_macos: + path: ../connectivity_plus_macos + connectivity_plus_web: + path: ../connectivity_plus_web dev_dependencies: flutter_test: diff --git a/packages/connectivity_plus_macos/pubspec.yaml b/packages/connectivity_plus_macos/pubspec.yaml index e6e08469bc..c7938d1e0e 100644 --- a/packages/connectivity_plus_macos/pubspec.yaml +++ b/packages/connectivity_plus_macos/pubspec.yaml @@ -15,7 +15,8 @@ environment: flutter: '>=1.20.0' dependencies: - connectivity_plus_platform_interface: ^0.2.0 + connectivity_plus_platform_interface: + path: ../connectivity_plus_platform_interface flutter: sdk: flutter diff --git a/packages/connectivity_plus_web/pubspec.yaml b/packages/connectivity_plus_web/pubspec.yaml index 87fad5ec94..db3175dc34 100644 --- a/packages/connectivity_plus_web/pubspec.yaml +++ b/packages/connectivity_plus_web/pubspec.yaml @@ -12,7 +12,8 @@ flutter: fileName: connectivity_plus_web.dart dependencies: - connectivity_plus_platform_interface: ^0.2.0 + connectivity_plus_platform_interface: + path: ../connectivity_plus_platform_interface flutter_web_plugins: sdk: flutter flutter: From b6ad1de1d06cc2f14da3210d4c0a88deda852074 Mon Sep 17 00:00:00 2001 From: Miquel Beltran Date: Wed, 9 Dec 2020 13:38:49 +0100 Subject: [PATCH 4/6] rename all ios part --- .../example/ios/Flutter/.last_build_id | 1 + .../example/ios/Flutter/Flutter.podspec | 18 ++++++++++++++++++ .../ios/Runner.xcodeproj/project.pbxproj | 19 ++++--------------- .../connectivity_plus/example/pubspec.yaml | 1 + ...h => FLTConnectivityLocationPlusHandler.h} | 8 ++++---- ...m => FLTConnectivityLocationPlusHandler.m} | 10 +++++----- ...tyPlugin.h => FLTConnectivityPlusPlugin.h} | 2 +- ...tyPlugin.m => FLTConnectivityPlusPlugin.m} | 18 +++++++++--------- packages/connectivity_plus/pubspec.yaml | 2 +- 9 files changed, 44 insertions(+), 35 deletions(-) create mode 100644 packages/connectivity_plus/example/ios/Flutter/.last_build_id create mode 100644 packages/connectivity_plus/example/ios/Flutter/Flutter.podspec rename packages/connectivity_plus/ios/Classes/{FLTConnectivityLocationHandler.h => FLTConnectivityLocationPlusHandler.h} (67%) rename packages/connectivity_plus/ios/Classes/{FLTConnectivityLocationHandler.m => FLTConnectivityLocationPlusHandler.m} (80%) rename packages/connectivity_plus/ios/Classes/{FLTConnectivityPlugin.h => FLTConnectivityPlusPlugin.h} (75%) rename packages/connectivity_plus/ios/Classes/{FLTConnectivityPlugin.m => FLTConnectivityPlusPlugin.m} (91%) diff --git a/packages/connectivity_plus/example/ios/Flutter/.last_build_id b/packages/connectivity_plus/example/ios/Flutter/.last_build_id new file mode 100644 index 0000000000..3fa7426aa8 --- /dev/null +++ b/packages/connectivity_plus/example/ios/Flutter/.last_build_id @@ -0,0 +1 @@ +d206f67b31bd605ac9da4b25c076af42 \ No newline at end of file diff --git a/packages/connectivity_plus/example/ios/Flutter/Flutter.podspec b/packages/connectivity_plus/example/ios/Flutter/Flutter.podspec new file mode 100644 index 0000000000..5ca30416ba --- /dev/null +++ b/packages/connectivity_plus/example/ios/Flutter/Flutter.podspec @@ -0,0 +1,18 @@ +# +# NOTE: This podspec is NOT to be published. It is only used as a local source! +# + +Pod::Spec.new do |s| + s.name = 'Flutter' + s.version = '1.0.0' + s.summary = 'High-performance, high-fidelity mobile apps.' + s.description = <<-DESC +Flutter provides an easy and productive way to build and deploy high-performance mobile apps for Android and iOS. + DESC + s.homepage = 'https://flutter.io' + s.license = { :type => 'MIT' } + s.author = { 'Flutter Dev Team' => 'flutter-dev@googlegroups.com' } + s.source = { :git => 'https://github.com/flutter/engine', :tag => s.version.to_s } + s.ios.deployment_target = '8.0' + s.vendored_frameworks = 'Flutter.framework' +end diff --git a/packages/connectivity_plus/example/ios/Runner.xcodeproj/project.pbxproj b/packages/connectivity_plus/example/ios/Runner.xcodeproj/project.pbxproj index e497d093be..2779467fbc 100644 --- a/packages/connectivity_plus/example/ios/Runner.xcodeproj/project.pbxproj +++ b/packages/connectivity_plus/example/ios/Runner.xcodeproj/project.pbxproj @@ -9,10 +9,6 @@ /* Begin PBXBuildFile section */ 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; - 3B80C3941E831B6300D905FE /* App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; }; - 3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; }; - 9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */; }; 97C146F31CF9000F007C117D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 97C146F21CF9000F007C117D /* main.m */; }; 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; @@ -28,8 +24,6 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - 3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */, - 9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -41,14 +35,12 @@ 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; 3173C764DD180BE02EB51E47 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; - 3B80C3931E831B6300D905FE /* App.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = App.framework; path = Flutter/App.framework; sourceTree = ""; }; 69D903F0A9A7C636EE803AF8 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; 7AFFD8ED1D35381100E5BB4D /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = ""; }; 9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = ""; }; - 9740EEBA1CF902C7004384FC /* Flutter.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Flutter.framework; path = Flutter/Flutter.framework; sourceTree = ""; }; 97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; }; 97C146F21CF9000F007C117D /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; 97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; @@ -63,8 +55,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */, - 3B80C3941E831B6300D905FE /* App.framework in Frameworks */, EB0BA966000B5C35B13186D7 /* libPods-Runner.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -92,9 +82,7 @@ 9740EEB11CF90186004384FC /* Flutter */ = { isa = PBXGroup; children = ( - 3B80C3931E831B6300D905FE /* App.framework */, 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */, - 9740EEBA1CF902C7004384FC /* Flutter.framework */, 9740EEB21CF90195004384FC /* Debug.xcconfig */, 7AFA3C8E1D35360C0083082E /* Release.xcconfig */, 9740EEB31CF90195004384FC /* Generated.xcconfig */, @@ -229,7 +217,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" thin"; + shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; }; 3BAF367E8BACBC7576CEE653 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; @@ -255,9 +243,12 @@ files = ( ); inputPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh", + "${PODS_ROOT}/../Flutter/Flutter.framework", ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Flutter.framework", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; @@ -315,7 +306,6 @@ /* Begin XCBuildConfiguration section */ 97C147031CF9000F007C117D /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; @@ -372,7 +362,6 @@ }; 97C147041CF9000F007C117D /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; diff --git a/packages/connectivity_plus/example/pubspec.yaml b/packages/connectivity_plus/example/pubspec.yaml index 3fd6f68a89..df60680fcd 100644 --- a/packages/connectivity_plus/example/pubspec.yaml +++ b/packages/connectivity_plus/example/pubspec.yaml @@ -13,6 +13,7 @@ dev_dependencies: test: any integration_test: ^0.9.1 pedantic: ^1.8.0 + connectivity: ^2.0.2 flutter: uses-material-design: true diff --git a/packages/connectivity_plus/ios/Classes/FLTConnectivityLocationHandler.h b/packages/connectivity_plus/ios/Classes/FLTConnectivityLocationPlusHandler.h similarity index 67% rename from packages/connectivity_plus/ios/Classes/FLTConnectivityLocationHandler.h rename to packages/connectivity_plus/ios/Classes/FLTConnectivityLocationPlusHandler.h index 1731d56fe7..a6b27b02d4 100644 --- a/packages/connectivity_plus/ios/Classes/FLTConnectivityLocationHandler.h +++ b/packages/connectivity_plus/ios/Classes/FLTConnectivityLocationPlusHandler.h @@ -6,16 +6,16 @@ NS_ASSUME_NONNULL_BEGIN -@class FLTConnectivityLocationDelegate; +@class FLTConnectivityLocationPlusDelegate; -typedef void (^FLTConnectivityLocationCompletion)(CLAuthorizationStatus); +typedef void (^FLTConnectivityLocationPlusCompletion)(CLAuthorizationStatus); -@interface FLTConnectivityLocationHandler : NSObject +@interface FLTConnectivityLocationPlusHandler : NSObject + (CLAuthorizationStatus)locationAuthorizationStatus; - (void)requestLocationAuthorization:(BOOL)always - completion:(_Nonnull FLTConnectivityLocationCompletion)completionHnadler; + completion:(_Nonnull FLTConnectivityLocationPlusCompletion)completionHnadler; @end diff --git a/packages/connectivity_plus/ios/Classes/FLTConnectivityLocationHandler.m b/packages/connectivity_plus/ios/Classes/FLTConnectivityLocationPlusHandler.m similarity index 80% rename from packages/connectivity_plus/ios/Classes/FLTConnectivityLocationHandler.m rename to packages/connectivity_plus/ios/Classes/FLTConnectivityLocationPlusHandler.m index bbb93aea6a..27f2b529bc 100644 --- a/packages/connectivity_plus/ios/Classes/FLTConnectivityLocationHandler.m +++ b/packages/connectivity_plus/ios/Classes/FLTConnectivityLocationPlusHandler.m @@ -2,23 +2,23 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "FLTConnectivityLocationHandler.h" +#import "FLTConnectivityLocationPlusHandler.h" -@interface FLTConnectivityLocationHandler () +@interface FLTConnectivityLocationPlusHandler () -@property(copy, nonatomic) FLTConnectivityLocationCompletion completion; +@property(copy, nonatomic) FLTConnectivityLocationPlusCompletion completion; @property(strong, nonatomic) CLLocationManager *locationManager; @end -@implementation FLTConnectivityLocationHandler +@implementation FLTConnectivityLocationPlusHandler + (CLAuthorizationStatus)locationAuthorizationStatus { return CLLocationManager.authorizationStatus; } - (void)requestLocationAuthorization:(BOOL)always - completion:(FLTConnectivityLocationCompletion)completionHandler { + completion:(FLTConnectivityLocationPlusCompletion)completionHandler { CLAuthorizationStatus status = CLLocationManager.authorizationStatus; if (status != kCLAuthorizationStatusAuthorizedWhenInUse && always) { completionHandler(kCLAuthorizationStatusDenied); diff --git a/packages/connectivity_plus/ios/Classes/FLTConnectivityPlugin.h b/packages/connectivity_plus/ios/Classes/FLTConnectivityPlusPlugin.h similarity index 75% rename from packages/connectivity_plus/ios/Classes/FLTConnectivityPlugin.h rename to packages/connectivity_plus/ios/Classes/FLTConnectivityPlusPlugin.h index 5014624f2f..242fb03a15 100644 --- a/packages/connectivity_plus/ios/Classes/FLTConnectivityPlugin.h +++ b/packages/connectivity_plus/ios/Classes/FLTConnectivityPlusPlugin.h @@ -4,5 +4,5 @@ #import -@interface FLTConnectivityPlugin : NSObject +@interface FLTConnectivityPlusPlugin : NSObject @end diff --git a/packages/connectivity_plus/ios/Classes/FLTConnectivityPlugin.m b/packages/connectivity_plus/ios/Classes/FLTConnectivityPlusPlugin.m similarity index 91% rename from packages/connectivity_plus/ios/Classes/FLTConnectivityPlugin.m rename to packages/connectivity_plus/ios/Classes/FLTConnectivityPlusPlugin.m index 7bde5d4e42..edfa7ee923 100644 --- a/packages/connectivity_plus/ios/Classes/FLTConnectivityPlugin.m +++ b/packages/connectivity_plus/ios/Classes/FLTConnectivityPlusPlugin.m @@ -2,31 +2,31 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "FLTConnectivityPlugin.h" +#import "FLTConnectivityPlusPlugin.h" #import "Reachability/Reachability.h" #import -#import "FLTConnectivityLocationHandler.h" +#import "FLTConnectivityLocationPlusHandler.h" #import "SystemConfiguration/CaptiveNetwork.h" #include #include -@interface FLTConnectivityPlugin () +@interface FLTConnectivityPlusPlugin () -@property(strong, nonatomic) FLTConnectivityLocationHandler* locationHandler; +@property(strong, nonatomic) FLTConnectivityLocationPlusHandler* locationHandler; @end -@implementation FLTConnectivityPlugin { +@implementation FLTConnectivityPlusPlugin { FlutterEventSink _eventSink; Reachability* _reachabilityForInternetConnection; } + (void)registerWithRegistrar:(NSObject*)registrar { - FLTConnectivityPlugin* instance = [[FLTConnectivityPlugin alloc] init]; + FLTConnectivityPlusPlugin* instance = [[FLTConnectivityPlusPlugin alloc] init]; FlutterMethodChannel* channel = [FlutterMethodChannel methodChannelWithName:@"dev.fluttercommunity.plus/connectivity" @@ -118,7 +118,7 @@ - (void)handleMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result { } else if ([call.method isEqualToString:@"wifiIPAddress"]) { result([self getWifiIP]); } else if ([call.method isEqualToString:@"getLocationServiceAuthorization"]) { - result([self convertCLAuthorizationStatusToString:[FLTConnectivityLocationHandler + result([self convertCLAuthorizationStatusToString:[FLTConnectivityLocationPlusHandler locationAuthorizationStatus]]); } else if ([call.method isEqualToString:@"requestLocationServiceAuthorization"]) { NSArray* arguments = call.arguments; @@ -162,9 +162,9 @@ - (NSString*)convertCLAuthorizationStatusToString:(CLAuthorizationStatus)status } } -- (FLTConnectivityLocationHandler*)locationHandler { +- (FLTConnectivityLocationPlusHandler*)locationHandler { if (!_locationHandler) { - _locationHandler = [FLTConnectivityLocationHandler new]; + _locationHandler = [FLTConnectivityLocationPlusHandler new]; } return _locationHandler; } diff --git a/packages/connectivity_plus/pubspec.yaml b/packages/connectivity_plus/pubspec.yaml index 79ea4b9b4f..a361d758c0 100644 --- a/packages/connectivity_plus/pubspec.yaml +++ b/packages/connectivity_plus/pubspec.yaml @@ -11,7 +11,7 @@ flutter: package: dev.fluttercommunity.plus.connectivity pluginClass: ConnectivityPlugin ios: - pluginClass: FLTConnectivityPlugin + pluginClass: FLTConnectivityPlusPlugin macos: default_package: connectivity_plus_macos web: From 94142acd4c131338dd07e7af4e7cf4c4d8133dd0 Mon Sep 17 00:00:00 2001 From: Miquel Beltran Date: Wed, 9 Dec 2020 13:39:45 +0100 Subject: [PATCH 5/6] remove connectivity package --- packages/connectivity_plus/example/pubspec.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/connectivity_plus/example/pubspec.yaml b/packages/connectivity_plus/example/pubspec.yaml index df60680fcd..3fd6f68a89 100644 --- a/packages/connectivity_plus/example/pubspec.yaml +++ b/packages/connectivity_plus/example/pubspec.yaml @@ -13,7 +13,6 @@ dev_dependencies: test: any integration_test: ^0.9.1 pedantic: ^1.8.0 - connectivity: ^2.0.2 flutter: uses-material-design: true From 212808ee330b828ffcdbe120568b7f5c134323df Mon Sep 17 00:00:00 2001 From: Miguel Beltran Date: Wed, 9 Dec 2020 13:55:27 +0100 Subject: [PATCH 6/6] updated versions and released --- packages/connectivity_plus/CHANGELOG.md | 5 +++++ packages/connectivity_plus/pubspec.yaml | 11 ++++------- packages/connectivity_plus_macos/CHANGELOG.md | 4 ++++ packages/connectivity_plus_macos/pubspec.yaml | 5 ++--- .../connectivity_plus_platform_interface/CHANGELOG.md | 4 ++++ .../connectivity_plus_platform_interface/pubspec.yaml | 2 +- packages/connectivity_plus_web/CHANGELOG.md | 4 ++++ packages/connectivity_plus_web/pubspec.yaml | 5 ++--- 8 files changed, 26 insertions(+), 14 deletions(-) diff --git a/packages/connectivity_plus/CHANGELOG.md b/packages/connectivity_plus/CHANGELOG.md index 740336f565..a8e5b7e37c 100644 --- a/packages/connectivity_plus/CHANGELOG.md +++ b/packages/connectivity_plus/CHANGELOG.md @@ -1,3 +1,8 @@ +## 0.6.0 + +- Fix issue #56: Rename Android and iOS classes and Method Channel to avoid +collision with the original connectivity package. + ## 0.5.0 - Transfer to plus-plugins monorepo diff --git a/packages/connectivity_plus/pubspec.yaml b/packages/connectivity_plus/pubspec.yaml index a361d758c0..f68db96246 100644 --- a/packages/connectivity_plus/pubspec.yaml +++ b/packages/connectivity_plus/pubspec.yaml @@ -1,6 +1,6 @@ name: connectivity_plus description: Flutter plugin for discovering the state of the network (WiFi & mobile/cellular) connectivity on Android and iOS. -version: 0.5.0 +version: 0.6.0 homepage: https://plus.fluttercommunity.dev/ repository: https://github.com/fluttercommunity/plus_plugins/tree/main/packages/ @@ -21,12 +21,9 @@ dependencies: flutter: sdk: flutter meta: ^1.0.5 - connectivity_plus_platform_interface: - path: ../connectivity_plus_platform_interface - connectivity_plus_macos: - path: ../connectivity_plus_macos - connectivity_plus_web: - path: ../connectivity_plus_web + connectivity_plus_platform_interface: ^0.3.0 + connectivity_plus_macos: ^0.3.0 + connectivity_plus_web: ^0.5.0 dev_dependencies: flutter_test: diff --git a/packages/connectivity_plus_macos/CHANGELOG.md b/packages/connectivity_plus_macos/CHANGELOG.md index bf08bcf9fe..0d82fc6421 100644 --- a/packages/connectivity_plus_macos/CHANGELOG.md +++ b/packages/connectivity_plus_macos/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.3.0 + +- Updated platform interface + ## 0.2.0 - Transfer to plus-plugins monorepo diff --git a/packages/connectivity_plus_macos/pubspec.yaml b/packages/connectivity_plus_macos/pubspec.yaml index c7938d1e0e..26fc43194f 100644 --- a/packages/connectivity_plus_macos/pubspec.yaml +++ b/packages/connectivity_plus_macos/pubspec.yaml @@ -1,6 +1,6 @@ name: connectivity_plus_macos description: macOS implementation of the connectivity_plus plugin. -version: 0.2.0 +version: 0.3.0 homepage: https://plus.fluttercommunity.dev/ repository: https://github.com/fluttercommunity/plus_plugins/tree/main/packages/ @@ -15,8 +15,7 @@ environment: flutter: '>=1.20.0' dependencies: - connectivity_plus_platform_interface: - path: ../connectivity_plus_platform_interface + connectivity_plus_platform_interface: ^0.3.0 flutter: sdk: flutter diff --git a/packages/connectivity_plus_platform_interface/CHANGELOG.md b/packages/connectivity_plus_platform_interface/CHANGELOG.md index 5f818a4783..8c818ec8f7 100644 --- a/packages/connectivity_plus_platform_interface/CHANGELOG.md +++ b/packages/connectivity_plus_platform_interface/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.3.0 + +- Renamed method channel + ## 0.2.0 - Transfer to plus-plugins monorepo diff --git a/packages/connectivity_plus_platform_interface/pubspec.yaml b/packages/connectivity_plus_platform_interface/pubspec.yaml index 18e774fd8d..c3684e656e 100644 --- a/packages/connectivity_plus_platform_interface/pubspec.yaml +++ b/packages/connectivity_plus_platform_interface/pubspec.yaml @@ -1,6 +1,6 @@ name: connectivity_plus_platform_interface description: A common platform interface for the connectivity_plus plugin. -version: 0.2.0 +version: 0.3.0 homepage: https://plus.fluttercommunity.dev/ repository: https://github.com/fluttercommunity/plus_plugins/tree/main/packages/ diff --git a/packages/connectivity_plus_web/CHANGELOG.md b/packages/connectivity_plus_web/CHANGELOG.md index a6b16e5d73..b8afc8d26e 100644 --- a/packages/connectivity_plus_web/CHANGELOG.md +++ b/packages/connectivity_plus_web/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.5.0 + +- Updated platform interface + ## 0.4.0 - Transfer to plus-plugins monorepo diff --git a/packages/connectivity_plus_web/pubspec.yaml b/packages/connectivity_plus_web/pubspec.yaml index db3175dc34..a92df8874f 100644 --- a/packages/connectivity_plus_web/pubspec.yaml +++ b/packages/connectivity_plus_web/pubspec.yaml @@ -1,6 +1,6 @@ name: connectivity_plus_web description: An implementation for the web platform of the Flutter `connectivity_plus` plugin. This uses the NetworkInformation Web API, with a fallback to Navigator.onLine. -version: 0.4.0 +version: 0.5.0 homepage: https://plus.fluttercommunity.dev/ repository: https://github.com/fluttercommunity/plus_plugins/tree/main/packages/ @@ -12,8 +12,7 @@ flutter: fileName: connectivity_plus_web.dart dependencies: - connectivity_plus_platform_interface: - path: ../connectivity_plus_platform_interface + connectivity_plus_platform_interface: ^0.3.0 flutter_web_plugins: sdk: flutter flutter: