From 48160cd1651461be4004a5d2170dcf05d47d6315 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 29 Oct 2021 20:05:36 -0500 Subject: [PATCH 01/52] add permission_handler to pubspec.yaml --- pubspec.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/pubspec.yaml b/pubspec.yaml index b3904712..72a15c84 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -24,6 +24,7 @@ dependencies: flutter: sdk: flutter flutter_blue: ^0.8.0 + permission_handler: ^8.2.5 # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. From 17102f72377c62960f1c2319350fafa92a22728e Mon Sep 17 00:00:00 2001 From: John Date: Fri, 29 Oct 2021 21:34:27 -0500 Subject: [PATCH 02/52] add sdk version to gradle --- android/build.gradle | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/android/build.gradle b/android/build.gradle index 9b6ed06e..76b097d1 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -27,3 +27,7 @@ subprojects { task clean(type: Delete) { delete rootProject.buildDir } + +android { + compileSdkVersion 31 +} \ No newline at end of file From be06e89d54a2adc2563a4f17d1ab3a431d9c59df Mon Sep 17 00:00:00 2001 From: John Date: Fri, 29 Oct 2021 21:36:25 -0500 Subject: [PATCH 03/52] implement permission_handler --- .../onboard/ui/screen/landing_page.dart | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/lib/feature/onboard/ui/screen/landing_page.dart b/lib/feature/onboard/ui/screen/landing_page.dart index 641a1dd6..89b9c4cc 100644 --- a/lib/feature/onboard/ui/screen/landing_page.dart +++ b/lib/feature/onboard/ui/screen/landing_page.dart @@ -1,5 +1,8 @@ +//import 'dart:html'; + import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:permission_handler/permission_handler.dart'; import 'package:treehousesble/common/bloc/bluetooth_cubit.dart'; import 'package:treehousesble/common/bloc/bluetooth_state.dart'; import 'package:treehousesble/feature/dashboard/screen/dashboard_page.dart'; @@ -15,9 +18,12 @@ class LandingPage extends StatefulWidget { } class _LandingPageState extends State { + PermissionStatus _status; + @override void initState() { super.initState(); + PermissionHandlerPlatform().checkPermissionStatus(Permission.locationWhenInUse, Permission.bluetooth).then(_updateStatus); context.read()..appStart(); } @@ -27,6 +33,7 @@ class _LandingPageState extends State { bloc: context.read(), builder: (context, state) { if (state is FirstTimeAppOpen) { + _askPermission(); return OnboardPage(); } else { return SearchRpiScreen(); @@ -34,4 +41,20 @@ class _LandingPageState extends State { }, ); } + + void _updateStatus(PermissionStatus status){ + if (status != _status) { + setState(() { + _status = status; + }); + } + } + void _askPermission() { + PermissionHandlerPlatform().requestPermisisons([Permission.locationWhenInUse, Permission.bluetooth]).then(_onStatusRequested); + } + + void _onStatusRequested(Map statuses) { + final status = statuses[Permission.locationWhenInUse, Permission.bluetooth]; + _updateStatus(status); + } } From 9769afdda34555d8cfa2997db6e6590396a9c9a8 Mon Sep 17 00:00:00 2001 From: ComputerOnFire Date: Fri, 29 Oct 2021 22:19:31 -0500 Subject: [PATCH 04/52] move permission check to appStart() within BluetoothCubit --- lib/common/bloc/bluetooth_cubit.dart | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/lib/common/bloc/bluetooth_cubit.dart b/lib/common/bloc/bluetooth_cubit.dart index 561b1c2b..3e9f9e44 100644 --- a/lib/common/bloc/bluetooth_cubit.dart +++ b/lib/common/bloc/bluetooth_cubit.dart @@ -2,6 +2,7 @@ import 'dart:convert'; import 'package:bloc/bloc.dart'; import 'package:flutter_blue/flutter_blue.dart'; +import 'package:permission_handler/permission_handler.dart'; import 'package:treehousesble/app/app.dart'; import 'package:treehousesble/common/bloc/bluetooth_state.dart'; import 'package:treehousesble/common/constants/app_constants.dart'; @@ -18,11 +19,17 @@ class BluetoothCubit extends Cubit { appStart() async { final bool firstTimeAppOpen = await SharedPref.getFirstTimeAppOpen(); - if (firstTimeAppOpen) { - emit(FirstTimeAppOpen()); - } else { - emit(NotFirstTimeAppOpen()); + Map statuses = await [Permission.location, Permission.bluetooth,].request(); + if(statuses[Permission.location] == PermissionStatus.granted){ + if (firstTimeAppOpen) { + emit(FirstTimeAppOpen()); + } else { + emit(NotFirstTimeAppOpen()); + } + } else{ + emit(PermissionsNotGranted()); } + } List _sendCommand(String command) { return utf8.encode(command); From e0c0c7d030d831fd7bac54d3afeefdcfd6a88fbd Mon Sep 17 00:00:00 2001 From: ComputerOnFire Date: Fri, 29 Oct 2021 22:21:48 -0500 Subject: [PATCH 05/52] add PermissionsNotGranted state --- lib/common/bloc/bluetooth_state.dart | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/common/bloc/bluetooth_state.dart b/lib/common/bloc/bluetooth_state.dart index ae4b121a..0bcf5ff7 100644 --- a/lib/common/bloc/bluetooth_state.dart +++ b/lib/common/bloc/bluetooth_state.dart @@ -15,12 +15,15 @@ class FirstTimeAppOpen extends DataState { List get props => []; } - class NotFirstTimeAppOpen extends DataState { @override List get props => []; } +class PermissionsNotGranted extends DataState { + @override + List get props => []; +} class StateIniital extends DataState {} From e07184f4e41f865a721deb3cacd1b788d5a6031b Mon Sep 17 00:00:00 2001 From: ComputerOnFire Date: Fri, 29 Oct 2021 22:22:24 -0500 Subject: [PATCH 06/52] remove permission check from landing page --- .../onboard/ui/screen/landing_page.dart | 23 +++---------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/lib/feature/onboard/ui/screen/landing_page.dart b/lib/feature/onboard/ui/screen/landing_page.dart index 89b9c4cc..3ad5bb83 100644 --- a/lib/feature/onboard/ui/screen/landing_page.dart +++ b/lib/feature/onboard/ui/screen/landing_page.dart @@ -1,8 +1,9 @@ -//import 'dart:html'; +import 'dart:html'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:permission_handler/permission_handler.dart'; +import 'package:fluttertoast/fluttertoast.dart'; import 'package:treehousesble/common/bloc/bluetooth_cubit.dart'; import 'package:treehousesble/common/bloc/bluetooth_state.dart'; import 'package:treehousesble/feature/dashboard/screen/dashboard_page.dart'; @@ -18,12 +19,10 @@ class LandingPage extends StatefulWidget { } class _LandingPageState extends State { - PermissionStatus _status; @override void initState() { super.initState(); - PermissionHandlerPlatform().checkPermissionStatus(Permission.locationWhenInUse, Permission.bluetooth).then(_updateStatus); context.read()..appStart(); } @@ -33,7 +32,7 @@ class _LandingPageState extends State { bloc: context.read(), builder: (context, state) { if (state is FirstTimeAppOpen) { - _askPermission(); + return OnboardPage(); } else { return SearchRpiScreen(); @@ -41,20 +40,4 @@ class _LandingPageState extends State { }, ); } - - void _updateStatus(PermissionStatus status){ - if (status != _status) { - setState(() { - _status = status; - }); - } - } - void _askPermission() { - PermissionHandlerPlatform().requestPermisisons([Permission.locationWhenInUse, Permission.bluetooth]).then(_onStatusRequested); - } - - void _onStatusRequested(Map statuses) { - final status = statuses[Permission.locationWhenInUse, Permission.bluetooth]; - _updateStatus(status); - } } From 6d2bdcd9202446cea9b9791bac26df1c9eebf3ce Mon Sep 17 00:00:00 2001 From: ComputerOnFire Date: Fri, 29 Oct 2021 22:30:23 -0500 Subject: [PATCH 07/52] remove android sdk settings from wrong build.gradle, update compileSdkVersion to 31 in correct build.gradle file --- android/build.gradle | 4 ---- 1 file changed, 4 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 76b097d1..6e04ec8f 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -26,8 +26,4 @@ subprojects { task clean(type: Delete) { delete rootProject.buildDir -} - -android { - compileSdkVersion 31 } \ No newline at end of file From 7c1da3ecdfc5e40b1c207ec426dbbd865b1aa965 Mon Sep 17 00:00:00 2001 From: ComputerOnFire Date: Fri, 29 Oct 2021 22:32:53 -0500 Subject: [PATCH 08/52] remove android sdk settings from wrong build.gradle, update compileSdkVersion and targetSdkVersion to 31 in correct build.gradle file --- android/app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 7a75b064..36dc0073 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -26,7 +26,7 @@ apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 30 + compileSdkVersion 31 sourceSets { main.java.srcDirs += 'src/main/kotlin' @@ -36,7 +36,7 @@ android { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "io.treehouses.remoteii" minSdkVersion 19 - targetSdkVersion 30 + targetSdkVersion 31 versionCode flutterVersionCode.toInteger() versionName flutterVersionName } From 869834907b8edad29c2eed469d6ac1766e6d0f44 Mon Sep 17 00:00:00 2001 From: ComputerOnFire Date: Fri, 29 Oct 2021 22:49:19 -0500 Subject: [PATCH 09/52] remove fluttertoast for now --- lib/feature/onboard/ui/screen/landing_page.dart | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/feature/onboard/ui/screen/landing_page.dart b/lib/feature/onboard/ui/screen/landing_page.dart index 3ad5bb83..7bb157d6 100644 --- a/lib/feature/onboard/ui/screen/landing_page.dart +++ b/lib/feature/onboard/ui/screen/landing_page.dart @@ -3,7 +3,6 @@ import 'dart:html'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:permission_handler/permission_handler.dart'; -import 'package:fluttertoast/fluttertoast.dart'; import 'package:treehousesble/common/bloc/bluetooth_cubit.dart'; import 'package:treehousesble/common/bloc/bluetooth_state.dart'; import 'package:treehousesble/feature/dashboard/screen/dashboard_page.dart'; From ed1efa7a39357f4e73ab4302405459bcad9e1fa1 Mon Sep 17 00:00:00 2001 From: ComputerOnFire Date: Fri, 29 Oct 2021 22:55:16 -0500 Subject: [PATCH 10/52] remove dart.html import --- lib/feature/onboard/ui/screen/landing_page.dart | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/feature/onboard/ui/screen/landing_page.dart b/lib/feature/onboard/ui/screen/landing_page.dart index 7bb157d6..87b2c296 100644 --- a/lib/feature/onboard/ui/screen/landing_page.dart +++ b/lib/feature/onboard/ui/screen/landing_page.dart @@ -1,5 +1,3 @@ -import 'dart:html'; - import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:permission_handler/permission_handler.dart'; From c29724810369a87634f54be103473308bfea351d Mon Sep 17 00:00:00 2001 From: John Date: Fri, 29 Oct 2021 23:43:07 -0500 Subject: [PATCH 11/52] cleanup of imports --- lib/feature/onboard/ui/screen/landing_page.dart | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/feature/onboard/ui/screen/landing_page.dart b/lib/feature/onboard/ui/screen/landing_page.dart index 87b2c296..d9861b96 100644 --- a/lib/feature/onboard/ui/screen/landing_page.dart +++ b/lib/feature/onboard/ui/screen/landing_page.dart @@ -1,9 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; -import 'package:permission_handler/permission_handler.dart'; import 'package:treehousesble/common/bloc/bluetooth_cubit.dart'; import 'package:treehousesble/common/bloc/bluetooth_state.dart'; -import 'package:treehousesble/feature/dashboard/screen/dashboard_page.dart'; import 'package:treehousesble/feature/dashboard/screen/search_rpi_screen.dart'; import 'onboard_page.dart'; @@ -29,7 +27,6 @@ class _LandingPageState extends State { bloc: context.read(), builder: (context, state) { if (state is FirstTimeAppOpen) { - return OnboardPage(); } else { return SearchRpiScreen(); From 65b27d3451d15fe0e52474d9eb9cf684aead4103 Mon Sep 17 00:00:00 2001 From: ComputerOnFire Date: Sat, 30 Oct 2021 00:27:36 -0500 Subject: [PATCH 12/52] downgrade permission_handler to 8.2.0 --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index 72a15c84..a4b75c96 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -24,7 +24,7 @@ dependencies: flutter: sdk: flutter flutter_blue: ^0.8.0 - permission_handler: ^8.2.5 + permission_handler: ^8.2.0 # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. From d375e7927ae3359cbdc8d016709532fecc77e3c7 Mon Sep 17 00:00:00 2001 From: ComputerOnFire Date: Sat, 30 Oct 2021 00:30:26 -0500 Subject: [PATCH 13/52] downgrade permission_handler to 8.1.6 --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index a4b75c96..df559445 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -24,7 +24,7 @@ dependencies: flutter: sdk: flutter flutter_blue: ^0.8.0 - permission_handler: ^8.2.0 + permission_handler: ^8.1.6 # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. From d1c1f13a065ae268d1a943d889fac0efd2091b5c Mon Sep 17 00:00:00 2001 From: John Date: Sat, 30 Oct 2021 00:44:09 -0500 Subject: [PATCH 14/52] formatting --- lib/feature/onboard/ui/screen/landing_page.dart | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/feature/onboard/ui/screen/landing_page.dart b/lib/feature/onboard/ui/screen/landing_page.dart index d9861b96..9f9bf2f6 100644 --- a/lib/feature/onboard/ui/screen/landing_page.dart +++ b/lib/feature/onboard/ui/screen/landing_page.dart @@ -14,7 +14,6 @@ class LandingPage extends StatefulWidget { } class _LandingPageState extends State { - @override void initState() { super.initState(); From e1b69d1955af1640a006c2bd43ff3ab1856397dc Mon Sep 17 00:00:00 2001 From: John Date: Sat, 30 Oct 2021 00:45:06 -0500 Subject: [PATCH 15/52] formatting --- lib/common/bloc/bluetooth_cubit.dart | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/common/bloc/bluetooth_cubit.dart b/lib/common/bloc/bluetooth_cubit.dart index 3e9f9e44..987af195 100644 --- a/lib/common/bloc/bluetooth_cubit.dart +++ b/lib/common/bloc/bluetooth_cubit.dart @@ -29,7 +29,6 @@ class BluetoothCubit extends Cubit { } else{ emit(PermissionsNotGranted()); } - } List _sendCommand(String command) { return utf8.encode(command); From 44b74add62f4b508f46c01277e90cad7f729a405 Mon Sep 17 00:00:00 2001 From: ComputerOnFire Date: Thu, 4 Nov 2021 02:16:26 -0500 Subject: [PATCH 16/52] refactor permissions requests, add requests for android 12 permissions --- android/app/src/main/AndroidManifest.xml | 13 +++++++++---- lib/common/bloc/bluetooth_cubit.dart | 5 +++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index f55778cd..2af053b4 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,15 +1,20 @@ - - - - + + + + + { appStart() async { final bool firstTimeAppOpen = await SharedPref.getFirstTimeAppOpen(); - Map statuses = await [Permission.location, Permission.bluetooth,].request(); - if(statuses[Permission.location] == PermissionStatus.granted){ + if(await Permission.location.request() == PermissionStatus.granted + && await Permission.bluetoothScan.request() == PermissionStatus.granted + && await Permission.bluetoothConnect.request() == PermissionStatus.granted){ if (firstTimeAppOpen) { emit(FirstTimeAppOpen()); } else { From 164687f9d54489596584571fc1aaf110f04fd1d6 Mon Sep 17 00:00:00 2001 From: ComputerOnFire Date: Thu, 4 Nov 2021 02:17:50 -0500 Subject: [PATCH 17/52] fix location permission --- android/app/src/main/AndroidManifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 2af053b4..8eced7af 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -7,7 +7,7 @@ android:maxSdkVersion="30" /> - + From 7f92a19648f01a43b4a8bc8ba9da4b64d3eb2d77 Mon Sep 17 00:00:00 2001 From: ComputerOnFire Date: Thu, 4 Nov 2021 02:28:30 -0500 Subject: [PATCH 18/52] change permissions back to target SDK 30 / Android 11 --- android/app/build.gradle | 4 ++-- android/app/src/main/AndroidManifest.xml | 9 ++------- lib/common/bloc/bluetooth_cubit.dart | 3 +-- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 36dc0073..7a75b064 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -26,7 +26,7 @@ apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 31 + compileSdkVersion 30 sourceSets { main.java.srcDirs += 'src/main/kotlin' @@ -36,7 +36,7 @@ android { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "io.treehouses.remoteii" minSdkVersion 19 - targetSdkVersion 31 + targetSdkVersion 30 versionCode flutterVersionCode.toInteger() versionName flutterVersionName } diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 8eced7af..38162606 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,12 +1,8 @@ - - - - + + { appStart() async { final bool firstTimeAppOpen = await SharedPref.getFirstTimeAppOpen(); if(await Permission.location.request() == PermissionStatus.granted - && await Permission.bluetoothScan.request() == PermissionStatus.granted - && await Permission.bluetoothConnect.request() == PermissionStatus.granted){ + && await Permission.bluetooth.request() == PermissionStatus.granted){ if (firstTimeAppOpen) { emit(FirstTimeAppOpen()); } else { From fbc4218ea16704ebb470755eafe51c54f33adbc5 Mon Sep 17 00:00:00 2001 From: ComputerOnFire Date: Thu, 4 Nov 2021 02:42:02 -0500 Subject: [PATCH 19/52] change permissions back to target SDK 30 / Android 11 --- pubspec.lock | 80 ++++++++++++++++++++++++++++++---------------------- 1 file changed, 47 insertions(+), 33 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index 81b3acdd..42c26d80 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -7,7 +7,7 @@ packages: name: archive url: "https://pub.dartlang.org" source: hosted - version: "3.1.2" + version: "3.0.0" args: dependency: transitive description: @@ -21,7 +21,7 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.8.2" + version: "2.8.1" bloc: dependency: "direct main" description: @@ -42,7 +42,7 @@ packages: name: characters url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.1.0" charcode: dependency: transitive description: @@ -70,21 +70,21 @@ packages: name: convert url: "https://pub.dartlang.org" source: hosted - version: "3.0.1" + version: "3.0.0" crypto: dependency: transitive description: name: crypto url: "https://pub.dartlang.org" source: hosted - version: "3.0.1" + version: "3.0.0" cupertino_icons: dependency: "direct main" description: name: cupertino_icons url: "https://pub.dartlang.org" source: hosted - version: "1.0.3" + version: "1.0.2" device_frame: dependency: transitive description: @@ -119,14 +119,14 @@ packages: name: ffi url: "https://pub.dartlang.org" source: hosted - version: "1.1.2" + version: "1.0.0" file: dependency: transitive description: name: file url: "https://pub.dartlang.org" source: hosted - version: "6.1.2" + version: "6.0.0" fixnum: dependency: transitive description: @@ -188,7 +188,7 @@ packages: name: font_awesome_flutter url: "https://pub.dartlang.org" source: hosted - version: "9.1.0" + version: "9.0.0" freezed_annotation: dependency: transitive description: @@ -244,14 +244,14 @@ packages: name: logger url: "https://pub.dartlang.org" source: hosted - version: "1.0.0" + version: "0.2.0" matcher: dependency: transitive description: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.11" + version: "0.12.10" meta: dependency: transitive description: @@ -300,49 +300,63 @@ packages: name: path_provider url: "https://pub.dartlang.org" source: hosted - version: "2.0.2" + version: "2.0.1" path_provider_linux: dependency: transitive description: name: path_provider_linux url: "https://pub.dartlang.org" source: hosted - version: "2.0.2" + version: "2.0.0" path_provider_macos: dependency: transitive description: name: path_provider_macos url: "https://pub.dartlang.org" source: hosted - version: "2.0.2" + version: "2.0.0" path_provider_platform_interface: dependency: transitive description: name: path_provider_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "2.0.1" + version: "2.0.0" path_provider_windows: dependency: transitive description: name: path_provider_windows url: "https://pub.dartlang.org" source: hosted - version: "2.0.3" + version: "2.0.0" pedantic: dependency: transitive description: name: pedantic url: "https://pub.dartlang.org" source: hosted - version: "1.11.1" + version: "1.10.0" + permission_handler: + dependency: "direct main" + description: + name: permission_handler + url: "https://pub.dartlang.org" + source: hosted + version: "8.1.6" + permission_handler_platform_interface: + dependency: transitive + description: + name: permission_handler_platform_interface + url: "https://pub.dartlang.org" + source: hosted + version: "3.6.1" petitparser: dependency: transitive description: name: petitparser url: "https://pub.dartlang.org" source: hosted - version: "4.1.0" + version: "4.0.0" platform: dependency: transitive description: @@ -356,14 +370,14 @@ packages: name: plugin_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "2.0.1" + version: "2.0.0" process: dependency: transitive description: name: process url: "https://pub.dartlang.org" source: hosted - version: "4.2.3" + version: "4.0.0" protobuf: dependency: transitive description: @@ -398,14 +412,14 @@ packages: name: shared_preferences_linux url: "https://pub.dartlang.org" source: hosted - version: "2.0.2" + version: "2.0.0" shared_preferences_macos: dependency: transitive description: name: shared_preferences_macos url: "https://pub.dartlang.org" source: hosted - version: "2.0.2" + version: "2.0.0" shared_preferences_platform_interface: dependency: transitive description: @@ -419,14 +433,14 @@ packages: name: shared_preferences_web url: "https://pub.dartlang.org" source: hosted - version: "2.0.1" + version: "2.0.0" shared_preferences_windows: dependency: transitive description: name: shared_preferences_windows url: "https://pub.dartlang.org" source: hosted - version: "2.0.2" + version: "2.0.0" sky_engine: dependency: transitive description: flutter @@ -473,7 +487,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.3" + version: "0.4.2" typed_data: dependency: transitive description: @@ -494,35 +508,35 @@ packages: name: url_launcher_linux url: "https://pub.dartlang.org" source: hosted - version: "2.0.1" + version: "2.0.0" url_launcher_macos: dependency: transitive description: name: url_launcher_macos url: "https://pub.dartlang.org" source: hosted - version: "2.0.1" + version: "2.0.0" url_launcher_platform_interface: dependency: transitive description: name: url_launcher_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "2.0.4" + version: "2.0.3" url_launcher_web: dependency: transitive description: name: url_launcher_web url: "https://pub.dartlang.org" source: hosted - version: "2.0.2" + version: "2.0.0" url_launcher_windows: dependency: transitive description: name: url_launcher_windows url: "https://pub.dartlang.org" source: hosted - version: "2.0.1" + version: "2.0.0" vector_math: dependency: transitive description: @@ -536,7 +550,7 @@ packages: name: win32 url: "https://pub.dartlang.org" source: hosted - version: "2.2.5" + version: "2.0.0" xdg_directories: dependency: transitive description: @@ -550,7 +564,7 @@ packages: name: xml url: "https://pub.dartlang.org" source: hosted - version: "5.1.2" + version: "5.0.0" yaml: dependency: transitive description: @@ -559,5 +573,5 @@ packages: source: hosted version: "3.1.0" sdks: - dart: ">=2.13.0 <3.0.0" + dart: ">=2.12.0 <3.0.0" flutter: ">=2.0.0" From f40e790072434aa3c2e36ad1776fa5b8cc8430ff Mon Sep 17 00:00:00 2001 From: John Date: Thu, 4 Nov 2021 05:47:38 -0500 Subject: [PATCH 20/52] upgrade flutter packages --- pubspec.lock | 76 +++++++++++++++++++++++++++++++--------------------- 1 file changed, 45 insertions(+), 31 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index 81b3acdd..b6e44f79 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -7,28 +7,28 @@ packages: name: archive url: "https://pub.dartlang.org" source: hosted - version: "3.1.2" + version: "3.1.6" args: dependency: transitive description: name: args url: "https://pub.dartlang.org" source: hosted - version: "2.2.0" + version: "2.3.0" async: dependency: transitive description: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.8.2" + version: "2.8.1" bloc: dependency: "direct main" description: name: bloc url: "https://pub.dartlang.org" source: hosted - version: "7.1.0" + version: "7.2.1" boolean_selector: dependency: transitive description: @@ -42,7 +42,7 @@ packages: name: characters url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.1.0" charcode: dependency: transitive description: @@ -188,21 +188,21 @@ packages: name: font_awesome_flutter url: "https://pub.dartlang.org" source: hosted - version: "9.1.0" + version: "9.2.0" freezed_annotation: dependency: transitive description: name: freezed_annotation url: "https://pub.dartlang.org" source: hosted - version: "0.14.2" + version: "0.14.3" http: dependency: "direct main" description: name: http url: "https://pub.dartlang.org" source: hosted - version: "0.13.3" + version: "0.13.4" http_parser: dependency: transitive description: @@ -216,7 +216,7 @@ packages: name: image url: "https://pub.dartlang.org" source: hosted - version: "3.0.2" + version: "3.0.8" intl: dependency: transitive description: @@ -237,21 +237,21 @@ packages: name: json_annotation url: "https://pub.dartlang.org" source: hosted - version: "4.0.1" + version: "4.3.0" logger: dependency: "direct main" description: name: logger url: "https://pub.dartlang.org" source: hosted - version: "1.0.0" + version: "1.1.0" matcher: dependency: transitive description: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.11" + version: "0.12.10" meta: dependency: transitive description: @@ -286,7 +286,7 @@ packages: name: path_drawing url: "https://pub.dartlang.org" source: hosted - version: "0.5.1" + version: "0.5.1+1" path_parsing: dependency: transitive description: @@ -300,14 +300,14 @@ packages: name: path_provider url: "https://pub.dartlang.org" source: hosted - version: "2.0.2" + version: "2.0.6" path_provider_linux: dependency: transitive description: name: path_provider_linux url: "https://pub.dartlang.org" source: hosted - version: "2.0.2" + version: "2.1.0" path_provider_macos: dependency: transitive description: @@ -336,34 +336,48 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.11.1" + permission_handler: + dependency: "direct main" + description: + name: permission_handler + url: "https://pub.dartlang.org" + source: hosted + version: "8.2.6" + permission_handler_platform_interface: + dependency: transitive + description: + name: permission_handler_platform_interface + url: "https://pub.dartlang.org" + source: hosted + version: "3.7.0" petitparser: dependency: transitive description: name: petitparser url: "https://pub.dartlang.org" source: hosted - version: "4.1.0" + version: "4.4.0" platform: dependency: transitive description: name: platform url: "https://pub.dartlang.org" source: hosted - version: "3.0.0" + version: "3.0.2" plugin_platform_interface: dependency: transitive description: name: plugin_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "2.0.1" + version: "2.0.2" process: dependency: transitive description: name: process url: "https://pub.dartlang.org" source: hosted - version: "4.2.3" + version: "4.2.4" protobuf: dependency: transitive description: @@ -391,7 +405,7 @@ packages: name: shared_preferences url: "https://pub.dartlang.org" source: hosted - version: "2.0.6" + version: "2.0.8" shared_preferences_linux: dependency: transitive description: @@ -419,7 +433,7 @@ packages: name: shared_preferences_web url: "https://pub.dartlang.org" source: hosted - version: "2.0.1" + version: "2.0.2" shared_preferences_windows: dependency: transitive description: @@ -473,7 +487,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.3" + version: "0.4.2" typed_data: dependency: transitive description: @@ -487,21 +501,21 @@ packages: name: url_launcher url: "https://pub.dartlang.org" source: hosted - version: "6.0.9" + version: "6.0.12" url_launcher_linux: dependency: transitive description: name: url_launcher_linux url: "https://pub.dartlang.org" source: hosted - version: "2.0.1" + version: "2.0.2" url_launcher_macos: dependency: transitive description: name: url_launcher_macos url: "https://pub.dartlang.org" source: hosted - version: "2.0.1" + version: "2.0.2" url_launcher_platform_interface: dependency: transitive description: @@ -515,14 +529,14 @@ packages: name: url_launcher_web url: "https://pub.dartlang.org" source: hosted - version: "2.0.2" + version: "2.0.4" url_launcher_windows: dependency: transitive description: name: url_launcher_windows url: "https://pub.dartlang.org" source: hosted - version: "2.0.1" + version: "2.0.2" vector_math: dependency: transitive description: @@ -536,7 +550,7 @@ packages: name: win32 url: "https://pub.dartlang.org" source: hosted - version: "2.2.5" + version: "2.2.10" xdg_directories: dependency: transitive description: @@ -550,7 +564,7 @@ packages: name: xml url: "https://pub.dartlang.org" source: hosted - version: "5.1.2" + version: "5.3.1" yaml: dependency: transitive description: @@ -559,5 +573,5 @@ packages: source: hosted version: "3.1.0" sdks: - dart: ">=2.13.0 <3.0.0" - flutter: ">=2.0.0" + dart: ">=2.14.0 <3.0.0" + flutter: ">=2.5.0" From e51175167098445cbe59ca5b34b6d87333d0ee3b Mon Sep 17 00:00:00 2001 From: ComputerOnFire Date: Thu, 4 Nov 2021 05:53:41 -0500 Subject: [PATCH 21/52] cleanup --- android/settings.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/settings.gradle b/android/settings.gradle index 44e62bcf..f860b764 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -8,4 +8,4 @@ localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) } def flutterSdkPath = properties.getProperty("flutter.sdk") assert flutterSdkPath != null, "flutter.sdk not set in local.properties" -apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle" +apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle" \ No newline at end of file From 08c2439991871d149a69fbfa67b028a60d6c6131 Mon Sep 17 00:00:00 2001 From: John <3631329+ComputerOnFire@users.noreply.github.com> Date: Thu, 4 Nov 2021 05:56:45 -0500 Subject: [PATCH 22/52] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d6243d67..30a03338 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -16,7 +16,7 @@ jobs: - uses: subosito/flutter-action@v1 with: channel: 'stable' - flutter-version: '2.2.0' + flutter-version: '2.5.2' - run: | flutter clean From 85aa3aaa4b0e19fd86da32a59799a1cd06b10f16 Mon Sep 17 00:00:00 2001 From: John <3631329+ComputerOnFire@users.noreply.github.com> Date: Thu, 4 Nov 2021 06:05:37 -0500 Subject: [PATCH 23/52] set ios version to minimum allowed by CoreBluetooth (10.0) --- ios/Podfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ios/Podfile b/ios/Podfile index 1e8c3c90..9411102b 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -1,5 +1,5 @@ # Uncomment this line to define a global platform for your project -# platform :ios, '9.0' +platform :ios, '10.0' # CocoaPods analytics sends network stats synchronously affecting flutter build latency. ENV['COCOAPODS_DISABLE_STATS'] = 'true' From 623d2c46e9af90e68986c7bfe6e24736b8de0042 Mon Sep 17 00:00:00 2001 From: ComputerOnFire Date: Thu, 4 Nov 2021 06:11:50 -0500 Subject: [PATCH 24/52] set ios version to minimum allowed by CoreBluetooth (10.0) --- ios/Runner.xcodeproj/project.pbxproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 8b23e54e..79be7242 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -340,7 +340,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; From 931a5e3590d8df5d2d96b0e48322ab4d031faf58 Mon Sep 17 00:00:00 2001 From: ComputerOnFire Date: Thu, 4 Nov 2021 06:24:27 -0500 Subject: [PATCH 25/52] set ios version to minimum allowed by CoreBluetooth (10.0) --- ios/Runner.xcodeproj/project.pbxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 79be7242..fb48d65c 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -414,7 +414,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -463,7 +463,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; From 317692e409a0a328cece1e82bf4e283a2633bcbb Mon Sep 17 00:00:00 2001 From: ComputerOnFire Date: Fri, 5 Nov 2021 21:01:22 -0500 Subject: [PATCH 26/52] set ios version to minimum allowed by CoreBluetooth (10.0) --- ios/Flutter/AppFrameworkInfo.plist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ios/Flutter/AppFrameworkInfo.plist b/ios/Flutter/AppFrameworkInfo.plist index 9367d483..ded19e29 100644 --- a/ios/Flutter/AppFrameworkInfo.plist +++ b/ios/Flutter/AppFrameworkInfo.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 MinimumOSVersion - 8.0 + 10.0 From 1c0d6488b96a83c7420209d24251d50698da55f2 Mon Sep 17 00:00:00 2001 From: ComputerOnFire Date: Fri, 5 Nov 2021 21:36:30 -0500 Subject: [PATCH 27/52] set ios version to minimum allowed by CoreBluetooth (10.0) --- ios/Podfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ios/Podfile b/ios/Podfile index 9411102b..fb6fec20 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -37,5 +37,7 @@ end post_install do |installer| installer.pods_project.targets.each do |target| flutter_additional_ios_build_settings(target) + target.build_configurations.each do |config| + config.build_settings['IPHONE_OS_DEPLOYMENT_TARGET'] = '10.0' end -end +end \ No newline at end of file From fa1f05b8d8d98aa882b8e2012e6a2d31ae5c58ed Mon Sep 17 00:00:00 2001 From: ComputerOnFire Date: Fri, 5 Nov 2021 22:06:46 -0500 Subject: [PATCH 28/52] set ios version to minimum allowed by CoreBluetooth (10.0) --- ios/Podfile | 1 + 1 file changed, 1 insertion(+) diff --git a/ios/Podfile b/ios/Podfile index fb6fec20..2ee8e1b2 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -39,5 +39,6 @@ post_install do |installer| flutter_additional_ios_build_settings(target) target.build_configurations.each do |config| config.build_settings['IPHONE_OS_DEPLOYMENT_TARGET'] = '10.0' + end end end \ No newline at end of file From 6b18372e9afde91588bcfc9842760370ad7ff670 Mon Sep 17 00:00:00 2001 From: ComputerOnFire Date: Fri, 5 Nov 2021 23:37:18 -0500 Subject: [PATCH 29/52] set ios version to minimum allowed by CoreBluetooth (10.0) --- ios/Podfile.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index fc71a9b2..7c6e668f 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -1,9 +1,9 @@ PODS: - - Flutter (1.0.0) - - flutter_blue (0.0.1): + - Flutter (2.5.3) + - flutter_blue (0.8.0): - Flutter - - flutter_blue/Protos (= 0.0.1) - - flutter_blue/Protos (0.0.1): + - flutter_blue/Protos (= 0.8.0) + - flutter_blue/Protos (0.8.0): - Flutter - Protobuf (~> 3.11.4) - package_info (0.0.1): From 860238a05f163825529215acc24cf4bf23bbec74 Mon Sep 17 00:00:00 2001 From: ComputerOnFire Date: Fri, 5 Nov 2021 23:39:37 -0500 Subject: [PATCH 30/52] set ios version to minimum allowed by CoreBluetooth (10.0) --- pubspec.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.lock b/pubspec.lock index b6e44f79..a59d12ce 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -84,7 +84,7 @@ packages: name: cupertino_icons url: "https://pub.dartlang.org" source: hosted - version: "1.0.3" + version: "1.0.4" device_frame: dependency: transitive description: From 7e96423590af3a5d63cea953cd0ce5d7ebba6561 Mon Sep 17 00:00:00 2001 From: ComputerOnFire Date: Fri, 5 Nov 2021 23:58:52 -0500 Subject: [PATCH 31/52] set ios version back to 9.0 --- ios/Podfile | 4 ++-- ios/Runner.xcodeproj/project.pbxproj | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ios/Podfile b/ios/Podfile index 2ee8e1b2..99c59260 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -1,5 +1,5 @@ # Uncomment this line to define a global platform for your project -platform :ios, '10.0' +platform :ios, '9.0' # CocoaPods analytics sends network stats synchronously affecting flutter build latency. ENV['COCOAPODS_DISABLE_STATS'] = 'true' @@ -38,7 +38,7 @@ post_install do |installer| installer.pods_project.targets.each do |target| flutter_additional_ios_build_settings(target) target.build_configurations.each do |config| - config.build_settings['IPHONE_OS_DEPLOYMENT_TARGET'] = '10.0' + config.build_settings['IPHONE_OS_DEPLOYMENT_TARGET'] = '9.0' end end end \ No newline at end of file diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index fb48d65c..8b23e54e 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -340,7 +340,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; @@ -414,7 +414,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -463,7 +463,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; From 52553d3e894daef3a2883b4475f3adcfcb543b2f Mon Sep 17 00:00:00 2001 From: ComputerOnFire Date: Sat, 6 Nov 2021 00:01:32 -0500 Subject: [PATCH 32/52] set ios version back to 9.0 --- ios/Podfile.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 7c6e668f..fc71a9b2 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -1,9 +1,9 @@ PODS: - - Flutter (2.5.3) - - flutter_blue (0.8.0): + - Flutter (1.0.0) + - flutter_blue (0.0.1): - Flutter - - flutter_blue/Protos (= 0.8.0) - - flutter_blue/Protos (0.8.0): + - flutter_blue/Protos (= 0.0.1) + - flutter_blue/Protos (0.0.1): - Flutter - Protobuf (~> 3.11.4) - package_info (0.0.1): From f56f89ed742366266f106558f83066ebb0e367ae Mon Sep 17 00:00:00 2001 From: ComputerOnFire Date: Sat, 6 Nov 2021 00:08:02 -0500 Subject: [PATCH 33/52] set ios version to minimum allowed by CoreBluetooth (10.0) --- ios/Podfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ios/Podfile b/ios/Podfile index 99c59260..2ee8e1b2 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -1,5 +1,5 @@ # Uncomment this line to define a global platform for your project -platform :ios, '9.0' +platform :ios, '10.0' # CocoaPods analytics sends network stats synchronously affecting flutter build latency. ENV['COCOAPODS_DISABLE_STATS'] = 'true' @@ -38,7 +38,7 @@ post_install do |installer| installer.pods_project.targets.each do |target| flutter_additional_ios_build_settings(target) target.build_configurations.each do |config| - config.build_settings['IPHONE_OS_DEPLOYMENT_TARGET'] = '9.0' + config.build_settings['IPHONE_OS_DEPLOYMENT_TARGET'] = '10.0' end end end \ No newline at end of file From bebe4d4a7600e5091555a4fcbd085af6f61b2cd8 Mon Sep 17 00:00:00 2001 From: ComputerOnFire Date: Sat, 6 Nov 2021 00:14:05 -0500 Subject: [PATCH 34/52] set ios version to minimum allowed by CoreBluetooth (10.0) --- ios/Runner.xcodeproj/project.pbxproj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 8b23e54e..fb48d65c 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -340,7 +340,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; @@ -414,7 +414,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -463,7 +463,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; From d7f6e711d7bf66b78bc43c35555d7f1bc91e497f Mon Sep 17 00:00:00 2001 From: ComputerOnFire Date: Sat, 6 Nov 2021 00:19:17 -0500 Subject: [PATCH 35/52] set ios version to minimum allowed by CoreBluetooth (10.0) --- ios/Podfile | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/ios/Podfile b/ios/Podfile index 2ee8e1b2..de3ab646 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -35,10 +35,9 @@ target 'Runner' do end post_install do |installer| - installer.pods_project.targets.each do |target| - flutter_additional_ios_build_settings(target) - target.build_configurations.each do |config| - config.build_settings['IPHONE_OS_DEPLOYMENT_TARGET'] = '10.0' - end + installer.pods_project.targets.each do |target| + target.build_configurations.each do |config| + config.build_settings.delete 'IPHONEOS_DEPLOYMENT_TARGET' end + end end \ No newline at end of file From 84c8644ce58885d30510053a85d39c97e2b4a683 Mon Sep 17 00:00:00 2001 From: ComputerOnFire Date: Sat, 6 Nov 2021 00:23:47 -0500 Subject: [PATCH 36/52] set ios version to minimum allowed by CoreBluetooth (10.0) --- ios/Podfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ios/Podfile b/ios/Podfile index de3ab646..cc53d01f 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -37,7 +37,7 @@ end post_install do |installer| installer.pods_project.targets.each do |target| target.build_configurations.each do |config| - config.build_settings.delete 'IPHONEOS_DEPLOYMENT_TARGET' + config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '10.0' end end end \ No newline at end of file From 1a7c9b267b86e4e3dc06cfd2167597d1df97f6a5 Mon Sep 17 00:00:00 2001 From: John <3631329+ComputerOnFire@users.noreply.github.com> Date: Sat, 6 Nov 2021 05:40:55 -0500 Subject: [PATCH 37/52] Update main.yml --- .github/workflows/main.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 30a03338..7410383f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -39,7 +39,9 @@ jobs: - uses: subosito/flutter-action@v1 with: channel: 'stable' # 'dev', 'alpha', default to: 'stable' - flutter-version: '2.2.0' # you can also specify exact version of flutter + flutter-version: '2.5.2' # you can also specify exact version of flutter - run: | + flutter clean flutter pub get + flutter pub uprade flutter build ios --release --no-codesign From ec3924f5be5545163e834b13a1d43073d64f6bf5 Mon Sep 17 00:00:00 2001 From: John <3631329+ComputerOnFire@users.noreply.github.com> Date: Sat, 6 Nov 2021 05:45:09 -0500 Subject: [PATCH 38/52] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7410383f..f654e5db 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -43,5 +43,5 @@ jobs: - run: | flutter clean flutter pub get - flutter pub uprade + flutter pub upgrade flutter build ios --release --no-codesign From f3c978f0af8bbb951b4dd12dd7f756be7cea69a1 Mon Sep 17 00:00:00 2001 From: John <3631329+ComputerOnFire@users.noreply.github.com> Date: Sat, 6 Nov 2021 05:50:33 -0500 Subject: [PATCH 39/52] Update Podfile --- ios/Podfile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/ios/Podfile b/ios/Podfile index cc53d01f..a48a53c0 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -35,9 +35,7 @@ target 'Runner' do end post_install do |installer| - installer.pods_project.targets.each do |target| - target.build_configurations.each do |config| - config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '10.0' + installer.pods_project.targets.each do |target| + flutter_additional_ios_build_settings(target) end - end -end \ No newline at end of file +end From 7361d74a3742ecea7efa41f8e5a42e4b1de031e7 Mon Sep 17 00:00:00 2001 From: John <3631329+ComputerOnFire@users.noreply.github.com> Date: Sat, 6 Nov 2021 06:02:32 -0500 Subject: [PATCH 40/52] make iOS build process match Android build process flutter pub upgrade can be removed if it causes problems in the future --- .github/workflows/main.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f654e5db..23f76c30 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -40,8 +40,10 @@ jobs: with: channel: 'stable' # 'dev', 'alpha', default to: 'stable' flutter-version: '2.5.2' # you can also specify exact version of flutter + - run: | flutter clean flutter pub get flutter pub upgrade - flutter build ios --release --no-codesign + + - run: flutter build ios --release --no-codesign From 0782de8b51ab4b55687a8e2d74c62bf61adb2247 Mon Sep 17 00:00:00 2001 From: ComputerOnFire Date: Sat, 6 Nov 2021 06:21:40 -0500 Subject: [PATCH 41/52] Merge branch 'permissions12' into permissions (target SDK 31 / Android 12) --- android/app/build.gradle | 4 ++-- android/app/src/main/AndroidManifest.xml | 9 +++++++-- lib/common/bloc/bluetooth_cubit.dart | 3 ++- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 7a75b064..36dc0073 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -26,7 +26,7 @@ apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 30 + compileSdkVersion 31 sourceSets { main.java.srcDirs += 'src/main/kotlin' @@ -36,7 +36,7 @@ android { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "io.treehouses.remoteii" minSdkVersion 19 - targetSdkVersion 30 + targetSdkVersion 31 versionCode flutterVersionCode.toInteger() versionName flutterVersionName } diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 38162606..8eced7af 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,8 +1,12 @@ - - + + + + { appStart() async { final bool firstTimeAppOpen = await SharedPref.getFirstTimeAppOpen(); if(await Permission.location.request() == PermissionStatus.granted - && await Permission.bluetooth.request() == PermissionStatus.granted){ + && await Permission.bluetoothScan.request() == PermissionStatus.granted + && await Permission.bluetoothConnect.request() == PermissionStatus.granted){ if (firstTimeAppOpen) { emit(FirstTimeAppOpen()); } else { From 30aedaea901c3a378dafe4a5b6fa60da0bb86594 Mon Sep 17 00:00:00 2001 From: ComputerOnFire Date: Sat, 6 Nov 2021 06:54:21 -0500 Subject: [PATCH 42/52] refactor --- lib/common/bloc/bluetooth_cubit.dart | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/common/bloc/bluetooth_cubit.dart b/lib/common/bloc/bluetooth_cubit.dart index 4158fcf3..2dd09d75 100644 --- a/lib/common/bloc/bluetooth_cubit.dart +++ b/lib/common/bloc/bluetooth_cubit.dart @@ -19,9 +19,14 @@ class BluetoothCubit extends Cubit { appStart() async { final bool firstTimeAppOpen = await SharedPref.getFirstTimeAppOpen(); - if(await Permission.location.request() == PermissionStatus.granted - && await Permission.bluetoothScan.request() == PermissionStatus.granted - && await Permission.bluetoothConnect.request() == PermissionStatus.granted){ + Map bluStatuses = await [ + Permission.bluetoothScan, + Permission.bluetoothConnect, + Permission.location, + ].request(); + if(bluStatuses[Permission.location] == PermissionStatus.granted + && bluStatuses[Permission.bluetoothScan] == PermissionStatus.granted + && bluStatuses[Permission.bluetoothConnect] == PermissionStatus.granted){ if (firstTimeAppOpen) { emit(FirstTimeAppOpen()); } else { From 8c504ede577f83199ca399080e752bff96f36aa1 Mon Sep 17 00:00:00 2001 From: ComputerOnFire Date: Sat, 6 Nov 2021 06:58:17 -0500 Subject: [PATCH 43/52] refactor --- lib/common/bloc/bluetooth_cubit.dart | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/common/bloc/bluetooth_cubit.dart b/lib/common/bloc/bluetooth_cubit.dart index 2dd09d75..0e52179e 100644 --- a/lib/common/bloc/bluetooth_cubit.dart +++ b/lib/common/bloc/bluetooth_cubit.dart @@ -19,14 +19,14 @@ class BluetoothCubit extends Cubit { appStart() async { final bool firstTimeAppOpen = await SharedPref.getFirstTimeAppOpen(); - Map bluStatuses = await [ + Map statuses = await [ + Permission.location, Permission.bluetoothScan, Permission.bluetoothConnect, - Permission.location, ].request(); - if(bluStatuses[Permission.location] == PermissionStatus.granted - && bluStatuses[Permission.bluetoothScan] == PermissionStatus.granted - && bluStatuses[Permission.bluetoothConnect] == PermissionStatus.granted){ + if(statuses[Permission.location] == PermissionStatus.granted + && statuses[Permission.bluetoothScan] == PermissionStatus.granted + && statuses[Permission.bluetoothConnect] == PermissionStatus.granted){ if (firstTimeAppOpen) { emit(FirstTimeAppOpen()); } else { From 9ef65caa4934f1d95d9c74e0e1c98e81464932fc Mon Sep 17 00:00:00 2001 From: ComputerOnFire Date: Wed, 10 Nov 2021 21:02:15 -0600 Subject: [PATCH 44/52] update podfile for ios permissions --- ios/Podfile | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/ios/Podfile b/ios/Podfile index a48a53c0..6a5d7765 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -35,7 +35,25 @@ target 'Runner' do end post_install do |installer| - installer.pods_project.targets.each do |target| - flutter_additional_ios_build_settings(target) + installer.pods_project.targets.each do |target| + target.build_configurations.each do |config| + ... # Here are some configurations automatically generated by flutter + + # You can enable the permissions needed here. For example to enable camera + # permission, just remove the `#` character in front so it looks like this: + # + # ## dart: PermissionGroup.camera + # 'PERMISSION_CAMERA=1' + # + # Preprocessor definitions can be found in: https://github.com/Baseflow/flutter-permission-handler/blob/master/permission_handler/ios/Classes/PermissionHandlerEnums.h + config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= [ + '$(inherited)', + + ## dart: [PermissionGroup.location, PermissionGroup.locationAlways, PermissionGroup.locationWhenInUse] + 'PERMISSION_LOCATION=1', + + ] + + end end -end +end \ No newline at end of file From 71d91984e728c3b13ee2b7fd6fd090453e282646 Mon Sep 17 00:00:00 2001 From: ComputerOnFire Date: Wed, 10 Nov 2021 21:12:06 -0600 Subject: [PATCH 45/52] update podfile for ios permissions --- ios/Podfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ios/Podfile b/ios/Podfile index 6a5d7765..b2a4883f 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -36,7 +36,7 @@ end post_install do |installer| installer.pods_project.targets.each do |target| - target.build_configurations.each do |config| + flutter_additional_ios_build_settings(target) ... # Here are some configurations automatically generated by flutter # You can enable the permissions needed here. For example to enable camera From 9917339f3d44f73667d8f8b28718e60204bca20a Mon Sep 17 00:00:00 2001 From: ComputerOnFire Date: Wed, 10 Nov 2021 21:23:17 -0600 Subject: [PATCH 46/52] update podfile for ios permissions --- ios/Podfile | 1 - 1 file changed, 1 deletion(-) diff --git a/ios/Podfile b/ios/Podfile index b2a4883f..b8ea1359 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -54,6 +54,5 @@ post_install do |installer| ] - end end end \ No newline at end of file From 26aa68ffbf3192d4388c9afabbf40b27285f75c6 Mon Sep 17 00:00:00 2001 From: rrijal53 Date: Thu, 11 Nov 2021 09:08:43 +0545 Subject: [PATCH 47/52] update pod --- ios/Podfile | 40 +++++++++++++++++++++++++++++++++- ios/Podfile.lock | 56 ------------------------------------------------ 2 files changed, 39 insertions(+), 57 deletions(-) delete mode 100644 ios/Podfile.lock diff --git a/ios/Podfile b/ios/Podfile index b2a4883f..3060a82a 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -36,7 +36,7 @@ end post_install do |installer| installer.pods_project.targets.each do |target| - flutter_additional_ios_build_settings(target) + target.build_configurations.each do |config| ... # Here are some configurations automatically generated by flutter # You can enable the permissions needed here. For example to enable camera @@ -49,9 +49,47 @@ post_install do |installer| config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= [ '$(inherited)', + ## dart: PermissionGroup.calendar + # 'PERMISSION_EVENTS=1', + + ## dart: PermissionGroup.reminders + # 'PERMISSION_REMINDERS=1', + + ## dart: PermissionGroup.contacts + # 'PERMISSION_CONTACTS=1', + + ## dart: PermissionGroup.camera + # 'PERMISSION_CAMERA=1', + + ## dart: PermissionGroup.microphone + # 'PERMISSION_MICROPHONE=1', + + ## dart: PermissionGroup.speech + # 'PERMISSION_SPEECH_RECOGNIZER=1', + + ## dart: PermissionGroup.photos + # 'PERMISSION_PHOTOS=1', + ## dart: [PermissionGroup.location, PermissionGroup.locationAlways, PermissionGroup.locationWhenInUse] 'PERMISSION_LOCATION=1', + ## dart: PermissionGroup.notification + # 'PERMISSION_NOTIFICATIONS=1', + + ## dart: PermissionGroup.mediaLibrary + # 'PERMISSION_MEDIA_LIBRARY=1', + + ## dart: PermissionGroup.sensors + # 'PERMISSION_SENSORS=1', + + ## dart: PermissionGroup.bluetooth + # 'PERMISSION_BLUETOOTH=1', + + ## dart: PermissionGroup.appTrackingTransparency + # 'PERMISSION_APP_TRACKING_TRANSPARENCY=1', + + ## dart: PermissionGroup.criticalAlerts + # 'PERMISSION_CRITICAL_ALERTS=1' ] end diff --git a/ios/Podfile.lock b/ios/Podfile.lock deleted file mode 100644 index fc71a9b2..00000000 --- a/ios/Podfile.lock +++ /dev/null @@ -1,56 +0,0 @@ -PODS: - - Flutter (1.0.0) - - flutter_blue (0.0.1): - - Flutter - - flutter_blue/Protos (= 0.0.1) - - flutter_blue/Protos (0.0.1): - - Flutter - - Protobuf (~> 3.11.4) - - package_info (0.0.1): - - Flutter - - path_provider (0.0.1): - - Flutter - - Protobuf (3.11.4) - - shared_preferences (0.0.1): - - Flutter - - url_launcher (0.0.1): - - Flutter - -DEPENDENCIES: - - Flutter (from `Flutter`) - - flutter_blue (from `.symlinks/plugins/flutter_blue/ios`) - - package_info (from `.symlinks/plugins/package_info/ios`) - - path_provider (from `.symlinks/plugins/path_provider/ios`) - - shared_preferences (from `.symlinks/plugins/shared_preferences/ios`) - - url_launcher (from `.symlinks/plugins/url_launcher/ios`) - -SPEC REPOS: - trunk: - - Protobuf - -EXTERNAL SOURCES: - Flutter: - :path: Flutter - flutter_blue: - :path: ".symlinks/plugins/flutter_blue/ios" - package_info: - :path: ".symlinks/plugins/package_info/ios" - path_provider: - :path: ".symlinks/plugins/path_provider/ios" - shared_preferences: - :path: ".symlinks/plugins/shared_preferences/ios" - url_launcher: - :path: ".symlinks/plugins/url_launcher/ios" - -SPEC CHECKSUMS: - Flutter: 434fef37c0980e73bb6479ef766c45957d4b510c - flutter_blue: eeb381dc4727a0954dede73515f683865494b370 - package_info: 873975fc26034f0b863a300ad47e7f1ac6c7ec62 - path_provider: abfe2b5c733d04e238b0d8691db0cfd63a27a93c - Protobuf: 176220c526ad8bd09ab1fb40a978eac3fef665f7 - shared_preferences: af6bfa751691cdc24be3045c43ec037377ada40d - url_launcher: 6fef411d543ceb26efce54b05a0a40bfd74cbbef - -PODFILE CHECKSUM: aafe91acc616949ddb318b77800a7f51bffa2a4c - -COCOAPODS: 1.10.2 From 3baee5306f4158a87406a0eb36930e25cf00e639 Mon Sep 17 00:00:00 2001 From: rrijal53 Date: Thu, 11 Nov 2021 09:13:25 +0545 Subject: [PATCH 48/52] fix pod file --- ios/Podfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ios/Podfile b/ios/Podfile index 08200993..8538372b 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -1,5 +1,4 @@ -# Uncomment this line to define a global platform for your project -platform :ios, '10.0' +platform :ios, '12.0' # CocoaPods analytics sends network stats synchronously affecting flutter build latency. ENV['COCOAPODS_DISABLE_STATS'] = 'true' @@ -37,7 +36,7 @@ end post_install do |installer| installer.pods_project.targets.each do |target| target.build_configurations.each do |config| - ... # Here are some configurations automatically generated by flutter + # Here are some configurations automatically generated by flutter # You can enable the permissions needed here. For example to enable camera # permission, just remove the `#` character in front so it looks like this: @@ -71,7 +70,7 @@ post_install do |installer| # 'PERMISSION_PHOTOS=1', ## dart: [PermissionGroup.location, PermissionGroup.locationAlways, PermissionGroup.locationWhenInUse] - 'PERMISSION_LOCATION=1', + # 'PERMISSION_LOCATION=1', ## dart: PermissionGroup.notification # 'PERMISSION_NOTIFICATIONS=1', @@ -92,5 +91,6 @@ post_install do |installer| # 'PERMISSION_CRITICAL_ALERTS=1' ] + end end end \ No newline at end of file From 4f2d481ba042407a4d53b421b5a7c0b1a7eafe7f Mon Sep 17 00:00:00 2001 From: rrijal53 Date: Thu, 11 Nov 2021 09:21:09 +0545 Subject: [PATCH 49/52] modified xcodeproj --- ios/Podfile.lock | 62 ++++++++++++++++++++++++++++ ios/Runner.xcodeproj/project.pbxproj | 30 ++++++++++---- 2 files changed, 83 insertions(+), 9 deletions(-) create mode 100644 ios/Podfile.lock diff --git a/ios/Podfile.lock b/ios/Podfile.lock new file mode 100644 index 00000000..e131b4f2 --- /dev/null +++ b/ios/Podfile.lock @@ -0,0 +1,62 @@ +PODS: + - Flutter (1.0.0) + - flutter_blue (0.0.1): + - Flutter + - flutter_blue/Protos (= 0.0.1) + - flutter_blue/Protos (0.0.1): + - Flutter + - Protobuf (~> 3.11.4) + - package_info (0.0.1): + - Flutter + - path_provider (0.0.1): + - Flutter + - "permission_handler (5.1.0+2)": + - Flutter + - Protobuf (3.11.4) + - shared_preferences (0.0.1): + - Flutter + - url_launcher (0.0.1): + - Flutter + +DEPENDENCIES: + - Flutter (from `Flutter`) + - flutter_blue (from `.symlinks/plugins/flutter_blue/ios`) + - package_info (from `.symlinks/plugins/package_info/ios`) + - path_provider (from `.symlinks/plugins/path_provider/ios`) + - permission_handler (from `.symlinks/plugins/permission_handler/ios`) + - shared_preferences (from `.symlinks/plugins/shared_preferences/ios`) + - url_launcher (from `.symlinks/plugins/url_launcher/ios`) + +SPEC REPOS: + trunk: + - Protobuf + +EXTERNAL SOURCES: + Flutter: + :path: Flutter + flutter_blue: + :path: ".symlinks/plugins/flutter_blue/ios" + package_info: + :path: ".symlinks/plugins/package_info/ios" + path_provider: + :path: ".symlinks/plugins/path_provider/ios" + permission_handler: + :path: ".symlinks/plugins/permission_handler/ios" + shared_preferences: + :path: ".symlinks/plugins/shared_preferences/ios" + url_launcher: + :path: ".symlinks/plugins/url_launcher/ios" + +SPEC CHECKSUMS: + Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a + flutter_blue: eeb381dc4727a0954dede73515f683865494b370 + package_info: 873975fc26034f0b863a300ad47e7f1ac6c7ec62 + path_provider: d1e9807085df1f9cc9318206cd649dc0b76be3de + permission_handler: ccb20a9fad0ee9b1314a52b70b76b473c5f8dab0 + Protobuf: 176220c526ad8bd09ab1fb40a978eac3fef665f7 + shared_preferences: 5033afbb22d372e15aff8ff766df9021b845f273 + url_launcher: b6e016d912f04be9f5bf6e8e82dc599b7ba59649 + +PODFILE CHECKSUM: b60401e0786671c95f8690875d6d678ff610ee11 + +COCOAPODS: 1.10.2 diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index fb48d65c..460486fa 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 46; + objectVersion = 51; objects = { /* Begin PBXBuildFile section */ @@ -121,7 +121,6 @@ 0790B6FC0CD83AFFF907B93D /* Pods-Runner.release.xcconfig */, 6CCBBC19E381606D430444C9 /* Pods-Runner.profile.xcconfig */, ); - name = Pods; path = Pods; sourceTree = ""; }; @@ -340,7 +339,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; @@ -358,7 +357,11 @@ CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = io.treehouses.remoteii; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -414,7 +417,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -463,11 +466,12 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; }; @@ -482,7 +486,11 @@ CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = io.treehouses.remoteii; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -501,7 +509,11 @@ CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); PRODUCT_BUNDLE_IDENTIFIER = io.treehouses.remoteii; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; From 525440b326036e07fa6d65bd623a082491a0e137 Mon Sep 17 00:00:00 2001 From: rrijal53 Date: Thu, 11 Nov 2021 09:25:20 +0545 Subject: [PATCH 50/52] updated pod --- ios/Podfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ios/Podfile b/ios/Podfile index 8538372b..5f800618 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -70,7 +70,7 @@ post_install do |installer| # 'PERMISSION_PHOTOS=1', ## dart: [PermissionGroup.location, PermissionGroup.locationAlways, PermissionGroup.locationWhenInUse] - # 'PERMISSION_LOCATION=1', + 'PERMISSION_LOCATION=1', ## dart: PermissionGroup.notification # 'PERMISSION_NOTIFICATIONS=1', From c933c69b4613b5108fa437e4ee65b2af06a01974 Mon Sep 17 00:00:00 2001 From: rrijal53 Date: Thu, 11 Nov 2021 09:33:06 +0545 Subject: [PATCH 51/52] updated actions --- .github/workflows/main.yml | 4 +++- ios/Podfile.lock | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 23f76c30..9a581003 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -44,6 +44,8 @@ jobs: - run: | flutter clean flutter pub get - flutter pub upgrade + cd ios + pod install + - run: flutter build ios --release --no-codesign diff --git a/ios/Podfile.lock b/ios/Podfile.lock index e131b4f2..3f747529 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -57,6 +57,6 @@ SPEC CHECKSUMS: shared_preferences: 5033afbb22d372e15aff8ff766df9021b845f273 url_launcher: b6e016d912f04be9f5bf6e8e82dc599b7ba59649 -PODFILE CHECKSUM: b60401e0786671c95f8690875d6d678ff610ee11 +PODFILE CHECKSUM: e189183991abb22801b63b88dfef451db75fbdf8 COCOAPODS: 1.10.2 From 0f5f934aeccdb9064ad0b0c11f16af3b118e8986 Mon Sep 17 00:00:00 2001 From: rrijal53 Date: Sat, 13 Nov 2021 08:38:30 +0545 Subject: [PATCH 52/52] fix build issue --- ios/Podfile | 2 ++ ios/Podfile.lock | 2 +- .../xcshareddata/IDEWorkspaceChecks.plist | 8 -------- .../xcshareddata/WorkspaceSettings.xcsettings | 8 -------- pubspec.lock | 10 +++++----- 5 files changed, 8 insertions(+), 22 deletions(-) delete mode 100644 ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist delete mode 100644 ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings diff --git a/ios/Podfile b/ios/Podfile index 5f800618..29cd8dbe 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -35,7 +35,9 @@ end post_install do |installer| installer.pods_project.targets.each do |target| + flutter_additional_ios_build_settings(target) target.build_configurations.each do |config| + config.build_settings.delete 'IPHONEOS_DEPLOYMENT_TARGET' # Here are some configurations automatically generated by flutter # You can enable the permissions needed here. For example to enable camera diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 3f747529..76477ca1 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -57,6 +57,6 @@ SPEC CHECKSUMS: shared_preferences: 5033afbb22d372e15aff8ff766df9021b845f273 url_launcher: b6e016d912f04be9f5bf6e8e82dc599b7ba59649 -PODFILE CHECKSUM: e189183991abb22801b63b88dfef451db75fbdf8 +PODFILE CHECKSUM: d4807ef77006891d298ba2f893031d4f0cd35075 COCOAPODS: 1.10.2 diff --git a/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist deleted file mode 100644 index 18d98100..00000000 --- a/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist +++ /dev/null @@ -1,8 +0,0 @@ - - - - - IDEDidComputeMac32BitWarning - - - diff --git a/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings deleted file mode 100644 index f9b0d7c5..00000000 --- a/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings +++ /dev/null @@ -1,8 +0,0 @@ - - - - - PreviewsEnabled - - - diff --git a/pubspec.lock b/pubspec.lock index a59d12ce..3cf39dfb 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -307,7 +307,7 @@ packages: name: path_provider_linux url: "https://pub.dartlang.org" source: hosted - version: "2.1.0" + version: "2.1.1" path_provider_macos: dependency: transitive description: @@ -328,7 +328,7 @@ packages: name: path_provider_windows url: "https://pub.dartlang.org" source: hosted - version: "2.0.3" + version: "2.0.4" pedantic: dependency: transitive description: @@ -412,7 +412,7 @@ packages: name: shared_preferences_linux url: "https://pub.dartlang.org" source: hosted - version: "2.0.2" + version: "2.0.3" shared_preferences_macos: dependency: transitive description: @@ -440,7 +440,7 @@ packages: name: shared_preferences_windows url: "https://pub.dartlang.org" source: hosted - version: "2.0.2" + version: "2.0.3" sky_engine: dependency: transitive description: flutter @@ -550,7 +550,7 @@ packages: name: win32 url: "https://pub.dartlang.org" source: hosted - version: "2.2.10" + version: "2.3.0" xdg_directories: dependency: transitive description: