Skip to content

Commit 77b0fc7

Browse files
committed
# Fixed
- Enabled compilation for iOS: Updates to podspec - Updated plugin to support flutter v3.32.0 - Bump file picker dependency version due to it not supporting flutter v3.32 - Bump target/compile SDK for android to v35. Requirements passed down from other other dependencies. - Bumped AGP version to v8.10.0. Requirements to support android v35 - Bumped gradle to 8.11.1 to support AGP version # Changed - Bump flutter version to minimum v3.7.2
1 parent 5f88fb7 commit 77b0fc7

File tree

10 files changed

+307
-219
lines changed

10 files changed

+307
-219
lines changed

android/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ buildscript {
99
}
1010

1111
dependencies {
12-
classpath 'com.android.tools.build:gradle:8.1.4'
12+
classpath 'com.android.tools.build:gradle:8.10.0'
1313
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1414
classpath 'com.squareup.wire:wire-gradle-plugin:4.9.3'
1515
}
@@ -28,14 +28,14 @@ apply plugin: 'com.squareup.wire'
2828

2929
android {
3030
namespace 'no.nordicsemi.android.mcumgr_flutter'
31-
compileSdk 33
31+
compileSdk 35
3232

3333
sourceSets {
3434
main.java.srcDirs += 'src/main/kotlin'
3535
}
3636
defaultConfig {
3737
minSdk 19
38-
targetSdk 33
38+
targetSdk 35
3939
}
4040
lintOptions {
4141
disable 'InvalidPackage'

example/android/app/build.gradle

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
plugins {
2+
id "com.android.application"
3+
id "kotlin-android"
4+
id "dev.flutter.flutter-gradle-plugin"
5+
}
6+
17
def localProperties = new Properties()
28
def localPropertiesFile = rootProject.file('local.properties')
39
if (localPropertiesFile.exists()) {
@@ -6,11 +12,6 @@ if (localPropertiesFile.exists()) {
612
}
713
}
814

9-
def flutterRoot = localProperties.getProperty('flutter.sdk')
10-
if (flutterRoot == null) {
11-
throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
12-
}
13-
1415
def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
1516
if (flutterVersionCode == null) {
1617
flutterVersionCode = '1'
@@ -21,12 +22,8 @@ if (flutterVersionName == null) {
2122
flutterVersionName = '1.0'
2223
}
2324

24-
apply plugin: 'com.android.application'
25-
apply plugin: 'kotlin-android'
26-
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
27-
2825
android {
29-
compileSdk 34
26+
compileSdk 35
3027

3128
sourceSets {
3229
main.java.srcDirs += 'src/main/kotlin'
@@ -48,7 +45,7 @@ android {
4845
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
4946
// applicationId "no.nordicsemi.android.example.mcumgr_flutter"
5047
minSdk 21
51-
targetSdk 34
48+
targetSdk 35
5249
versionCode flutterVersionCode.toInteger()
5350
versionName flutterVersionName
5451
}

example/android/build.gradle

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,3 @@
1-
buildscript {
2-
ext.kotlin_version = '1.9.20'
3-
repositories {
4-
google()
5-
mavenCentral()
6-
}
7-
8-
dependencies {
9-
classpath 'com.android.tools.build:gradle:8.1.4'
10-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
11-
}
12-
}
13-
141
allprojects {
152
repositories {
163
google()
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Thu Nov 18 15:52:23 CET 2021
1+
#Mon May 26 16:23:26 CEST 2025
22
distributionBase=GRADLE_USER_HOME
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
43
distributionPath=wrapper/dists
5-
zipStorePath=wrapper/dists
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
65
zipStoreBase=GRADLE_USER_HOME
6+
zipStorePath=wrapper/dists

example/android/settings.gradle

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,25 @@
1-
include ':app'
1+
pluginManagement {
2+
def flutterSdkPath = {
3+
def properties = new Properties()
4+
file("local.properties").withInputStream { properties.load(it) }
5+
def flutterSdkPath = properties.getProperty("flutter.sdk")
6+
assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
7+
return flutterSdkPath
8+
}()
29

3-
def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
4-
def properties = new Properties()
10+
includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
511

6-
assert localPropertiesFile.exists()
7-
localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
12+
repositories {
13+
google()
14+
mavenCentral()
15+
gradlePluginPortal()
16+
}
17+
}
818

9-
def flutterSdkPath = properties.getProperty("flutter.sdk")
10-
assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
11-
apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle"
19+
plugins {
20+
id "dev.flutter.flutter-plugin-loader" version "1.0.0" // apply true
21+
id "com.android.application" version "8.10.0" apply false
22+
id "org.jetbrains.kotlin.android" version "1.9.20" apply false
23+
}
24+
25+
include ":app"

example/ios/Podfile.lock

Lines changed: 45 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
11
PODS:
2-
- DKImagePickerController/Core (4.3.4):
2+
- DKImagePickerController/Core (4.3.9):
33
- DKImagePickerController/ImageDataManager
44
- DKImagePickerController/Resource
5-
- DKImagePickerController/ImageDataManager (4.3.4)
6-
- DKImagePickerController/PhotoGallery (4.3.4):
5+
- DKImagePickerController/ImageDataManager (4.3.9)
6+
- DKImagePickerController/PhotoGallery (4.3.9):
77
- DKImagePickerController/Core
88
- DKPhotoGallery
9-
- DKImagePickerController/Resource (4.3.4)
10-
- DKPhotoGallery (0.0.17):
11-
- DKPhotoGallery/Core (= 0.0.17)
12-
- DKPhotoGallery/Model (= 0.0.17)
13-
- DKPhotoGallery/Preview (= 0.0.17)
14-
- DKPhotoGallery/Resource (= 0.0.17)
9+
- DKImagePickerController/Resource (4.3.9)
10+
- DKPhotoGallery (0.0.19):
11+
- DKPhotoGallery/Core (= 0.0.19)
12+
- DKPhotoGallery/Model (= 0.0.19)
13+
- DKPhotoGallery/Preview (= 0.0.19)
14+
- DKPhotoGallery/Resource (= 0.0.19)
1515
- SDWebImage
1616
- SwiftyGif
17-
- DKPhotoGallery/Core (0.0.17):
17+
- DKPhotoGallery/Core (0.0.19):
1818
- DKPhotoGallery/Model
1919
- DKPhotoGallery/Preview
2020
- SDWebImage
2121
- SwiftyGif
22-
- DKPhotoGallery/Model (0.0.17):
22+
- DKPhotoGallery/Model (0.0.19):
2323
- SDWebImage
2424
- SwiftyGif
25-
- DKPhotoGallery/Preview (0.0.17):
25+
- DKPhotoGallery/Preview (0.0.19):
2626
- DKPhotoGallery/Model
2727
- DKPhotoGallery/Resource
2828
- SDWebImage
2929
- SwiftyGif
30-
- DKPhotoGallery/Resource (0.0.17):
30+
- DKPhotoGallery/Resource (0.0.19):
3131
- SDWebImage
3232
- SwiftyGif
3333
- file_picker (0.0.1):
@@ -36,31 +36,33 @@ PODS:
3636
- Flutter (1.0.0)
3737
- flutter_archive (0.0.1):
3838
- Flutter
39-
- ZIPFoundation (= 0.9.13)
40-
- flutter_blue_plus (0.0.1):
39+
- ZIPFoundation (= 0.9.19)
40+
- flutter_blue_plus_darwin (0.0.2):
4141
- Flutter
42-
- iOSMcuManagerLibrary (1.6):
43-
- SwiftCBOR (= 0.4.4)
42+
- FlutterMacOS
43+
- iOSMcuManagerLibrary (1.9.2):
44+
- SwiftCBOR (= 0.4.7)
45+
- ZIPFoundation (= 0.9.19)
4446
- mcumgr_flutter (0.0.2):
4547
- Flutter
46-
- iOSMcuManagerLibrary (= 1.6)
48+
- iOSMcuManagerLibrary (= 1.9.2)
4749
- SwiftProtobuf
4850
- path_provider_foundation (0.0.1):
4951
- Flutter
5052
- FlutterMacOS
51-
- SDWebImage (5.19.0):
52-
- SDWebImage/Core (= 5.19.0)
53-
- SDWebImage/Core (5.19.0)
54-
- SwiftCBOR (0.4.4)
55-
- SwiftProtobuf (1.25.2)
56-
- SwiftyGif (5.4.4)
57-
- ZIPFoundation (0.9.13)
53+
- SDWebImage (5.21.0):
54+
- SDWebImage/Core (= 5.21.0)
55+
- SDWebImage/Core (5.21.0)
56+
- SwiftCBOR (0.4.7)
57+
- SwiftProtobuf (1.30.0)
58+
- SwiftyGif (5.4.5)
59+
- ZIPFoundation (0.9.19)
5860

5961
DEPENDENCIES:
6062
- file_picker (from `.symlinks/plugins/file_picker/ios`)
6163
- Flutter (from `Flutter`)
6264
- flutter_archive (from `.symlinks/plugins/flutter_archive/ios`)
63-
- flutter_blue_plus (from `.symlinks/plugins/flutter_blue_plus/ios`)
65+
- flutter_blue_plus_darwin (from `.symlinks/plugins/flutter_blue_plus_darwin/darwin`)
6466
- mcumgr_flutter (from `.symlinks/plugins/mcumgr_flutter/ios`)
6567
- path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
6668

@@ -82,29 +84,29 @@ EXTERNAL SOURCES:
8284
:path: Flutter
8385
flutter_archive:
8486
:path: ".symlinks/plugins/flutter_archive/ios"
85-
flutter_blue_plus:
86-
:path: ".symlinks/plugins/flutter_blue_plus/ios"
87+
flutter_blue_plus_darwin:
88+
:path: ".symlinks/plugins/flutter_blue_plus_darwin/darwin"
8789
mcumgr_flutter:
8890
:path: ".symlinks/plugins/mcumgr_flutter/ios"
8991
path_provider_foundation:
9092
:path: ".symlinks/plugins/path_provider_foundation/darwin"
9193

9294
SPEC CHECKSUMS:
93-
DKImagePickerController: b512c28220a2b8ac7419f21c491fc8534b7601ac
94-
DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179
95-
file_picker: 15fd9539e4eb735dc54bae8c0534a7a9511a03de
96-
Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
97-
flutter_archive: 1805fdd3a695fd284b43edb53dc35ca843fb761c
98-
flutter_blue_plus: 4837da7d00cf5d441fdd6635b3a57f936778ea96
99-
iOSMcuManagerLibrary: 4102a4595be1c69e5286d7f1520a733c82c30b0a
100-
mcumgr_flutter: 097e59bec5917b527ba6d095da57bdaed2de1fa2
101-
path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943
102-
SDWebImage: 981fd7e860af070920f249fd092420006014c3eb
103-
SwiftCBOR: ce5354ec8b660da2d6fc754462881119dbe1f963
104-
SwiftProtobuf: 407a385e97fd206c4fbe880cc84123989167e0d1
105-
SwiftyGif: 93a1cc87bf3a51916001cf8f3d63835fb64c819f
106-
ZIPFoundation: ae5b4b813d216d3bf0a148773267fff14bd51d37
95+
DKImagePickerController: 946cec48c7873164274ecc4624d19e3da4c1ef3c
96+
DKPhotoGallery: b3834fecb755ee09a593d7c9e389d8b5d6deed60
97+
file_picker: a0560bc09d61de87f12d246fc47d2119e6ef37be
98+
Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
99+
flutter_archive: ad8edfd7f7d1bb12058d05424ba93e27d9930efe
100+
flutter_blue_plus_darwin: 20a08bfeaa0f7804d524858d3d8744bcc1b6dbc3
101+
iOSMcuManagerLibrary: 37ee5ab2a62e0e8ea4f0c5b85fa2a04d7872b7bb
102+
mcumgr_flutter: f55a8f256f9550b099b0ff6e9e562f7669ca323f
103+
path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
104+
SDWebImage: f84b0feeb08d2d11e6a9b843cb06d75ebf5b8868
105+
SwiftCBOR: 465775bed0e8bac7bfb8160bcf7b95d7f75971e4
106+
SwiftProtobuf: 3697407f0d5b23bedeba9c2eaaf3ec6fdff69349
107+
SwiftyGif: 706c60cf65fa2bc5ee0313beece843c8eb8194d4
108+
ZIPFoundation: b8c29ea7ae353b309bc810586181fd073cb3312c
107109

108110
PODFILE CHECKSUM: ef19549a9bc3046e7bb7d2fab4d021637c0c58a3
109111

110-
COCOAPODS: 1.14.3
112+
COCOAPODS: 1.16.2

0 commit comments

Comments
 (0)