From 79ef5bc8c188aeefa51ea348f233f1c4f37aefbc Mon Sep 17 00:00:00 2001
From: Krille Fear <christian-pauly@posteo.de>
Date: Mon, 4 Oct 2021 11:02:12 +0200
Subject: [PATCH] chore: Move to hosted geolocator_android

---
 pubspec.lock                                 |  8 +++-----
 pubspec.yaml                                 |  7 +++----
 scripts/enable-android-google-services.patch | 15 ---------------
 3 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/pubspec.lock b/pubspec.lock
index 0adb377d..c193a533 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -518,11 +518,9 @@ packages:
   geolocator_android:
     dependency: "direct overridden"
     description:
-      path: geolocator_android
-      ref: "7.6.2"
-      resolved-ref: "7f6f64b3244f761b19d8e73e3c770be6b9179da5"
-      url: "https://gitlab.com/hanntech-gmbh/free2pass/flutter-geolocator-floss.git"
-    source: git
+      name: geolocator_android
+      url: "https://hanntech-gmbh.gitlab.io/free2pass/flutter-geolocator-floss/"
+    source: hosted
     version: "1.0.1"
   geolocator_apple:
     dependency: transitive
diff --git a/pubspec.yaml b/pubspec.yaml
index 47cfe550..aceb6d10 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -115,8 +115,7 @@ flutter:
 
 dependency_overrides:
   geolocator_android:
-    git:
-      url: https://gitlab.com/hanntech-gmbh/free2pass/flutter-geolocator-floss.git
-      ref: 7.6.2
-      path: geolocator_android
+    hosted:
+      name: geolocator_android
+      url: https://hanntech-gmbh.gitlab.io/free2pass/flutter-geolocator-floss
   provider: 5.0.0
diff --git a/scripts/enable-android-google-services.patch b/scripts/enable-android-google-services.patch
index c668b6aa..52cc6d10 100644
--- a/scripts/enable-android-google-services.patch
+++ b/scripts/enable-android-google-services.patch
@@ -101,18 +101,3 @@ index 47cfe550..21685cc6 100644
    file_picker_cross: ^4.4.2
    filesystem_picker: 2.0.0-nullsafety.0 # Using pre release to be compatible with Flutter 2.5
    flutter:
-@@ -114,9 +114,9 @@ flutter:
-           style: italic
- 
- dependency_overrides:
--  geolocator_android:
--    git:
--      url: https://gitlab.com/hanntech-gmbh/free2pass/flutter-geolocator-floss.git
--      ref: 7.6.2
--      path: geolocator_android
-+  #geolocator_android:
-+  #  git:
-+  #    url: https://gitlab.com/hanntech-gmbh/free2pass/flutter-geolocator-floss.git
-+  #    ref: 7.6.2
-+  #    path: geolocator_android
-   provider: 5.0.0