Skip to content

Commit 630922f

Browse files
committed
Bump Java to 17, AGP to 7.4.2, Kotlin to 1.9.23
Signed-off-by: Shengqi Chen <harry-chen@outlook.com>
1 parent dacfb96 commit 630922f

File tree

8 files changed

+18
-18
lines changed

8 files changed

+18
-18
lines changed

android/build.gradle

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ android {
1717

1818
namespace 'im.nfc.flutter_nfc_kit'
1919

20-
compileSdkVersion 33
20+
compileSdkVersion 34
2121

2222
compileOptions {
23-
sourceCompatibility JavaVersion.VERSION_11
24-
targetCompatibility JavaVersion.VERSION_11
23+
sourceCompatibility JavaVersion.VERSION_17
24+
targetCompatibility JavaVersion.VERSION_17
2525
}
2626

2727
sourceSets {
@@ -39,5 +39,5 @@ android {
3939
dependencies {
4040
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$KotlinVersion"
4141
implementation "org.jetbrains.kotlin:kotlin-reflect:$KotlinVersion"
42-
implementation 'androidx.core:core-ktx:1.10.1'
42+
implementation 'androidx.core:core-ktx:1.12.0'
4343
}

android/gradle.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
org.gradle.jvmargs=-Xmx1536M
22
android.useAndroidX=true
33
android.enableJetifier=true
4-
AGPVersion=7.0.4
5-
KotlinVersion=1.9.10
4+
AGPVersion=7.4.2
5+
KotlinVersion=1.9.23
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Fri Sep 08 22:01:14 CST 2023
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.2-bin.zip
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

android/src/main/kotlin/im/nfc/flutter_nfc_kit/FlutterNfcKitPlugin.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,7 @@ class FlutterNfcKitPlugin : FlutterPlugin, MethodCallHandler, ActivityAware {
451451
result.error("408", "Polling tag timeout", null)
452452
}
453453

454-
val pollHandler: NfcAdapter.ReaderCallback = { tag ->
454+
val pollHandler = NfcAdapter.ReaderCallback { tag ->
455455
pollingTimeoutTask?.cancel()
456456

457457
// common fields

example/android/app/build.gradle

+5-5
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ android {
3131

3232
namespace 'im.nfc.flutter_nfc_kit.example'
3333

34-
compileSdkVersion 33
34+
compileSdkVersion 34
3535

3636
compileOptions {
37-
sourceCompatibility JavaVersion.VERSION_11
38-
targetCompatibility JavaVersion.VERSION_11
37+
sourceCompatibility JavaVersion.VERSION_17
38+
targetCompatibility JavaVersion.VERSION_17
3939
}
4040

4141
sourceSets {
@@ -46,8 +46,8 @@ android {
4646
defaultConfig {
4747
applicationId "im.nfc.flutter_nfc_kit_example"
4848
minSdkVersion 19
49-
targetSdkVersion 33
50-
compileSdkVersion 33
49+
targetSdkVersion 34
50+
compileSdkVersion 34
5151
versionCode flutterVersionCode.toInteger()
5252
versionName flutterVersionName
5353
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

example/android/gradle.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
org.gradle.jvmargs=-Xmx1536M
22
android.useAndroidX=true
33
android.enableJetifier=true
4-
AGPVersion=7.0.4
5-
KotlinVersion=1.9.10
4+
AGPVersion=7.4.2
5+
KotlinVersion=1.9.23

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-7.5.1-all.zip
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip

example/pubspec.lock

+2-2
Original file line numberDiff line numberDiff line change
@@ -107,10 +107,10 @@ packages:
107107
dependency: transitive
108108
description:
109109
name: js
110-
sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3
110+
sha256: c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf
111111
url: "https://pub.dev"
112112
source: hosted
113-
version: "0.6.7"
113+
version: "0.7.1"
114114
json_annotation:
115115
dependency: transitive
116116
description:

0 commit comments

Comments
 (0)