From bd11f677291ec96623927c45805ad63c64eea478 Mon Sep 17 00:00:00 2001 From: Guillaume Bernos Date: Thu, 2 Mar 2023 17:44:41 +0100 Subject: [PATCH] feat: update to run on Flutter 3.7 --- .gitignore | 1 + .../example/ios/Flutter/AppFrameworkInfo.plist | 2 +- .../example/ios/Runner.xcodeproj/project.pbxproj | 10 ++++++---- packages/location/example/ios/Runner/Info.plist | 2 ++ .../GooglePlayServicesLocationProvider.java | 2 -- .../GooglePlayServicesLocationSource.java | 4 +++- pubspec.yaml | 7 +++++++ 7 files changed, 20 insertions(+), 8 deletions(-) create mode 100644 pubspec.yaml diff --git a/.gitignore b/.gitignore index 4aa0df8d..dd5514f7 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ .pub/ .dart_tool/ pubspec.lock +pubspec_overrides.yaml flutter_export_environment.sh coverage/ diff --git a/packages/location/example/ios/Flutter/AppFrameworkInfo.plist b/packages/location/example/ios/Flutter/AppFrameworkInfo.plist index 8d4492f9..9625e105 100644 --- a/packages/location/example/ios/Flutter/AppFrameworkInfo.plist +++ b/packages/location/example/ios/Flutter/AppFrameworkInfo.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 MinimumOSVersion - 9.0 + 11.0 diff --git a/packages/location/example/ios/Runner.xcodeproj/project.pbxproj b/packages/location/example/ios/Runner.xcodeproj/project.pbxproj index 73bddc5a..f8928417 100644 --- a/packages/location/example/ios/Runner.xcodeproj/project.pbxproj +++ b/packages/location/example/ios/Runner.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 51; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ @@ -221,6 +221,7 @@ }; 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); @@ -252,6 +253,7 @@ }; 9740EEB61CF901F6004384FC /* Run Script */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); @@ -339,7 +341,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 = 11.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; @@ -418,7 +420,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 = 11.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -467,7 +469,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 = 11.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; diff --git a/packages/location/example/ios/Runner/Info.plist b/packages/location/example/ios/Runner/Info.plist index 56bfd634..78a9438f 100644 --- a/packages/location/example/ios/Runner/Info.plist +++ b/packages/location/example/ios/Runner/Info.plist @@ -57,5 +57,7 @@ UIViewControllerBasedStatusBarAppearance + UIApplicationSupportsIndirectInputEvents + diff --git a/packages/location_android/android/src/main/kotlin/com/lyokone/location/location/providers/locationprovider/GooglePlayServicesLocationProvider.java b/packages/location_android/android/src/main/kotlin/com/lyokone/location/location/providers/locationprovider/GooglePlayServicesLocationProvider.java index 36753ef3..a302ca33 100644 --- a/packages/location_android/android/src/main/kotlin/com/lyokone/location/location/providers/locationprovider/GooglePlayServicesLocationProvider.java +++ b/packages/location_android/android/src/main/kotlin/com/lyokone/location/location/providers/locationprovider/GooglePlayServicesLocationProvider.java @@ -20,9 +20,7 @@ import com.lyokone.location.location.constants.RequestCode; import com.lyokone.location.location.helper.LogUtils; import com.lyokone.location.location.listener.FallbackListener; -import com.lyokone.location.location.providers.locationprovider.GooglePlayServicesLocationSource; import com.lyokone.location.location.providers.locationprovider.GooglePlayServicesLocationSource.SourceListener; -import com.lyokone.location.location.providers.locationprovider.LocationProvider; import java.lang.ref.WeakReference; diff --git a/packages/location_android/android/src/main/kotlin/com/lyokone/location/location/providers/locationprovider/GooglePlayServicesLocationSource.java b/packages/location_android/android/src/main/kotlin/com/lyokone/location/location/providers/locationprovider/GooglePlayServicesLocationSource.java index 944a96f4..ee02bf7d 100644 --- a/packages/location_android/android/src/main/kotlin/com/lyokone/location/location/providers/locationprovider/GooglePlayServicesLocationSource.java +++ b/packages/location_android/android/src/main/kotlin/com/lyokone/location/location/providers/locationprovider/GooglePlayServicesLocationSource.java @@ -28,6 +28,7 @@ class GooglePlayServicesLocationSource extends LocationCallback { private final FusedLocationProviderClient fusedLocationProviderClient; private final LocationRequest locationRequest; private final SourceListener sourceListener; + private final Context context; interface SourceListener extends OnSuccessListener, OnFailureListener { void onSuccess(LocationSettingsResponse locationSettingsResponse); @@ -43,10 +44,11 @@ interface SourceListener extends OnSuccessListener, On this.sourceListener = sourceListener; this.locationRequest = locationRequest; this.fusedLocationProviderClient = LocationServices.getFusedLocationProviderClient(context); + this.context = context; } void checkLocationSettings() { - LocationServices.getSettingsClient(fusedLocationProviderClient.getApplicationContext()) + LocationServices.getSettingsClient(context) .checkLocationSettings( new LocationSettingsRequest.Builder() .addLocationRequest(locationRequest) diff --git a/pubspec.yaml b/pubspec.yaml new file mode 100644 index 00000000..698cef6d --- /dev/null +++ b/pubspec.yaml @@ -0,0 +1,7 @@ +name: sharemail_workspace + +environment: + sdk: ">=2.18.0 <3.0.0" + +dev_dependencies: + melos: ^3.0.0-dev.0