Skip to content

Commit 23a950e

Browse files
authored
[shared_preferences] updates build files to use JVM 17 (#10131)
Update minimum flutter version to 3.35 to force a minimum AGP version to something that requires java 17. part of [#176027](flutter/flutter#176027) All dart code changes were formatter changes. ## Pre-Review Checklist **Note**: The Flutter team is currently trialing the use of [Gemini Code Assist for GitHub](https://developers.google.com/gemini-code-assist/docs/review-github-code). Comments from the `gemini-code-assist` bot should not be taken as authoritative feedback from the Flutter team. If you find its comments useful you can update your code accordingly, but if you are unsure or disagree with the feedback, please feel free to wait for a Flutter team member's review for guidance on which automated comments should be addressed. [^1]: Regular contributors who have demonstrated familiarity with the repository guidelines only need to comment if the PR is not auto-exempted by repo tooling.
1 parent 5fd5f74 commit 23a950e

File tree

7 files changed

+26
-20
lines changed

7 files changed

+26
-20
lines changed

packages/shared_preferences/shared_preferences_android/CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## 2.4.14
2+
3+
* Updates Java compatibility version to 17.
4+
* Updates minimum supported SDK version to Flutter 3.35/Dart 3.9.
5+
16
## 2.4.13
27

38
* Bumps androidx.datastore:datastore from 1.1.3 to 1.1.7.

packages/shared_preferences/shared_preferences_android/android/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ android {
3737
compileSdk = flutter.compileSdkVersion
3838

3939
compileOptions {
40-
sourceCompatibility = JavaVersion.VERSION_11
41-
targetCompatibility = JavaVersion.VERSION_11
40+
sourceCompatibility = JavaVersion.VERSION_17
41+
targetCompatibility = JavaVersion.VERSION_17
4242
}
4343

4444
kotlinOptions {
45-
jvmTarget = '11'
45+
jvmTarget = JavaVersion.VERSION_17.toString()
4646
}
4747

4848
sourceSets {

packages/shared_preferences/shared_preferences_android/example/android/app/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@ android {
4141
ndkVersion = flutter.ndkVersion
4242

4343
compileOptions {
44-
sourceCompatibility = JavaVersion.VERSION_11
45-
targetCompatibility = JavaVersion.VERSION_11
44+
sourceCompatibility = JavaVersion.VERSION_17
45+
targetCompatibility = JavaVersion.VERSION_17
4646
}
4747

4848
kotlinOptions {
49-
jvmTarget = '11'
49+
jvmTarget = '17'
5050
}
5151

5252
sourceSets {

packages/shared_preferences/shared_preferences_android/lib/src/messages.g.dart

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,9 @@ class SharedPreferencesApi {
4747
BinaryMessenger? binaryMessenger,
4848
String messageChannelSuffix = '',
4949
}) : pigeonVar_binaryMessenger = binaryMessenger,
50-
pigeonVar_messageChannelSuffix =
51-
messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : '';
50+
pigeonVar_messageChannelSuffix = messageChannelSuffix.isNotEmpty
51+
? '.$messageChannelSuffix'
52+
: '';
5253
final BinaryMessenger? pigeonVar_binaryMessenger;
5354

5455
static const MessageCodec<Object?> pigeonChannelCodec = _PigeonCodec();

packages/shared_preferences/shared_preferences_android/lib/src/messages_async.g.dart

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,9 @@ class SharedPreferencesAsyncApi {
117117
BinaryMessenger? binaryMessenger,
118118
String messageChannelSuffix = '',
119119
}) : pigeonVar_binaryMessenger = binaryMessenger,
120-
pigeonVar_messageChannelSuffix =
121-
messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : '';
120+
pigeonVar_messageChannelSuffix = messageChannelSuffix.isNotEmpty
121+
? '.$messageChannelSuffix'
122+
: '';
122123
final BinaryMessenger? pigeonVar_binaryMessenger;
123124

124125
static const MessageCodec<Object?> pigeonChannelCodec = _PigeonCodec();

packages/shared_preferences/shared_preferences_android/pubspec.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ name: shared_preferences_android
22
description: Android implementation of the shared_preferences plugin
33
repository: https://github.com/flutter/packages/tree/main/packages/shared_preferences/shared_preferences_android
44
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+shared_preferences%22
5-
version: 2.4.13
5+
version: 2.4.14
66

77
environment:
8-
sdk: ^3.7.0
9-
flutter: ">=3.29.0"
8+
sdk: ^3.9.0
9+
flutter: ">=3.35.0"
1010

1111
flutter:
1212
plugin:

packages/shared_preferences/shared_preferences_android/test/shared_preferences_async_test.dart

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,9 @@ void main() {
4444

4545
final SharedPreferencesAsyncAndroidOptions emptyOptions =
4646
SharedPreferencesAsyncAndroidOptions(
47-
backend:
48-
useDataStore
49-
? SharedPreferencesAndroidBackendLibrary.DataStore
50-
: SharedPreferencesAndroidBackendLibrary.SharedPreferences,
47+
backend: useDataStore
48+
? SharedPreferencesAndroidBackendLibrary.DataStore
49+
: SharedPreferencesAndroidBackendLibrary.SharedPreferences,
5150
);
5251

5352
test('set and get String with $backend', () async {
@@ -337,9 +336,9 @@ class _FakeSharedPreferencesApi implements SharedPreferencesAsyncApi {
337336
return value == null
338337
? null
339338
: StringListResult(
340-
jsonEncodedValue: value as String?,
341-
type: StringListLookupResultType.jsonEncoded,
342-
);
339+
jsonEncodedValue: value as String?,
340+
type: StringListLookupResultType.jsonEncoded,
341+
);
343342
}
344343

345344
@override

0 commit comments

Comments
 (0)