From 29833fbe09ca5eb88d241a852b8389512dab3f18 Mon Sep 17 00:00:00 2001
From: WSTxda <wstxda@gmail.com>
Date: Mon, 12 Aug 2024 16:04:11 -0300
Subject: [PATCH] Bump GMS version to 24.31.36

- Set min sdk level to API 24 due Android restrictions
- Remove tag version for translations strings
- Update some dependences
---
 build.gradle                                       | 14 +++++++-------
 .../src/main/res/values-ar/strings.xml             |  4 ----
 .../src/main/res/values-pl/strings.xml             |  4 ----
 .../src/main/res/values/strings.xml                |  2 +-
 4 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/build.gradle b/build.gradle
index fe1315dad0..e58eef17e8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,12 +7,12 @@ buildscript {
     ext.applicationNamespace = "com.google.android.gms"
     ext.basePackageName = "app.revanced"
 
-    ext.annotationVersion = '1.8.0'
+    ext.annotationVersion = '1.8.2'
     ext.appcompatVersion = '1.7.0'
     ext.biometricVersion = '1.1.0'
     ext.coreVersion = '1.13.1'
-    ext.fragmentVersion = '1.8.1'
-    ext.lifecycleVersion = '2.8.3'
+    ext.fragmentVersion = '1.8.2'
+    ext.lifecycleVersion = '2.8.4'
     ext.loaderVersion = '1.1.0'
     ext.materialVersion = '1.12.0'
     ext.mediarouterVersion = '1.7.0'
@@ -27,7 +27,7 @@ buildscript {
 
     ext.cronetVersion = '119.6045.31'
     ext.okhttpVersion = '4.12.0'
-    ext.slf4jVersion = '2.0.13'
+    ext.slf4jVersion = '2.0.16'
     ext.volleyVersion = '1.2.1'
     ext.wearableVersion = '0.1.1'
     ext.wireVersion = '5.0.0'
@@ -36,7 +36,7 @@ buildscript {
 
     ext.androidBuildVersionTools = '34.0.0'
 
-    ext.androidMinSdk = 23
+    ext.androidMinSdk = 24
     ext.androidTargetSdk = 29
     ext.androidCompileSdk = 34
 
@@ -82,8 +82,8 @@ allprojects {
     apply plugin: 'idea'
 
     group = 'org.microg.gms'
-    ext.appVersionName = 5.6
-    ext.appVersionCode = 242662000
+    ext.appVersionName = 5.7
+    ext.appVersionCode = 243136000
     ext.baseVersion = ext.appVersionCode.toString()[0..1] + '.' + ext.appVersionCode.toString()[2..3] + '.' + ext.appVersionCode.toString()[4..5]
     version = ext.appVersionName+" GMS-"+ext.baseVersion.replaceAll("\\.", "")
     ext.isReleaseVersion = false
diff --git a/play-services-core/microg-ui-tools/src/main/res/values-ar/strings.xml b/play-services-core/microg-ui-tools/src/main/res/values-ar/strings.xml
index 9e9842af4f..6e434e39eb 100644
--- a/play-services-core/microg-ui-tools/src/main/res/values-ar/strings.xml
+++ b/play-services-core/microg-ui-tools/src/main/res/values-ar/strings.xml
@@ -42,10 +42,6 @@
     <string name="about_android_support_v7_preference">مكتبة دعم v7 preference</string>
     <string name="about_android_support_license">رخصة Apache 2.0، مشروع Android Open Source</string>
 
-    <!-- UpdateChecker tag controller-->
-
-    <string name="github_tag_version">5.6</string>
-
     <!-- Updater strings-->
 
     <string name="check_updates">تحقق من التحديثات</string>
diff --git a/play-services-core/microg-ui-tools/src/main/res/values-pl/strings.xml b/play-services-core/microg-ui-tools/src/main/res/values-pl/strings.xml
index 118948d27b..1d323fb321 100644
--- a/play-services-core/microg-ui-tools/src/main/res/values-pl/strings.xml
+++ b/play-services-core/microg-ui-tools/src/main/res/values-pl/strings.xml
@@ -42,10 +42,6 @@
     <string name="about_android_support_v7_preference">Biblioteka wsparcia preferencji v7</string>
     <string name="about_android_support_license">Licencja Apache 2.0, Android Open Source Project</string>
 
-    <!-- Kontroler znacznika UpdateChecker -->
-
-    <string name="github_tag_version">5.6</string>
-
     <!-- Aktualizator -->
 
     <string name="check_updates">Sprawdź aktualizacje</string>
diff --git a/play-services-core/microg-ui-tools/src/main/res/values/strings.xml b/play-services-core/microg-ui-tools/src/main/res/values/strings.xml
index 3172b20b9e..52b73da6c3 100644
--- a/play-services-core/microg-ui-tools/src/main/res/values/strings.xml
+++ b/play-services-core/microg-ui-tools/src/main/res/values/strings.xml
@@ -44,7 +44,7 @@
 
     <!-- UpdateChecker tag controller-->
 
-    <string name="github_tag_version">5.6</string>
+    <string name="github_tag_version">5.7</string>
 
     <!-- Updater strings-->