From fd78856539021446311c9a0ae4a1ba94fb01a885 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Byszewski?= <4048063+pawelByszewski@users.noreply.github.com> Date: Mon, 21 Oct 2019 13:56:09 +0200 Subject: [PATCH] Mba cocoapods (#281) * [ios] Use MBA from cocoapods * remove submodule - MBA * [ios] Set ios deployment target to 10.0 and MBA to 0.0.3 --- .gitmodules | 3 --- MultiPlatformBleAdapter | 1 - example/ios/Podfile.lock | 9 ++++++++- example/ios/Runner.xcodeproj/project.pbxproj | 6 +++--- ios/Classes/FlutterBleLibPlugin.m | 2 ++ ios/flutter_ble_lib.podspec | 7 +++---- 6 files changed, 16 insertions(+), 12 deletions(-) delete mode 160000 MultiPlatformBleAdapter diff --git a/.gitmodules b/.gitmodules index 6031a6e0..e69de29b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +0,0 @@ -[submodule "MultiPlatformBleAdapter"] - path = MultiPlatformBleAdapter - url = ../MultiPlatformBleAdapter.git diff --git a/MultiPlatformBleAdapter b/MultiPlatformBleAdapter deleted file mode 160000 index 050fd3cd..00000000 --- a/MultiPlatformBleAdapter +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 050fd3cd201f2a78f74d8f39e0fc2c87e938d7a7 diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock index 893ab11b..53350e1d 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -2,11 +2,17 @@ PODS: - Flutter (1.0.0) - flutter_ble_lib (0.0.1): - Flutter + - MultiplatformBleAdapter (= 0.0.3) + - MultiplatformBleAdapter (0.0.3) DEPENDENCIES: - Flutter (from `.symlinks/flutter/ios`) - flutter_ble_lib (from `.symlinks/plugins/flutter_ble_lib/ios`) +SPEC REPOS: + https://github.com/cocoapods/specs.git: + - MultiplatformBleAdapter + EXTERNAL SOURCES: Flutter: :path: ".symlinks/flutter/ios" @@ -15,7 +21,8 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: Flutter: 0e3d915762c693b495b44d77113d4970485de6ec - flutter_ble_lib: 781486fe8aa3656658d6e708617c58ef1d939098 + flutter_ble_lib: 076e8a202cc9451062266ae0b63f6d751dad3282 + MultiplatformBleAdapter: 8bfb5f6479d84443d6fb5d9350efc715664d4865 PODFILE CHECKSUM: 7fb83752f59ead6285236625b82473f90b1cb932 diff --git a/example/ios/Runner.xcodeproj/project.pbxproj b/example/ios/Runner.xcodeproj/project.pbxproj index b54ffd34..db859d3c 100644 --- a/example/ios/Runner.xcodeproj/project.pbxproj +++ b/example/ios/Runner.xcodeproj/project.pbxproj @@ -377,7 +377,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; @@ -463,7 +463,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -513,7 +513,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; diff --git a/ios/Classes/FlutterBleLibPlugin.m b/ios/Classes/FlutterBleLibPlugin.m index 19b4a5b4..985cfa63 100644 --- a/ios/Classes/FlutterBleLibPlugin.m +++ b/ios/Classes/FlutterBleLibPlugin.m @@ -14,6 +14,8 @@ #import "ResponseConverter/CharacteristicResponseConverter.h" #import "ResponseConverter/PeripheralResponseConverter.h" +@import MultiplatformBleAdapter; + typedef void (^Resolve)(id result); typedef void (^Reject)(NSString *code, NSString *message, NSError *error); diff --git a/ios/flutter_ble_lib.podspec b/ios/flutter_ble_lib.podspec index e4d0e305..0b149349 100644 --- a/ios/flutter_ble_lib.podspec +++ b/ios/flutter_ble_lib.podspec @@ -13,11 +13,10 @@ A new flutter plugin project. s.author = { 'Your Company' => 'email@example.com' } s.source = { :path => '.' } s.source_files = 'Classes/**/*' - s.public_header_files = 'Classes/**/*.h' + s.public_header_files = 'Classes/**/*.h' s.dependency 'Flutter' + s.dependency 'MultiplatformBleAdapter', '0.0.3' - s.ios.deployment_target = '8.0' - - s.swift_version = '4.0' + s.ios.deployment_target = '10.0' end