Skip to content

Commit 8ac04d1

Browse files
committed
Bump AGP to 8.7.0, Kotlin to 2.1.0, update examples
Now it requires at least Java 17 and Gradle 8.9. See #179, #184, #187 Signed-off-by: Shengqi Chen <[email protected]>
1 parent 1934604 commit 8ac04d1

File tree

6 files changed

+45
-42
lines changed

6 files changed

+45
-42
lines changed

Diff for: android/build.gradle

+5-5
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,11 @@ group 'im.nfc.flutter_nfc_kit'
1515

1616
android {
1717

18-
namespace 'im.nfc.flutter_nfc_kit'
18+
if (project.android.hasProperty("namespace")) {
19+
namespace 'im.nfc.flutter_nfc_kit'
20+
}
1921

20-
compileSdkVersion 34
22+
compileSdk 35
2123

2224
compileOptions {
2325
sourceCompatibility JavaVersion.VERSION_17
@@ -33,6 +35,7 @@ android {
3335
}
3436
defaultConfig {
3537
minSdkVersion 26
38+
targetSdk flutter.targetSdkVersion
3639
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
3740
}
3841
lintOptions {
@@ -41,7 +44,4 @@ android {
4144
}
4245

4346
dependencies {
44-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$KotlinVersion"
45-
implementation "org.jetbrains.kotlin:kotlin-reflect:$KotlinVersion"
46-
implementation 'androidx.core:core-ktx:1.12.0'
4747
}

Diff for: android/gradle.properties

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
org.gradle.jvmargs=-Xmx1536M
2-
android.useAndroidX=true
32
android.enableJetifier=true
4-
AGPVersion=7.4.2
5-
KotlinVersion=1.9.23
3+
AGPVersion=8.7.0
4+
KotlinVersion=2.1.0

Diff for: example/android/app/build.gradle

+2-3
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ android {
2727

2828
namespace 'im.nfc.flutter_nfc_kit.example'
2929

30-
compileSdkVersion 34
30+
compileSdk 35
3131

3232
compileOptions {
3333
sourceCompatibility JavaVersion.VERSION_17
@@ -42,8 +42,7 @@ android {
4242
defaultConfig {
4343
applicationId "im.nfc.flutter_nfc_kit_example"
4444
minSdkVersion 26
45-
targetSdkVersion 34
46-
compileSdkVersion 34
45+
targetSdkVersion flutter.targetSdkVersion
4746
versionCode flutterVersionCode.toInteger()
4847
versionName flutterVersionName
4948
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

Diff for: example/android/gradle.properties

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
org.gradle.jvmargs=-Xmx1536M
2+
23
android.useAndroidX=true
34
android.enableJetifier=true
4-
AGPVersion=7.4.2
5-
KotlinVersion=1.9.23
5+
android.defaults.buildfeatures.buildconfig=true
6+
android.nonTransitiveRClass=false
7+
android.nonFinalResIds=false
8+
9+
AGPVersion=8.7.0
10+
KotlinVersion=2.1.0

Diff for: example/android/gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
33
zipStorePath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-all.zip

Diff for: example/pubspec.lock

+28-28
Original file line numberDiff line numberDiff line change
@@ -37,26 +37,26 @@ packages:
3737
dependency: transitive
3838
description:
3939
name: collection
40-
sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
40+
sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf
4141
url: "https://pub.dev"
4242
source: hosted
43-
version: "1.18.0"
43+
version: "1.19.0"
4444
convert:
4545
dependency: transitive
4646
description:
4747
name: convert
48-
sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592"
48+
sha256: b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68
4949
url: "https://pub.dev"
5050
source: hosted
51-
version: "3.1.1"
51+
version: "3.1.2"
5252
crypto:
5353
dependency: transitive
5454
description:
5555
name: crypto
56-
sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab
56+
sha256: "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855"
5757
url: "https://pub.dev"
5858
source: hosted
59-
version: "3.0.3"
59+
version: "3.0.6"
6060
cupertino_icons:
6161
dependency: "direct main"
6262
description:
@@ -77,10 +77,10 @@ packages:
7777
dependency: transitive
7878
description:
7979
name: fixnum
80-
sha256: "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1"
80+
sha256: b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be
8181
url: "https://pub.dev"
8282
source: hosted
83-
version: "1.1.0"
83+
version: "1.1.1"
8484
flutter:
8585
dependency: "direct main"
8686
description: flutter
@@ -123,18 +123,18 @@ packages:
123123
dependency: transitive
124124
description:
125125
name: leak_tracker
126-
sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
126+
sha256: "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06"
127127
url: "https://pub.dev"
128128
source: hosted
129-
version: "10.0.5"
129+
version: "10.0.7"
130130
leak_tracker_flutter_testing:
131131
dependency: transitive
132132
description:
133133
name: leak_tracker_flutter_testing
134-
sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
134+
sha256: "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379"
135135
url: "https://pub.dev"
136136
source: hosted
137-
version: "3.0.5"
137+
version: "3.0.8"
138138
leak_tracker_testing:
139139
dependency: transitive
140140
description:
@@ -147,10 +147,10 @@ packages:
147147
dependency: transitive
148148
description:
149149
name: logging
150-
sha256: "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340"
150+
sha256: c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61
151151
url: "https://pub.dev"
152152
source: hosted
153-
version: "1.2.0"
153+
version: "1.3.0"
154154
matcher:
155155
dependency: transitive
156156
description:
@@ -195,7 +195,7 @@ packages:
195195
dependency: transitive
196196
description: flutter
197197
source: sdk
198-
version: "0.0.99"
198+
version: "0.0.0"
199199
source_span:
200200
dependency: transitive
201201
description:
@@ -216,10 +216,10 @@ packages:
216216
dependency: transitive
217217
description:
218218
name: stack_trace
219-
sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
219+
sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377"
220220
url: "https://pub.dev"
221221
source: hosted
222-
version: "1.11.1"
222+
version: "1.12.0"
223223
stream_channel:
224224
dependency: transitive
225225
description:
@@ -232,10 +232,10 @@ packages:
232232
dependency: transitive
233233
description:
234234
name: string_scanner
235-
sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
235+
sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3"
236236
url: "https://pub.dev"
237237
source: hosted
238-
version: "1.2.0"
238+
version: "1.3.0"
239239
term_glyph:
240240
dependency: transitive
241241
description:
@@ -248,26 +248,26 @@ packages:
248248
dependency: transitive
249249
description:
250250
name: test_api
251-
sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
251+
sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c"
252252
url: "https://pub.dev"
253253
source: hosted
254-
version: "0.7.2"
254+
version: "0.7.3"
255255
typed_data:
256256
dependency: transitive
257257
description:
258258
name: typed_data
259-
sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c
259+
sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006
260260
url: "https://pub.dev"
261261
source: hosted
262-
version: "1.3.2"
262+
version: "1.4.0"
263263
uuid:
264264
dependency: transitive
265265
description:
266266
name: uuid
267-
sha256: "814e9e88f21a176ae1359149021870e87f7cddaf633ab678a5d2b0bff7fd1ba8"
267+
sha256: a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff
268268
url: "https://pub.dev"
269269
source: hosted
270-
version: "4.4.0"
270+
version: "4.5.1"
271271
vector_math:
272272
dependency: transitive
273273
description:
@@ -280,10 +280,10 @@ packages:
280280
dependency: transitive
281281
description:
282282
name: vm_service
283-
sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
283+
sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b
284284
url: "https://pub.dev"
285285
source: hosted
286-
version: "14.2.5"
286+
version: "14.3.0"
287287
sdks:
288-
dart: ">=3.3.0 <4.0.0"
288+
dart: ">=3.5.0 <4.0.0"
289289
flutter: ">=3.18.0-18.0.pre.54"

0 commit comments

Comments
 (0)