From e9bbb9101909a2cdcc169591b800fc53b4a3582f Mon Sep 17 00:00:00 2001
From: Hiddify <114227601+hiddify-com@users.noreply.github.com>
Date: Fri, 6 Sep 2024 03:37:41 +0200
Subject: [PATCH] fix: android

---
 .github/workflows/build.yml                   | 10 ++--
 android/app/build.gradle                      |  6 +--
 .../gradle/wrapper/gradle-wrapper.properties  |  2 +-
 pubspec.lock                                  | 49 +++++++------------
 pubspec.yaml                                  |  6 +--
 5 files changed, 30 insertions(+), 43 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ac85cbd3..d19f99f1 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -83,11 +83,11 @@ jobs:
             aarch: universal
             targets: dmg,pkg
             
-          - platform: ios
-            os: macos-14
-            aarch: universal
-            filename: hiddify-ios
-            targets: ipa
+          # - platform: ios
+          #   os: macos-14
+          #   aarch: universal
+          #   filename: hiddify-ios
+          #   targets: ipa
     runs-on: ${{ matrix.os }}
     steps:
       - name: checkout
diff --git a/android/app/build.gradle b/android/app/build.gradle
index f3c6e5aa..56aefdf2 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -41,12 +41,12 @@ android {
     ndkVersion "26.1.10909125"
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '17'
     }
 
     sourceSets {
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index cb086a5f..774fae87 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-all.zip
diff --git a/pubspec.lock b/pubspec.lock
index a9957ffa..a59029be 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -5,15 +5,10 @@ packages:
     dependency: transitive
     description:
       name: _fe_analyzer_shared
-      sha256: f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834
+      sha256: "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7"
       url: "https://pub.dev"
     source: hosted
-    version: "72.0.0"
-  _macros:
-    dependency: transitive
-    description: dart
-    source: sdk
-    version: "0.3.2"
+    version: "67.0.0"
   accessibility_tools:
     dependency: "direct main"
     description:
@@ -26,10 +21,10 @@ packages:
     dependency: transitive
     description:
       name: analyzer
-      sha256: b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139
+      sha256: "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d"
       url: "https://pub.dev"
     source: hosted
-    version: "6.7.0"
+    version: "6.4.1"
   analyzer_plugin:
     dependency: transitive
     description:
@@ -114,18 +109,18 @@ packages:
     dependency: "direct dev"
     description:
       name: build_runner
-      sha256: dd09dd4e2b078992f42aac7f1a622f01882a8492fef08486b27ddde929c19f04
+      sha256: "644dc98a0f179b872f612d3eb627924b578897c629788e858157fa5e704ca0c7"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.12"
+    version: "2.4.11"
   build_runner_core:
     dependency: transitive
     description:
       name: build_runner_core
-      sha256: f8126682b87a7282a339b871298cc12009cb67109cfa1614d6436fb0289193e0
+      sha256: e3c79f69a64bdfcd8a776a3c28db4eb6e3fb5356d013ae5eb2e52007706d5dbe
       url: "https://pub.dev"
     source: hosted
-    version: "7.3.2"
+    version: "7.3.1"
   built_collection:
     dependency: transitive
     description:
@@ -489,10 +484,10 @@ packages:
     description:
       path: "."
       ref: HEAD
-      resolved-ref: da0cf67a7c0a2d8ad257084956ce6d32a98f8ccc
-      url: "https://github.com/MichaelStH/flutter_easy_permission/"
+      resolved-ref: "3f6611f2a88f7ed640207c3accab9178f76da2c6"
+      url: "https://github.com/unger1984/flutter_easy_permission.git"
     source: git
-    version: "1.1.2"
+    version: "1.1.3"
   flutter_gen_core:
     dependency: transitive
     description:
@@ -656,10 +651,10 @@ packages:
     dependency: "direct dev"
     description:
       name: freezed
-      sha256: "44c19278dd9d89292cf46e97dc0c1e52ce03275f40a97c5a348e802a924bf40e"
+      sha256: a434911f643466d78462625df76fd9eb13e57348ff43fe1f77bbe909522c67a1
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.7"
+    version: "2.5.2"
   freezed_annotation:
     dependency: "direct main"
     description:
@@ -989,14 +984,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.0.3"
-  macros:
-    dependency: transitive
-    description:
-      name: macros
-      sha256: "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.1.2-main.4"
   matcher:
     dependency: transitive
     description:
@@ -1401,10 +1388,10 @@ packages:
     dependency: transitive
     description:
       name: riverpod_analyzer_utils
-      sha256: ee72770090078e6841d51355292335f1bc254907c6694283389dcb8156d99a4d
+      sha256: "8b71f03fc47ae27d13769496a1746332df4cec43918aeba9aff1e232783a780f"
       url: "https://pub.dev"
     source: hosted
-    version: "0.5.3"
+    version: "0.5.1"
   riverpod_annotation:
     dependency: "direct main"
     description:
@@ -1417,10 +1404,10 @@ packages:
     dependency: "direct dev"
     description:
       name: riverpod_generator
-      sha256: "1ad626afbd8b01d168870b13c0b036f8a5bdb57c14cd426dc5b4595466bd6e2f"
+      sha256: d451608bf17a372025fc36058863737636625dfdb7e3cbf6142e0dfeb366ab22
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.2"
+    version: "2.4.0"
   rxdart:
     dependency: "direct main"
     description:
@@ -2035,5 +2022,5 @@ packages:
     source: hosted
     version: "2.2.1"
 sdks:
-  dart: ">=3.5.0-259.0.dev <4.0.0"
+  dart: ">=3.4.0 <4.0.0"
   flutter: ">=3.24.0"
diff --git a/pubspec.yaml b/pubspec.yaml
index 4add13ab..0e4e88e9 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -34,7 +34,7 @@ dependencies:
   riverpod_annotation: ^2.3.4
   rxdart: ^0.27.7
   drift: ^2.16.0
-  sqlite3_flutter_libs: ^0.5.20
+  sqlite3_flutter_libs: ^0.5.24
   shared_preferences: ^2.2.2
   dio: ^5.4.1
   ffi: ^2.1.2
@@ -87,9 +87,9 @@ dependencies:
   timezone_to_country: ^2.1.0
   json_path: ^0.7.1
   # permission_handler: ^11.3.0 # is not compatible with windows
+  #flutter_easy_permission: ^1.1.2
   flutter_easy_permission: 
-    git:
-      url: https://github.com/MichaelStH/flutter_easy_permission/
+     git: https://github.com/unger1984/flutter_easy_permission.git
   in_app_review: ^2.0.9
   # circle_flags: ^4.0.2
   circle_flags: