From 4938e5c811bdb89099d175b223485b5d61a1b9fe Mon Sep 17 00:00:00 2001 From: M66B Date: Wed, 24 Jul 2024 22:17:53 +0200 Subject: [PATCH] Updated AndroidX --- CHANGELOG.md | 1 + app/build.gradle | 8 ++++---- app/src/main/assets/CHANGELOG.md | 1 + app/src/main/java/androidx/lifecycle/FlowLiveData.kt | 1 + metadata/en-US/changelogs/2215.txt | 1 + 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a9e8d9f552..f23de59ff7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ For support you can use [the contact form](https://contact.faircode.eu/?product= * Added support for SVG data URI images * Small improvements and minor bug fixes +* Updated [AndroidX](https://developer.android.com/jetpack/androidx/versions/all-channel) * Updated [Public Suffix List](https://github.com/publicsuffix/list) * Updated [translations](https://crowdin.com/project/open-source-email) diff --git a/app/build.gradle b/app/build.gradle index f2bb8bf9bd..84d34e41ea 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -529,7 +529,7 @@ configurations.configureEach { } else if (details.requested.group == "androidx.lifecycle" && details.requested.name != "lifecycle-extensions") { //print("Pinning " + details.requested.group + ":" + details.requested.name + "\n") - details.useVersion "2.8.3" + details.useVersion "2.8.4" } else if (details.requested.group == "org.apache.poi") { //print("Pinning " + details.requested.group + ":" + details.requested.name + "\n") details.useVersion "3.17" @@ -553,8 +553,8 @@ dependencies { def appcompat_version = "1.7.0" def emoji_version = "1.4.0" // 1.5.0-beta01 def flatbuffers_version = "2.0.0" - def activity_version = " 1.9.0" // 1.10.0-alpha01 - def fragment_version = "1.8.1" + def activity_version = " 1.9.1" // 1.10.0-alpha01 + def fragment_version = "1.8.2" def windows_version = "1.2.0" // 1.3.0-rc01 def webkit_version = "1.10.0" // 1.11.0/1.12.0-alpha02 def recyclerview_version = "1.3.2" // 1.4.0-alpha01 @@ -565,7 +565,7 @@ dependencies { def lbm_version = "1.1.0" def swiperefresh_version = "1.2.0-alpha01" def documentfile_version = "1.1.0-alpha01" - def lifecycle_version = "2.8.3" + def lifecycle_version = "2.8.4" def lifecycle_extensions_version = "2.2.0" def room_version = "2.4.3" // 2.5.2/2.6.1/2.7.0-alpha05 def sqlite_version = "2.4.0" // 2.5.0-alpha05 diff --git a/app/src/main/assets/CHANGELOG.md b/app/src/main/assets/CHANGELOG.md index a9e8d9f552..f23de59ff7 100644 --- a/app/src/main/assets/CHANGELOG.md +++ b/app/src/main/assets/CHANGELOG.md @@ -16,6 +16,7 @@ For support you can use [the contact form](https://contact.faircode.eu/?product= * Added support for SVG data URI images * Small improvements and minor bug fixes +* Updated [AndroidX](https://developer.android.com/jetpack/androidx/versions/all-channel) * Updated [Public Suffix List](https://github.com/publicsuffix/list) * Updated [translations](https://crowdin.com/project/open-source-email) diff --git a/app/src/main/java/androidx/lifecycle/FlowLiveData.kt b/app/src/main/java/androidx/lifecycle/FlowLiveData.kt index 51e541090c..08036d026d 100644 --- a/app/src/main/java/androidx/lifecycle/FlowLiveData.kt +++ b/app/src/main/java/androidx/lifecycle/FlowLiveData.kt @@ -109,6 +109,7 @@ public fun LiveData.asFlow(): Flow = callbackFlow { } try { + withContext(Dispatchers.Main.immediate) { observeForever(observer) } awaitCancellation() } finally { withContext(Dispatchers.Main.immediate + NonCancellable) { diff --git a/metadata/en-US/changelogs/2215.txt b/metadata/en-US/changelogs/2215.txt index 4e6e6d15a7..af5e52fa4c 100644 --- a/metadata/en-US/changelogs/2215.txt +++ b/metadata/en-US/changelogs/2215.txt @@ -16,6 +16,7 @@ Next version * Added support for SVG data URI images * Small improvements and minor bug fixes +* Updated AndroidX * Updated Public Suffix List * Updated translations