Skip to content

Commit

Permalink
imp: update android sdk
Browse files Browse the repository at this point in the history
  • Loading branch information
juliansteenbakker committed Oct 10, 2023
1 parent ed1a012 commit 40d1ccd
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 11 deletions.
2 changes: 1 addition & 1 deletion android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
Expand Down
4 changes: 2 additions & 2 deletions example/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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
}
Expand Down
2 changes: 1 addition & 1 deletion example/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
Expand Down
4 changes: 2 additions & 2 deletions example/android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
5 changes: 2 additions & 3 deletions example/lib/main.dart
Original file line number Diff line number Diff line change
@@ -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';
Expand Down Expand Up @@ -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(
Expand Down
4 changes: 2 additions & 2 deletions example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 40d1ccd

Please sign in to comment.