Skip to content

Commit 685e14a

Browse files
committed
Fix deprecation of Flutter Gradle plugin, bump minSdkVersion to 26 (fix #144)
Signed-off-by: Shengqi Chen <harry-chen@outlook.com>
1 parent f2ada92 commit 685e14a

File tree

4 files changed

+60
-39
lines changed

4 files changed

+60
-39
lines changed

android/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ android {
2828
main.java.srcDirs += 'src/main/kotlin'
2929
}
3030
defaultConfig {
31-
minSdkVersion 23
31+
minSdkVersion 26
3232
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
3333
}
3434
lintOptions {

example/android/app/build.gradle

+5-9
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
plugins {
2-
id 'com.android.application'
2+
id "com.android.application"
3+
id "kotlin-android"
4+
id "dev.flutter.flutter-gradle-plugin"
35
}
46

7+
58
def localProperties = new Properties()
69
def localPropertiesFile = rootProject.file('local.properties')
710
if (localPropertiesFile.exists()) {
@@ -10,11 +13,6 @@ if (localPropertiesFile.exists()) {
1013
}
1114
}
1215

13-
def flutterRoot = localProperties.getProperty('flutter.sdk')
14-
if (flutterRoot == null) {
15-
throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
16-
}
17-
1816
def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
1917
if (flutterVersionCode == null) {
2018
flutterVersionCode = '1'
@@ -25,8 +23,6 @@ if (flutterVersionName == null) {
2523
flutterVersionName = '1.0'
2624
}
2725

28-
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
29-
3026
android {
3127

3228
namespace 'im.nfc.flutter_nfc_kit.example'
@@ -45,7 +41,7 @@ android {
4541

4642
defaultConfig {
4743
applicationId "im.nfc.flutter_nfc_kit_example"
48-
minSdkVersion 23
44+
minSdkVersion 26
4945
targetSdkVersion 34
5046
compileSdkVersion 34
5147
versionCode flutterVersionCode.toInteger()

example/android/settings.gradle

+17-16
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,25 @@
11
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+
}()
9+
10+
includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
11+
212
repositories {
3-
gradlePluginPortal()
413
google()
514
mavenCentral()
6-
}
7-
plugins {
8-
id 'com.android.application' version "${AGPVersion}"
9-
id 'com.android.library' version "${AGPVersion}"
10-
id 'org.jetbrains.kotlin.android' version "${KotlinVersion}"
15+
gradlePluginPortal()
1116
}
1217
}
1318

14-
include ':app'
15-
16-
def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
17-
def properties = new Properties()
18-
19-
assert localPropertiesFile.exists()
20-
localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
19+
plugins {
20+
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
21+
id "com.android.application" version "${AGPVersion}" apply false
22+
id "org.jetbrains.kotlin.android" version "${KotlinVersion}" apply false
23+
}
2124

22-
def flutterSdkPath = properties.getProperty("flutter.sdk")
23-
assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
24-
apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle"
25+
include ":app"

example/pubspec.lock

+37-13
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,30 @@ packages:
119119
url: "https://pub.dev"
120120
source: hosted
121121
version: "4.8.1"
122+
leak_tracker:
123+
dependency: transitive
124+
description:
125+
name: leak_tracker
126+
sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa"
127+
url: "https://pub.dev"
128+
source: hosted
129+
version: "10.0.0"
130+
leak_tracker_flutter_testing:
131+
dependency: transitive
132+
description:
133+
name: leak_tracker_flutter_testing
134+
sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0
135+
url: "https://pub.dev"
136+
source: hosted
137+
version: "2.0.1"
138+
leak_tracker_testing:
139+
dependency: transitive
140+
description:
141+
name: leak_tracker_testing
142+
sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47
143+
url: "https://pub.dev"
144+
source: hosted
145+
version: "2.0.1"
122146
logging:
123147
dependency: transitive
124148
description:
@@ -131,26 +155,26 @@ packages:
131155
dependency: transitive
132156
description:
133157
name: matcher
134-
sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
158+
sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
135159
url: "https://pub.dev"
136160
source: hosted
137-
version: "0.12.16"
161+
version: "0.12.16+1"
138162
material_color_utilities:
139163
dependency: transitive
140164
description:
141165
name: material_color_utilities
142-
sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
166+
sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
143167
url: "https://pub.dev"
144168
source: hosted
145-
version: "0.5.0"
169+
version: "0.8.0"
146170
meta:
147171
dependency: transitive
148172
description:
149173
name: meta
150-
sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
174+
sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
151175
url: "https://pub.dev"
152176
source: hosted
153-
version: "1.10.0"
177+
version: "1.11.0"
154178
ndef:
155179
dependency: transitive
156180
description:
@@ -163,10 +187,10 @@ packages:
163187
dependency: transitive
164188
description:
165189
name: path
166-
sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
190+
sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
167191
url: "https://pub.dev"
168192
source: hosted
169-
version: "1.8.3"
193+
version: "1.9.0"
170194
sky_engine:
171195
dependency: transitive
172196
description: flutter
@@ -252,14 +276,14 @@ packages:
252276
url: "https://pub.dev"
253277
source: hosted
254278
version: "2.1.4"
255-
web:
279+
vm_service:
256280
dependency: transitive
257281
description:
258-
name: web
259-
sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152
282+
name: vm_service
283+
sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957
260284
url: "https://pub.dev"
261285
source: hosted
262-
version: "0.3.0"
286+
version: "13.0.0"
263287
sdks:
264-
dart: ">=3.2.0-194.0.dev <4.0.0"
288+
dart: ">=3.2.0-0 <4.0.0"
265289
flutter: ">=2.0.0"

0 commit comments

Comments
 (0)