diff --git a/android/build.gradle b/android/build.gradle index a160b04..e53756c 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -25,7 +25,7 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' android { - compileSdk 33 + compileSdk 34 sourceSets { main.java.srcDirs += 'src/main/kotlin' } diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index 925507c..c14ff5a 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -26,7 +26,7 @@ apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdk 33 + compileSdk 34 sourceSets { main.java.srcDirs += 'src/main/kotlin' @@ -36,7 +36,7 @@ android { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "dev.steenbakker.nordicdfuexample" minSdkVersion 21 - targetSdkVersion 33 + targetSdkVersion 34 versionCode flutterVersionCode.toInteger() versionName flutterVersionName } diff --git a/example/android/build.gradle b/example/android/build.gradle index 9086c2b..8614a9e 100644 --- a/example/android/build.gradle +++ b/example/android/build.gradle @@ -6,7 +6,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.1.0' + classpath 'com.android.tools.build:gradle:8.1.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties index dd60680..bfbc341 100644 --- a/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/example/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Jul 31 21:10:39 CEST 2023 +#Tue Oct 10 12:30:18 CEST 2023 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/example/lib/main.dart b/example/lib/main.dart index f0a2b85..33b92af 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -1,7 +1,6 @@ import 'dart:async'; import 'dart:io'; -import 'package:collection/collection.dart' show IterableExtension; import 'package:flutter/material.dart'; import 'package:flutter_blue_plus/flutter_blue_plus.dart'; import 'package:nordic_dfu/nordic_dfu.dart'; @@ -196,8 +195,8 @@ class DeviceItem extends StatelessWidget { @override Widget build(BuildContext context) { var name = 'Unknown'; - if (scanResult.device.platformName.isNotEmpty) { - name = scanResult.device.platformName; + if (scanResult.device.localName.isNotEmpty) { + name = scanResult.device.localName; } return Card( child: Padding( diff --git a/example/pubspec.yaml b/example/pubspec.yaml index c45b642..789662d 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -6,10 +6,10 @@ environment: sdk: '>=2.12.0 <4.0.0' dependencies: - collection: ^1.16.0 + collection: ^1.15.0 flutter: sdk: flutter - flutter_blue_plus: ^1.12.8 + flutter_blue_plus: 1.14.24 nordic_dfu: path: ../ permission_handler: ^10.4.3