Skip to content

Commit 441c53c

Browse files
mvanbeusekommvanbeusekom
authored
Update dependencies (Baseflow#1449)
1 parent 8627373 commit 441c53c

File tree

12 files changed

+54
-105
lines changed

12 files changed

+54
-105
lines changed

‎permission_handler/CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## 11.4.0
2+
3+
* Updates dependencies to latest versions.
4+
* Migrates away from deprecated imperative Flutter gradle settings.
5+
16
## 11.3.1
27

38
* Documents the use of the `PERMISSION_LOCAITON_WHENINUSE` macro on iOS.

‎permission_handler/example/android/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ gradle-wrapper.jar
55
/gradlew.bat
66
/local.properties
77
GeneratedPluginRegistrant.java
8+
.cxx
89

910
# Remember to never publicly share your keystore.
1011
# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app

‎permission_handler/example/android/app/build.gradle‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
plugins {
2+
id "com.android.application"
3+
id "dev.flutter.flutter-gradle-plugin"
4+
}
5+
16
def localProperties = new Properties()
27
def localPropertiesFile = rootProject.file('local.properties')
38
if (localPropertiesFile.exists()) {
@@ -6,11 +11,6 @@ if (localPropertiesFile.exists()) {
611
}
712
}
813

9-
def flutterRoot = localProperties.getProperty('flutter.sdk')
10-
if (flutterRoot == null) {
11-
throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
12-
}
13-
1414
def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
1515
if (flutterVersionCode == null) {
1616
flutterVersionCode = '1'
@@ -21,14 +21,11 @@ if (flutterVersionName == null) {
2121
flutterVersionName = '1.0'
2222
}
2323

24-
apply plugin: 'com.android.application'
25-
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
26-
2724
android {
2825
if (project.android.hasProperty("namespace")) {
2926
namespace 'com.baseflow.permissionhandlerexample'
3027
}
31-
compileSdkVersion 33
28+
compileSdkVersion 35
3229

3330
compileOptions {
3431
sourceCompatibility JavaVersion.VERSION_1_8
@@ -38,8 +35,8 @@ android {
3835
defaultConfig {
3936
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
4037
applicationId "com.baseflow.permissionhandler.example"
41-
minSdkVersion 16
42-
targetSdkVersion 33
38+
minSdkVersion flutter.minSdkVersion
39+
targetSdkVersion 34
4340
versionCode flutterVersionCode.toInteger()
4441
versionName flutterVersionName
4542
}

‎permission_handler/example/android/app/src/debug/AndroidManifest.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="com.baseflow.permissionhandler.example">
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
32
<!-- Flutter needs it to communicate with the running application
43
to allow setting breakpoints, to provide hot reload, etc.
54
-->

‎permission_handler/example/android/app/src/main/AndroidManifest.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
xmlns:tools="http://schemas.android.com/tools"
3-
package="com.baseflow.permissionhandler.example">
2+
xmlns:tools="http://schemas.android.com/tools">
43

54
<uses-feature
65
android:name="android.hardware.telephony"

‎permission_handler/example/android/app/src/profile/AndroidManifest.xml‎

Lines changed: 1 addition & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,3 @@
1-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="com.example.permissionhandlerexample">
3-
<!-- Flutter needs it to communicate with the running application
4-
to allow setting breakpoints, to provide hot reload, etc.
5-
-->
6-
<uses-permission android:name="android.permission.INTERNET"/>
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
72

8-
<!-- Permissions options for the `contacts` group -->
9-
<uses-permission android:name="android.permission.READ_CONTACTS"/>
10-
<uses-permission android:name="android.permission.WRITE_CONTACTS"/>
11-
<uses-permission android:name="android.permission.GET_ACCOUNTS"/>
12-
13-
<!-- Permissions options for the `storage` group -->
14-
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
15-
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
16-
17-
<!-- Permissions options for the `camera` group -->
18-
<uses-permission android:name="android.permission.CAMERA"/>
19-
20-
<!-- Permissions options for the `sms` group -->
21-
<uses-permission android:name="android.permission.SEND_SMS"/>
22-
<uses-permission android:name="android.permission.RECEIVE_SMS"/>
23-
<uses-permission android:name="android.permission.READ_SMS"/>
24-
<uses-permission android:name="android.permission.RECEIVE_WAP_PUSH"/>
25-
<uses-permission android:name="android.permission.RECEIVE_MMS"/>
26-
27-
<!-- Permissions options for the `phone` group -->
28-
<uses-permission android:name="android.permission.READ_PHONE_STATE"/>
29-
<uses-permission android:name="android.permission.CALL_PHONE"/>
30-
<uses-permission android:name="android.permission.ADD_VOICEMAIL"/>
31-
<uses-permission android:name="android.permission.USE_SIP"/>
32-
<uses-permission android:name="android.permission.READ_CALL_LOG"/>
33-
<uses-permission android:name="android.permission.WRITE_CALL_LOG"/>
34-
<uses-permission android:name="android.permission.PROCESS_OUTGOING_CALLS"/>
35-
36-
<!-- Permissions options for the `calendar` group -->
37-
<uses-permission android:name="android.permission.READ_CALENDAR" />
38-
<uses-permission android:name="android.permission.WRITE_CALENDAR" />
39-
40-
<!-- Permissions options for the `location` group -->
41-
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
42-
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
43-
44-
<!-- Permissions options for the `microphone` or `speech` group -->
45-
<uses-permission android:name="android.permission.RECORD_AUDIO" />
46-
47-
<!-- Permissions options for the `sensors` group -->
48-
<uses-permission android:name="android.permission.BODY_SENSORS" />
49-
<uses-permission android:name="android.permission.BODY_SENSORS_BACKGROUND" />
50-
51-
<!-- Permissions options for the `access notification policy` group -->
52-
<uses-permission android:name="android.permission.ACCESS_NOTIFICATION_POLICY"/>
533
</manifest>

‎permission_handler/example/android/build.gradle‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,3 @@
1-
buildscript {
2-
repositories {
3-
google()
4-
mavenCentral()
5-
}
6-
7-
dependencies {
8-
classpath 'com.android.tools.build:gradle:7.1.2'
9-
}
10-
}
11-
121
allprojects {
132
repositories {
143
google()
@@ -19,9 +8,11 @@ allprojects {
198
rootProject.buildDir = '../build'
209
subprojects {
2110
project.buildDir = "${rootProject.buildDir}/${project.name}"
11+
}
12+
subprojects {
2213
project.evaluationDependsOn(':app')
2314
}
2415

2516
tasks.register("clean", Delete) {
2617
delete rootProject.buildDir
27-
}
18+
}

‎permission_handler/example/android/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip

‎permission_handler/example/android/settings.gradle‎

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,24 @@
1-
include ':app'
1+
pluginManagement {
2+
def flutterSdkPath = {
3+
def properties = new Properties()
4+
file("local.properties").withInputStream { properties.load(it) }
5+
def flutterSdkPath = properties.getProperty("flutter.sdk")
6+
assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
7+
return flutterSdkPath
8+
}()
29

3-
def flutterProjectRoot = rootProject.projectDir.parentFile.toPath()
10+
includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
411

5-
def plugins = new Properties()
6-
def pluginsFile = new File(flutterProjectRoot.toFile(), '.flutter-plugins')
7-
if (pluginsFile.exists()) {
8-
pluginsFile.withReader('UTF-8') { reader -> plugins.load(reader) }
12+
repositories {
13+
google()
14+
mavenCentral()
15+
gradlePluginPortal()
16+
}
917
}
1018

11-
plugins.each { name, path ->
12-
def pluginDirectory = flutterProjectRoot.resolve(path).resolve('android').toFile()
13-
include ":$name"
14-
project(":$name").projectDir = pluginDirectory
19+
plugins {
20+
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
21+
id "com.android.application" version "8.7.0" apply false
1522
}
23+
24+
include ":app"

‎permission_handler/example/lib/main.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class PermissionHandlerWidget extends StatefulWidget {
3434
}
3535

3636
@override
37-
_PermissionHandlerWidgetState createState() =>
37+
State<PermissionHandlerWidget> createState() =>
3838
_PermissionHandlerWidgetState();
3939
}
4040

@@ -92,7 +92,7 @@ class PermissionWidget extends StatefulWidget {
9292
final Permission permission;
9393

9494
@override
95-
_PermissionState createState() => _PermissionState();
95+
State<PermissionWidget> createState() => _PermissionState();
9696
}
9797

9898
class _PermissionState extends State<PermissionWidget> {

0 commit comments

Comments
 (0)