From a1b859d8be0f6bab66522cc318b545be84a06d29 Mon Sep 17 00:00:00 2001 From: Fabian Freund Date: Fri, 25 Jul 2025 10:51:00 +0200 Subject: [PATCH] upgrade gradle deps --- app/android/gradle/wrapper/gradle-wrapper.properties | 2 +- app/android/settings.gradle | 2 +- packages/flutter_mozilla_components/android/build.gradle | 2 +- .../eu/weblibre/flutter_mozilla_components/Components.kt | 2 +- .../addons/WebExtensionPromptFeature.kt | 8 +++----- .../services/DownloadService.kt | 3 +-- .../example/android/settings.gradle | 2 +- .../example/android/settings.gradle.kts | 2 +- 8 files changed, 10 insertions(+), 13 deletions(-) diff --git a/app/android/gradle/wrapper/gradle-wrapper.properties b/app/android/gradle/wrapper/gradle-wrapper.properties index c6a2952d..e6045a98 100644 --- a/app/android/gradle/wrapper/gradle-wrapper.properties +++ b/app/android/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip diff --git a/app/android/settings.gradle b/app/android/settings.gradle index 4b2a2ac1..940ea578 100644 --- a/app/android/settings.gradle +++ b/app/android/settings.gradle @@ -18,7 +18,7 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version '8.10.1' apply false + id "com.android.application" version '8.11.1' apply false id "org.jetbrains.kotlin.android" version "2.1.20" apply false } diff --git a/packages/flutter_mozilla_components/android/build.gradle b/packages/flutter_mozilla_components/android/build.gradle index 4b42ed79..6b57aa43 100644 --- a/packages/flutter_mozilla_components/android/build.gradle +++ b/packages/flutter_mozilla_components/android/build.gradle @@ -3,7 +3,7 @@ version = "1.0-SNAPSHOT" buildscript { ext.kotlin_version = "2.1.20" - ext.mozillaComponentsVersion = '140.0' + ext.mozillaComponentsVersion = '141.0' repositories { google() diff --git a/packages/flutter_mozilla_components/android/src/main/kotlin/eu/weblibre/flutter_mozilla_components/Components.kt b/packages/flutter_mozilla_components/android/src/main/kotlin/eu/weblibre/flutter_mozilla_components/Components.kt index 98d7f331..3a181b22 100644 --- a/packages/flutter_mozilla_components/android/src/main/kotlin/eu/weblibre/flutter_mozilla_components/Components.kt +++ b/packages/flutter_mozilla_components/android/src/main/kotlin/eu/weblibre/flutter_mozilla_components/Components.kt @@ -58,5 +58,5 @@ class Components(private val context: Context, val dateTimeProvider: DateTimeProvider by lazy { DefaultDateTimeProvider() } - //val downloadEstimator: DownloadEstimator by lazy { DownloadEstimator(dateTimeProvider = dateTimeProvider) } + val downloadEstimator: DownloadEstimator by lazy { DownloadEstimator(dateTimeProvider = dateTimeProvider) } } \ No newline at end of file diff --git a/packages/flutter_mozilla_components/android/src/main/kotlin/eu/weblibre/flutter_mozilla_components/addons/WebExtensionPromptFeature.kt b/packages/flutter_mozilla_components/android/src/main/kotlin/eu/weblibre/flutter_mozilla_components/addons/WebExtensionPromptFeature.kt index 5983d0e3..deffaafb 100644 --- a/packages/flutter_mozilla_components/android/src/main/kotlin/eu/weblibre/flutter_mozilla_components/addons/WebExtensionPromptFeature.kt +++ b/packages/flutter_mozilla_components/android/src/main/kotlin/eu/weblibre/flutter_mozilla_components/addons/WebExtensionPromptFeature.kt @@ -165,10 +165,9 @@ class WebExtensionPromptFeature( addon = addon, permissions = permissions, origins = origins, -// dataCollectionPermissions = emptyList(), + dataCollectionPermissions = emptyList(), forOptionalPermissions = forOptionalPermissions, -// onPositiveButtonClicked = { _, privateBrowsingAllowed, _ -> - onPositiveButtonClicked = { _, privateBrowsingAllowed, -> + onPositiveButtonClicked = { _, privateBrowsingAllowed, _ -> handlePermissions( promptRequest, granted = true, @@ -197,8 +196,7 @@ class WebExtensionPromptFeature( private fun tryToReAttachButtonHandlersToPreviousDialog() { findPreviousDialogFragment()?.let { dialog -> -// dialog.onPositiveButtonClicked = { addon, privateBrowsingAllowed, _ -> - dialog.onPositiveButtonClicked = { addon, privateBrowsingAllowed -> + dialog.onPositiveButtonClicked = { addon, privateBrowsingAllowed, _ -> store.state.webExtensionPromptRequest?.let { promptRequest -> if (promptRequest is WebExtensionPromptRequest.AfterInstallation.Permissions && addon.id == promptRequest.extension.id diff --git a/packages/flutter_mozilla_components/android/src/main/kotlin/eu/weblibre/flutter_mozilla_components/services/DownloadService.kt b/packages/flutter_mozilla_components/android/src/main/kotlin/eu/weblibre/flutter_mozilla_components/services/DownloadService.kt index 9d862fab..ea6e319d 100644 --- a/packages/flutter_mozilla_components/android/src/main/kotlin/eu/weblibre/flutter_mozilla_components/services/DownloadService.kt +++ b/packages/flutter_mozilla_components/android/src/main/kotlin/eu/weblibre/flutter_mozilla_components/services/DownloadService.kt @@ -22,7 +22,6 @@ class DownloadService : AbstractFetchDownloadService() { override val httpClient by lazy { components.core.client } override val store: BrowserStore by lazy { components.core.store } override val notificationsDelegate: NotificationsDelegate by lazy { components.notificationsDelegate } - override val dateTimeProvider: DateTimeProvider by lazy { components.dateTimeProvider } override val fileSizeFormatter: FileSizeFormatter by lazy { components.fileSizeFormatter } - //override val downloadEstimator: DownloadEstimator by lazy { components.downloadEstimator } + override val downloadEstimator: DownloadEstimator by lazy { components.downloadEstimator } } \ No newline at end of file diff --git a/packages/flutter_mozilla_components/example/android/settings.gradle b/packages/flutter_mozilla_components/example/android/settings.gradle index 78a20d7b..69400c06 100644 --- a/packages/flutter_mozilla_components/example/android/settings.gradle +++ b/packages/flutter_mozilla_components/example/android/settings.gradle @@ -18,7 +18,7 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "8.10.0" apply false + id "com.android.application" version "8.11.1" apply false id "org.jetbrains.kotlin.android" version "2.1.20" apply false } diff --git a/packages/simple_intent_receiver/example/android/settings.gradle.kts b/packages/simple_intent_receiver/example/android/settings.gradle.kts index 995989e1..3a22d2d5 100644 --- a/packages/simple_intent_receiver/example/android/settings.gradle.kts +++ b/packages/simple_intent_receiver/example/android/settings.gradle.kts @@ -18,7 +18,7 @@ pluginManagement { plugins { id("dev.flutter.flutter-plugin-loader") version "1.0.0" - id("com.android.application") version "8.10.0" apply false + id("com.android.application") version "8.11.1" apply false id("org.jetbrains.kotlin.android") version "2.1.20" apply false }