From 632f0c20a164569663d948c67aece1f91e92318f Mon Sep 17 00:00:00 2001
From: Nils Strelow <strelow.nils@gmail.com>
Date: Sat, 29 Aug 2020 15:47:20 +0200
Subject: [PATCH 1/2] Replace devicelocale by Platform.localeName call

---
 lib/parse_server_sdk.dart               | 1 -
 lib/src/objects/parse_installation.dart | 2 +-
 pubspec.yaml                            | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/parse_server_sdk.dart b/lib/parse_server_sdk.dart
index 606fd131c..45b4b42dd 100644
--- a/lib/parse_server_sdk.dart
+++ b/lib/parse_server_sdk.dart
@@ -7,7 +7,6 @@ import 'dart:math';
 import 'dart:typed_data';
 import 'dart:ui' as ui;
 
-import 'package:devicelocale/devicelocale.dart';
 import 'package:http/http.dart';
 import 'package:http/io_client.dart';
 import 'package:meta/meta.dart';
diff --git a/lib/src/objects/parse_installation.dart b/lib/src/objects/parse_installation.dart
index 34e9eaa45..ad44b3470 100644
--- a/lib/src/objects/parse_installation.dart
+++ b/lib/src/objects/parse_installation.dart
@@ -85,7 +85,7 @@ class ParseInstallation extends ParseObject {
     //Locale
     final String locale = parseIsWeb
         ? ui.window.locale.toString()
-        : await Devicelocale.currentLocale;
+        : Platform.localeName;
     if (locale != null && locale.isNotEmpty) {
       set<String>(keyLocaleIdentifier, locale);
     }
diff --git a/pubspec.yaml b/pubspec.yaml
index ed3c92eac..ab00eac0f 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -24,7 +24,6 @@ dependencies:
   path_provider: ^1.6.14
   uuid: ^2.2.2
   package_info: ^0.4.3
-  devicelocale: ^0.3.1
   meta: ^1.1.8
   path: ^1.7.0
 

From 05757f506b6af63bf2643616301c03761a05d819 Mon Sep 17 00:00:00 2001
From: Nils Strelow <strelow.nils@gmail.com>
Date: Sat, 29 Aug 2020 16:15:50 +0200
Subject: [PATCH 2/2] Use flutter_test to meet new requirements

---
 pubspec.yaml                              | 3 ++-
 test/parse_client_configuration_test.dart | 2 +-
 test/parse_query_test.dart                | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pubspec.yaml b/pubspec.yaml
index ab00eac0f..b23f9ab4a 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -29,5 +29,6 @@ dependencies:
 
 dev_dependencies:
   # Testing
-  test: ^1.15.3
+  flutter_test:
+    sdk: flutter
   mockito: ^4.1.1
diff --git a/test/parse_client_configuration_test.dart b/test/parse_client_configuration_test.dart
index 237c7fd79..94c8b1e8c 100644
--- a/test/parse_client_configuration_test.dart
+++ b/test/parse_client_configuration_test.dart
@@ -1,6 +1,6 @@
+import 'package:flutter_test/flutter_test.dart';
 import 'package:parse_server_sdk/parse_server_sdk.dart';
 import 'package:shared_preferences/shared_preferences.dart';
-import 'package:test/test.dart';
 
 void main() {
   SharedPreferences.setMockInitialValues(Map<String, String>());
diff --git a/test/parse_query_test.dart b/test/parse_query_test.dart
index 61c67005b..7506f095f 100644
--- a/test/parse_query_test.dart
+++ b/test/parse_query_test.dart
@@ -1,7 +1,7 @@
+import 'package:flutter_test/flutter_test.dart';
 import 'package:mockito/mockito.dart';
 import 'package:parse_server_sdk/parse_server_sdk.dart';
 import 'package:shared_preferences/shared_preferences.dart';
-import 'package:test/test.dart';
 
 class MockClient extends Mock implements ParseHTTPClient {}