Skip to content

Commit 7729836

Browse files
authored
[shared_preferences] Updates Pigeon to 30.0.1 to support multi-engine registration and deregistration. (#13617)
Updates `shared_preferences_android` and `shared_preferences_foundation` to Pigeon 30.0.1 and `jni` `^1.1.1`. - Supports multi-engine registration and deregistration. - Removes the manual web stub/real FFI export and R8 consumer rules workarounds. fixes flutter/flutter#194920
1 parent 5a7871b commit 7729836

39 files changed

Lines changed: 5195 additions & 2280 deletions

‎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.5.5
2+
3+
* Updates Pigeon to 30.0.1 to support multi-engine registration and deregistration.
4+
* Updates `jni` to `^1.1.1` and removes manual web conditional FFI export and R8 consumer rules workarounds.
5+
16
## 2.5.4
27

38
* Fixes eager SharedPreferences fetch in `LegacySharedPreferencesPlugin` executing synchronous disk I/O on Android main thread during startup by deferring the fetch until first use.

‎packages/shared_preferences/shared_preferences_android/android/build.gradle.kts‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,6 @@ android {
4949
defaultConfig {
5050
minSdk = 24
5151
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
52-
// TODO(https://github.com/dart-lang/native/issues/3732): Remove, along with
53-
// consumer-rules.pro, once package:jni ships the Kotlin keep rules.
54-
consumerProguardFiles("consumer-rules.pro")
5552
}
5653

5754
lint {

‎packages/shared_preferences/shared_preferences_android/android/consumer-rules.pro‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎packages/shared_preferences/shared_preferences_android/android/src/main/kotlin/io/flutter/plugins/sharedpreferences/LegacySharedPreferencesPlugin.kt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,21 +38,21 @@ internal constructor(private val listEncoder: SharedPreferencesListEncoder) :
3838

3939
constructor() : this(ListEncoder())
4040

41-
private fun setUp(context: Context) {
42-
this.context = context
41+
private fun setUp(binding: FlutterPluginBinding) {
42+
context = binding.applicationContext
4343
try {
44-
SharedPreferencesApiRegistrar().register(this)
44+
SharedPreferencesApiRegistrar().register(this, binding)
4545
} catch (ex: Exception) {
4646
Log.e(TAG, "Received exception while setting up SharedPreferencesPlugin", ex)
4747
}
4848
}
4949

5050
override fun onAttachedToEngine(binding: FlutterPluginBinding) {
51-
setUp(binding.applicationContext)
51+
setUp(binding)
5252
}
5353

5454
override fun onDetachedFromEngine(binding: FlutterPluginBinding) {
55-
SharedPreferencesApiRegistrar().register(null)
55+
SharedPreferencesApiRegistrar().unregister(this, binding)
5656
}
5757

5858
override suspend fun setBool(key: String, value: Boolean): Boolean =

0 commit comments

Comments
 (0)