Update gradle and used libraries

WSTxda · Mar 9, 2024 · 74049f2 · 74049f2
1 parent 76d0869
commit 74049f2
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 19 deletions.
diff --git a/build.gradle b/build.gradle
@@ -7,12 +7,6 @@ buildscript {
     ext.applicationNamespace = "com.google.android.gms"
     ext.basePackageName = "com.mgoogle"
 
-    ext.cronetVersion = '102.5005.125'
-    ext.wearableVersion = '0.1.1'
-
-    ext.kotlinVersion = '1.9.22'
-    ext.coroutineVersion = '1.7.3'
-
     ext.annotationVersion = '1.7.1'
     ext.appcompatVersion = '1.6.1'
     ext.biometricVersion = '1.1.0'
@@ -28,9 +22,15 @@ buildscript {
     ext.recyclerviewVersion = '1.3.2'
     ext.webkitVersion = '1.10.0'
 
+    ext.coroutineVersion = '1.7.3'
+    ext.kotlinVersion = '1.9.22'
+
+    ext.cronetVersion = '102.5005.125'
+    ext.okhttpVersion = '4.12.0'
     ext.slf4jVersion = '1.7.36'
     ext.volleyVersion = '1.2.1'
-    ext.wireVersion = '4.8.0'
+    ext.wearableVersion = '0.1.1'
+    ext.wireVersion = '4.9.7'
 
     ext.androidBuildGradleVersion = '8.3.0'
 

diff --git a/play-services-core/microg-ui-tools/build.gradle b/play-services-core/microg-ui-tools/build.gradle
@@ -45,6 +45,6 @@ dependencies {
     implementation "androidx.appcompat:appcompat:$appcompatVersion"
     implementation "androidx.preference:preference:$preferenceVersion"
     implementation "com.google.android.material:material:$materialVersion"
-    implementation 'com.squareup.okhttp3:okhttp:4.12.0'
+    implementation "com.squareup.okhttp3:okhttp:$okhttpVersion"
 }
 
diff --git a/play-services-core/src/main/java/org/microg/gms/ui/AboutFragment.java b/play-services-core/src/main/java/org/microg/gms/ui/AboutFragment.java
@@ -30,21 +30,23 @@ public class AboutFragment extends AbstractAboutFragment {
     @Override
     protected void collectLibraries(List<AbstractAboutFragment.Library> libraries) {
         if (BuildConfig.FLAVOR.toLowerCase().contains("vtm")) {
-            libraries.add(new AbstractAboutFragment.Library("org.oscim.android", "V™", "GNU LGPLv3, Hannes Janetzek and devemux86"));
-            libraries.add(new AbstractAboutFragment.Library("org.slf4j", "SLF4J", "MIT License, QOS.ch"));
+            libraries.add(new AbstractAboutFragment.Library("org.oscim.android", "V™", "GNU LGPLv3, Hannes Janetzek and devemux86."));
+            libraries.add(new AbstractAboutFragment.Library("org.slf4j", "SLF4J", "MIT License, QOS.ch."));
         } else {
-            libraries.add(new AbstractAboutFragment.Library("org.maplibre.android", "MapLibre Native for Android", "Two-Clause BSD, MapLibre contributors"));
+            libraries.add(new AbstractAboutFragment.Library("org.maplibre.android", "MapLibre Native for Android", "Two-Clause BSD, MapLibre contributors."));
         }
-        libraries.add(new AbstractAboutFragment.Library("androidx", "Android Jetpack", "Apache License 2.0, The Android Open Source Project"));
-        libraries.add(new AbstractAboutFragment.Library("com.upokecenter.cbor", "CBOR", "Creative Commons Zero, Peter O"));
-        libraries.add(new AbstractAboutFragment.Library("de.hdodenhof.circleimageview", "CircleImageView", "Apache License 2.0, Henning Dodenhof"));
-        libraries.add(new AbstractAboutFragment.Library("su.litvak.chromecast.api.v2", "ChromeCast Java API v2", "Apache License 2.0, Vitaly Litvak"));
-        libraries.add(new AbstractAboutFragment.Library("org.conscrypt", "Conscrypt", "Apache License 2.0, The Android Open Source Project"));
-        libraries.add(new AbstractAboutFragment.Library("org.chromium.net", "Cronet", "BSD-style License, The Chromium Authors"));
+        libraries.add(new AbstractAboutFragment.Library("androidx", "Android Jetpack", "Apache License 2.0, The Android Open Source Project."));
+        libraries.add(new AbstractAboutFragment.Library("com.upokecenter.cbor", "CBOR", "Creative Commons Zero, Peter O."));
+        libraries.add(new AbstractAboutFragment.Library("de.hdodenhof.circleimageview", "CircleImageView", "Apache License 2.0, Henning Dodenhof."));
+        libraries.add(new AbstractAboutFragment.Library("su.litvak.chromecast.api.v2", "ChromeCast Java API v2", "Apache License 2.0, Vitaly Litvak."));
+        libraries.add(new AbstractAboutFragment.Library("org.conscrypt", "Conscrypt", "Apache License 2.0, The Android Open Source Project."));
+        libraries.add(new AbstractAboutFragment.Library("org.chromium.net", "Cronet", "BSD-style License, The Chromium Authors."));
         libraries.add(new AbstractAboutFragment.Library("org.jetbrains.kotlin", "Kotlin", "Apache License 2.0, JetBrains s.r.o."));
-        libraries.add(new AbstractAboutFragment.Library("com.android.volley", "Volley", "Apache License 2.0, The Android Open Source Project"));
+        libraries.add(new AbstractAboutFragment.Library("com.google.android.material", "Material Symbols", "Apache License 2.0, Google LLC."));
+        libraries.add(new AbstractAboutFragment.Library("com.squareup.okhttp3", "OkHttp", "Apache License 2.0, Square Inc."));
+        libraries.add(new AbstractAboutFragment.Library("com.android.volley", "Volley", "Apache License 2.0, The Android Open Source Project."));
         libraries.add(new AbstractAboutFragment.Library("com.squareup.wire", "Wire Protocol Buffers", "Apache License 2.0, Square Inc."));
-        libraries.add(new AbstractAboutFragment.Library("com.google.zxing", "ZXing", "Apache License 2.0, ZXing authors"));
+        libraries.add(new AbstractAboutFragment.Library("com.google.zxing", "ZXing", "Apache License 2.0, ZXing authors."));
     }
 
     public static class AsActivity extends AbstractSettingsActivity {