Skip to content

Commit 203fecc

Browse files
mikolashkamikolashka
authored
Merge branch 'main' into fixes/issue-762
2 parents 8a41431 + 441c53c commit 203fecc

34 files changed

+428
-429
lines changed

‎.github/workflows/permission_handler.yaml‎

Lines changed: 14 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ name: permission_handler
66
# events but only for the main branch
77
on:
88
push:
9-
branches: [ main ]
9+
branches: [main]
1010
paths:
11-
- 'permission_handler/**'
12-
- '.github/workflows/permission_handler.yaml'
11+
- "permission_handler/**"
12+
- ".github/workflows/permission_handler.yaml"
1313
pull_request:
14-
branches: [ main ]
14+
branches: [main]
1515
paths:
16-
- 'permission_handler/**'
17-
- '.github/workflows/permission_handler.yaml'
16+
- "permission_handler/**"
17+
- ".github/workflows/permission_handler.yaml"
1818

1919
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
2020
jobs:
@@ -23,37 +23,30 @@ jobs:
2323

2424
# The type of runner that the job will run on
2525
#
26-
# TODO(mvanbeusekom): Manually set to macOS 13 to support Xcode 15 and iOS 17 SDKs.
27-
# Currently `macos-latest` is based on macOS 12 and doesn't support iOS 17 SDK. This
26+
# TODO(mvanbeusekom): Manually set to macOS 15 to support Xcode 16 and iOS 18 SDKs.
27+
# Currently `macos-latest` is based on macOS 14 and doesn't support iOS 18 SDK. This
2828
# should be moved back to `macos-latest` when GitHub Actions images are updated.
29-
runs-on: macos-13
29+
runs-on: macos-15
3030

3131
env:
32-
source-directory: ./permission_handler
32+
source-directory: ./permission_handler
3333
example-directory: ./permission_handler/example
3434

3535
# Steps represent a sequence of tasks that will be executed as part of the job
3636
steps:
3737
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
3838
- uses: actions/checkout@v3
3939

40-
# Override current Xcode version with version 15.0.1.
41-
#
42-
# TODO(mvanbeusekom): Remove when the macos-latest image supports version 15.0.1
43-
# out of the box (see https://github.com/actions/runner-images/blob/main/README.md).
44-
- name: Select Xcode version
45-
run: sudo xcode-select -s '/Applications/Xcode_15.0.1.app/Contents/Developer'
46-
4740
# Make sure JAVA version 17 is installed on build agent.
4841
- uses: actions/setup-java@v3
4942
with:
50-
distribution: 'temurin' # See 'Supported distributions' for available options
51-
java-version: '17'
43+
distribution: "temurin" # See 'Supported distributions' for available options
44+
java-version: "17"
5245

5346
# Make sure the stable version of Flutter is available
5447
- uses: subosito/flutter-action@v2
5548
with:
56-
channel: 'stable'
49+
channel: "stable"
5750

5851
# Download all Flutter packages
5952
- name: Download dependencies
@@ -64,7 +57,7 @@ jobs:
6457
- name: Run Dart Format
6558
run: dart format --set-exit-if-changed .
6659
working-directory: ${{env.source-directory}}
67-
60+
6861
# Run Flutter Analyzer
6962
- name: Run Flutter Analyzer
7063
run: flutter analyze

‎.github/workflows/permission_handler_apple.yaml‎

Lines changed: 11 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ name: permission_handler_apple
66
# events but only for the main branch
77
on:
88
push:
9-
branches: [ main ]
9+
branches: [main]
1010
paths:
11-
- 'permission_handler_apple/**'
12-
- '.github/workflows/permission_handler_apple.yaml'
11+
- "permission_handler_apple/**"
12+
- ".github/workflows/permission_handler_apple.yaml"
1313
pull_request:
14-
branches: [ main ]
14+
branches: [main]
1515
paths:
16-
- 'permission_handler_apple/**'
17-
- '.github/workflows/permission_handler_apple.yaml'
16+
- "permission_handler_apple/**"
17+
- ".github/workflows/permission_handler_apple.yaml"
1818

1919
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
2020
jobs:
@@ -23,31 +23,24 @@ jobs:
2323

2424
# The type of runner that the job will run on
2525
#
26-
# TODO(mvanbeusekom): Manually set to macOS 13 to support Xcode 15 and iOS 17 SDKs.
27-
# Currently `macos-latest` is based on macOS 12 and doesn't support iOS 17 SDK. This
26+
# TODO(mvanbeusekom): Manually set to macOS 15 to support Xcode 16 and iOS 18 SDKs.
27+
# Currently `macos-latest` is based on macOS 14 and doesn't support iOS 18 SDK. This
2828
# should be moved back to `macos-latest` when GitHub Actions images are updated.
29-
runs-on: macos-13
29+
runs-on: macos-15
3030

3131
env:
3232
source-directory: ./permission_handler_apple
33-
example-directory: ./permission_handler_apple/example
33+
example-directory: ./permission_handler_apple/example
3434

3535
# Steps represent a sequence of tasks that will be executed as part of the job
3636
steps:
3737
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
3838
- uses: actions/checkout@v3
3939

40-
# Override current Xcode version with version 15.0.1.
41-
#
42-
# TODO(mvanbeusekom): Remove when the macos-latest image supports version 15.0.1
43-
# out of the box (see https://github.com/actions/runner-images/blob/main/README.md).
44-
- name: Select Xcode version
45-
run: sudo xcode-select -s '/Applications/Xcode_15.0.1.app/Contents/Developer'
46-
4740
# Make sure the stable version of Flutter is available
4841
- uses: subosito/flutter-action@v2
4942
with:
50-
channel: 'stable'
43+
channel: "stable"
5144

5245
# Download all Flutter packages
5346
- name: Download dependencies
@@ -68,4 +61,3 @@ jobs:
6861
- name: Run iOS build
6962
run: flutter build ios --no-codesign --release
7063
working-directory: ${{env.example-directory}}
71-

‎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

0 commit comments

Comments
 (0)