From f7865cd607f7ef49aa1f6a6719bdfa552799e469 Mon Sep 17 00:00:00 2001
From: Julian Steenbakker <jst@beverinnovations.com>
Date: Mon, 13 Feb 2023 17:01:40 +0100
Subject: [PATCH] release of v6.0.0

---
 CHANGELOG.md                                  |  8 ++++--
 .../android/app/src/main/AndroidManifest.xml  |  2 +-
 .../gradle/wrapper/gradle-wrapper.properties  |  4 +--
 example/ios/Runner.xcodeproj/project.pbxproj  | 28 +++++++++++++------
 example/ios/Runner/Info.plist                 |  2 ++
 example/pubspec.yaml                          |  6 ++--
 ios/Classes/NordicDfuPlugin.swift             | 14 ----------
 lib/src/ios_special_parameter.dart            | 17 +++++------
 pubspec.yaml                                  |  2 +-
 9 files changed, 43 insertions(+), 40 deletions(-)
 delete mode 100644 ios/Classes/NordicDfuPlugin.swift

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 541e496..761cb4d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
-## 5.3.0
-[Android] Add dataDelay and numberOfRetries parameters to androidSpecialParameter.
+## 6.0.0
+macOS is now supported! The configuration is the same as for iOS.
+
+Other changes:
+* [Android] Add dataDelay and numberOfRetries parameters to androidSpecialParameter.
+* [iOS] packetReceiptNotificationParameter parameter is added. Set this to 1 if you get error 308.
 
 ## 5.2.1
 [Android] revert kotlin 1.8.0 to 1.7.10 due to compatibility issues.
diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml
index 7913e01..f6a4aa8 100644
--- a/example/android/app/src/main/AndroidManifest.xml
+++ b/example/android/app/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="dev.steenbakker.nordicdfuexample">
+    package="dev.steenbakker.nordic_dfu_example">
 
     <!-- The INTERNET permission is required for development. Specifically,
          flutter needs it to communicate with the running application
diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties
index 17e0bd9..c5e4e1b 100644
--- a/example/android/gradle/wrapper/gradle-wrapper.properties
+++ b/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Sep 22 15:20:20 CEST 2022
+#Mon Feb 13 14:58:26 CET 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/example/ios/Runner.xcodeproj/project.pbxproj b/example/ios/Runner.xcodeproj/project.pbxproj
index 604ea5d..7652092 100644
--- a/example/ios/Runner.xcodeproj/project.pbxproj
+++ b/example/ios/Runner.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 50;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -169,7 +169,6 @@
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {
 						CreatedOnToolsVersion = 7.3.1;
-						DevelopmentTeam = RCH2VG82SH;
 						LastSwiftMigration = 0910;
 					};
 				};
@@ -211,6 +210,7 @@
 /* Begin PBXShellScriptBuildPhase section */
 		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
 			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);
@@ -230,17 +230,17 @@
 			);
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
-				"${BUILT_PRODUCTS_DIR}/Protobuf/Protobuf.framework",
+				"${BUILT_PRODUCTS_DIR}/Protobuf/protobuf.framework",
 				"${BUILT_PRODUCTS_DIR}/ZIPFoundation/ZIPFoundation.framework",
-				"${BUILT_PRODUCTS_DIR}/flutter_blue_plus/flutter_blue_plus.framework",
+				"${BUILT_PRODUCTS_DIR}/flutter_blue/flutter_blue.framework",
 				"${BUILT_PRODUCTS_DIR}/iOSDFULibrary/iOSDFULibrary.framework",
 				"${BUILT_PRODUCTS_DIR}/nordic_dfu/nordic_dfu.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Protobuf.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/protobuf.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ZIPFoundation.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_blue_plus.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_blue.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/iOSDFULibrary.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/nordic_dfu.framework",
 			);
@@ -251,6 +251,7 @@
 		};
 		9740EEB61CF901F6004384FC /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);
@@ -380,7 +381,10 @@
 				);
 				INFOPLIST_FILE = Runner/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
@@ -508,7 +512,10 @@
 				);
 				INFOPLIST_FILE = Runner/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
@@ -538,7 +545,10 @@
 				);
 				INFOPLIST_FILE = Runner/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
diff --git a/example/ios/Runner/Info.plist b/example/ios/Runner/Info.plist
index 4c6c220..ca08cce 100644
--- a/example/ios/Runner/Info.plist
+++ b/example/ios/Runner/Info.plist
@@ -47,5 +47,7 @@
 	<string>Play with BLE Compatible devices</string>
 	<key>CADisableMinimumFrameDurationOnPhone</key>
 	<true/>
+	<key>UIApplicationSupportsIndirectInputEvents</key>
+	<true/>
 </dict>
 </plist>
diff --git a/example/pubspec.yaml b/example/pubspec.yaml
index 603b913..bb99810 100644
--- a/example/pubspec.yaml
+++ b/example/pubspec.yaml
@@ -3,7 +3,7 @@ description: Demonstrates how to use the nordic_dfu plugin.
 publish_to: 'none'
 
 environment:
-  sdk: '>=2.12.0 <3.0.0'
+  sdk: '>=2.12.0 <4.0.0'
 
 dependencies:
   collection: ^1.16.0
@@ -12,12 +12,12 @@ dependencies:
   flutter_blue: ^0.8.0
   nordic_dfu:
     path: ../
-  permission_handler: ^10.0.1
+  permission_handler: ^10.2.0
 
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  lint: ^1.10.0
+  lint: ^2.0.1
 
 flutter:
   uses-material-design: true
diff --git a/ios/Classes/NordicDfuPlugin.swift b/ios/Classes/NordicDfuPlugin.swift
deleted file mode 100644
index 0d81f44..0000000
--- a/ios/Classes/NordicDfuPlugin.swift
+++ /dev/null
@@ -1,14 +0,0 @@
-import Flutter
-import UIKit
-
-public class NordicDfuPlugin: NSObject, FlutterPlugin {
-  public static func register(with registrar: FlutterPluginRegistrar) {
-    let channel = FlutterMethodChannel(name: "nordic_dfu", binaryMessenger: registrar.messenger())
-    let instance = NordicDfuPlugin()
-    registrar.addMethodCallDelegate(instance, channel: channel)
-  }
-
-  public func handle(_ call: FlutterMethodCall, result: @escaping FlutterResult) {
-    result("iOS " + UIDevice.current.systemVersion)
-  }
-}
diff --git a/lib/src/ios_special_parameter.dart b/lib/src/ios_special_parameter.dart
index 6724755..62ffb45 100644
--- a/lib/src/ios_special_parameter.dart
+++ b/lib/src/ios_special_parameter.dart
@@ -82,14 +82,15 @@ class IosSpecialParameter {
   /// notification will be disabled by the DFU target. Default value is 12.
   final int? packetReceiptNotificationParameter;
 
-  const IosSpecialParameter(
-      {this.alternativeAdvertisingNameEnabled,
-      this.forceScanningForNewAddressInLegacyDfu,
-      this.connectionTimeout,
-      this.dataObjectPreparationDelay,
-      this.alternativeAdvertisingName,
-      this.disableResume,
-      this.packetReceiptNotificationParameter,});
+  const IosSpecialParameter({
+    this.alternativeAdvertisingNameEnabled,
+    this.forceScanningForNewAddressInLegacyDfu,
+    this.connectionTimeout,
+    this.dataObjectPreparationDelay,
+    this.alternativeAdvertisingName,
+    this.disableResume,
+    this.packetReceiptNotificationParameter,
+  });
 
   Map<String, dynamic> toJson() => {
         'alternativeAdvertisingNameEnabled': alternativeAdvertisingNameEnabled,
diff --git a/pubspec.yaml b/pubspec.yaml
index 8e638be..da17f5a 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -4,7 +4,7 @@ version: 6.0.0
 homepage: https://github.com/juliansteenbakker/nordic_dfu
 
 environment:
-  sdk: '>=2.12.0 <3.0.0'
+  sdk: '>=2.12.0 <4.0.0'
   flutter: '>=1.10.0'
 
 dependencies: