From 6e0959e04182e2813333be535c7fc54346a39957 Mon Sep 17 00:00:00 2001 From: Maurits van Beusekom Date: Thu, 20 Feb 2025 15:31:56 +0100 Subject: [PATCH] Update dependencies --- permission_handler/CHANGELOG.md | 5 ++ permission_handler/example/android/.gitignore | 1 + .../example/android/app/build.gradle | 19 +++---- .../android/app/src/debug/AndroidManifest.xml | 3 +- .../android/app/src/main/AndroidManifest.xml | 3 +- .../app/src/profile/AndroidManifest.xml | 52 +------------------ .../example/android/build.gradle | 15 ++---- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../example/android/settings.gradle | 29 +++++++---- permission_handler/example/lib/main.dart | 4 +- permission_handler/example/pubspec.yaml | 10 ++-- permission_handler/pubspec.yaml | 16 +++--- 12 files changed, 54 insertions(+), 105 deletions(-) diff --git a/permission_handler/CHANGELOG.md b/permission_handler/CHANGELOG.md index 65b8ef989..be1ebe069 100644 --- a/permission_handler/CHANGELOG.md +++ b/permission_handler/CHANGELOG.md @@ -1,3 +1,8 @@ +## 11.4.0 + +* Updates dependencies to latest versions. +* Migrates away from deprecated imperative Flutter gradle settings. + ## 11.3.1 * Documents the use of the `PERMISSION_LOCAITON_WHENINUSE` macro on iOS. diff --git a/permission_handler/example/android/.gitignore b/permission_handler/example/android/.gitignore index 0a741cb43..590e3cc3d 100644 --- a/permission_handler/example/android/.gitignore +++ b/permission_handler/example/android/.gitignore @@ -5,6 +5,7 @@ gradle-wrapper.jar /gradlew.bat /local.properties GeneratedPluginRegistrant.java +.cxx # Remember to never publicly share your keystore. # See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app diff --git a/permission_handler/example/android/app/build.gradle b/permission_handler/example/android/app/build.gradle index 96967d6ca..537b42534 100644 --- a/permission_handler/example/android/app/build.gradle +++ b/permission_handler/example/android/app/build.gradle @@ -1,3 +1,8 @@ +plugins { + id "com.android.application" + id "dev.flutter.flutter-gradle-plugin" +} + def localProperties = new Properties() def localPropertiesFile = rootProject.file('local.properties') if (localPropertiesFile.exists()) { @@ -6,11 +11,6 @@ if (localPropertiesFile.exists()) { } } -def flutterRoot = localProperties.getProperty('flutter.sdk') -if (flutterRoot == null) { - throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") -} - def flutterVersionCode = localProperties.getProperty('flutter.versionCode') if (flutterVersionCode == null) { flutterVersionCode = '1' @@ -21,14 +21,11 @@ if (flutterVersionName == null) { flutterVersionName = '1.0' } -apply plugin: 'com.android.application' -apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" - android { if (project.android.hasProperty("namespace")) { namespace 'com.baseflow.permissionhandlerexample' } - compileSdkVersion 33 + compileSdkVersion 35 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 @@ -38,8 +35,8 @@ android { defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "com.baseflow.permissionhandler.example" - minSdkVersion 16 - targetSdkVersion 33 + minSdkVersion flutter.minSdkVersion + targetSdkVersion 34 versionCode flutterVersionCode.toInteger() versionName flutterVersionName } diff --git a/permission_handler/example/android/app/src/debug/AndroidManifest.xml b/permission_handler/example/android/app/src/debug/AndroidManifest.xml index d692acb24..f880684a6 100644 --- a/permission_handler/example/android/app/src/debug/AndroidManifest.xml +++ b/permission_handler/example/android/app/src/debug/AndroidManifest.xml @@ -1,5 +1,4 @@ - + diff --git a/permission_handler/example/android/app/src/main/AndroidManifest.xml b/permission_handler/example/android/app/src/main/AndroidManifest.xml index 85801beb7..3acfea662 100644 --- a/permission_handler/example/android/app/src/main/AndroidManifest.xml +++ b/permission_handler/example/android/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ + xmlns:tools="http://schemas.android.com/tools"> - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/permission_handler/example/android/build.gradle b/permission_handler/example/android/build.gradle index 64cc47cc9..8f31e8caf 100644 --- a/permission_handler/example/android/build.gradle +++ b/permission_handler/example/android/build.gradle @@ -1,14 +1,3 @@ -buildscript { - repositories { - google() - mavenCentral() - } - - dependencies { - classpath 'com.android.tools.build:gradle:7.1.2' - } -} - allprojects { repositories { google() @@ -19,9 +8,11 @@ allprojects { rootProject.buildDir = '../build' subprojects { project.buildDir = "${rootProject.buildDir}/${project.name}" +} +subprojects { project.evaluationDependsOn(':app') } tasks.register("clean", Delete) { delete rootProject.buildDir -} +} \ No newline at end of file diff --git a/permission_handler/example/android/gradle/wrapper/gradle-wrapper.properties b/permission_handler/example/android/gradle/wrapper/gradle-wrapper.properties index cc5527d78..db18181ac 100644 --- a/permission_handler/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/permission_handler/example/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip diff --git a/permission_handler/example/android/settings.gradle b/permission_handler/example/android/settings.gradle index 5a2f14fb1..56eb85cb1 100644 --- a/permission_handler/example/android/settings.gradle +++ b/permission_handler/example/android/settings.gradle @@ -1,15 +1,24 @@ -include ':app' +pluginManagement { + def flutterSdkPath = { + def properties = new Properties() + file("local.properties").withInputStream { properties.load(it) } + def flutterSdkPath = properties.getProperty("flutter.sdk") + assert flutterSdkPath != null, "flutter.sdk not set in local.properties" + return flutterSdkPath + }() -def flutterProjectRoot = rootProject.projectDir.parentFile.toPath() + includeBuild("$flutterSdkPath/packages/flutter_tools/gradle") -def plugins = new Properties() -def pluginsFile = new File(flutterProjectRoot.toFile(), '.flutter-plugins') -if (pluginsFile.exists()) { - pluginsFile.withReader('UTF-8') { reader -> plugins.load(reader) } + repositories { + google() + mavenCentral() + gradlePluginPortal() + } } -plugins.each { name, path -> - def pluginDirectory = flutterProjectRoot.resolve(path).resolve('android').toFile() - include ":$name" - project(":$name").projectDir = pluginDirectory +plugins { + id "dev.flutter.flutter-plugin-loader" version "1.0.0" + id "com.android.application" version "8.7.0" apply false } + +include ":app" \ No newline at end of file diff --git a/permission_handler/example/lib/main.dart b/permission_handler/example/lib/main.dart index e453216ee..e37e51302 100644 --- a/permission_handler/example/lib/main.dart +++ b/permission_handler/example/lib/main.dart @@ -34,7 +34,7 @@ class PermissionHandlerWidget extends StatefulWidget { } @override - _PermissionHandlerWidgetState createState() => + State createState() => _PermissionHandlerWidgetState(); } @@ -92,7 +92,7 @@ class PermissionWidget extends StatefulWidget { final Permission permission; @override - _PermissionState createState() => _PermissionState(); + State createState() => _PermissionState(); } class _PermissionState extends State { diff --git a/permission_handler/example/pubspec.yaml b/permission_handler/example/pubspec.yaml index 51bff653f..8ea895146 100644 --- a/permission_handler/example/pubspec.yaml +++ b/permission_handler/example/pubspec.yaml @@ -8,11 +8,6 @@ dependencies: baseflow_plugin_template: ^2.1.1 flutter: sdk: flutter - -dev_dependencies: - flutter_test: - sdk: flutter - permission_handler: # When depending on this package from a real application you should use: # permission_handler: ^x.y.z @@ -21,7 +16,10 @@ dev_dependencies: # the parent directory to use the current plugin's version. path: ../ - url_launcher: ^6.1.11 +dev_dependencies: + flutter_test: + sdk: flutter + url_launcher: ^6.3.1 flutter: uses-material-design: true diff --git a/permission_handler/pubspec.yaml b/permission_handler/pubspec.yaml index e74fa4bf9..fc57a505c 100644 --- a/permission_handler/pubspec.yaml +++ b/permission_handler/pubspec.yaml @@ -2,12 +2,12 @@ name: permission_handler description: Permission plugin for Flutter. This plugin provides a cross-platform (iOS, Android) API to request and check permissions. repository: https://github.com/baseflow/flutter-permission-handler issue_tracker: https://github.com/Baseflow/flutter-permission-handler/issues -version: 11.3.1 +version: 11.4.0 environment: - sdk: ">=2.15.0 <4.0.0" - flutter: ">=2.8.0" + sdk: ^3.5.0 + flutter: ">=3.24.0" flutter: plugin: @@ -25,15 +25,15 @@ dependencies: flutter: sdk: flutter meta: ^1.7.0 - permission_handler_android: ^12.0.3 - permission_handler_apple: ^9.4.3 + permission_handler_android: ^12.1.0 + permission_handler_apple: ^9.4.6 permission_handler_html: ^0.1.1 permission_handler_windows: ^0.2.1 - permission_handler_platform_interface: ^4.2.0 + permission_handler_platform_interface: ^4.3.0 dev_dependencies: - flutter_lints: ^1.0.4 + flutter_lints: ^5.0.0 flutter_test: sdk: flutter - mockito: ^5.0.1 + mockito: ^5.4.5 plugin_platform_interface: ^2.0.0