From c03714c5defc876f490b5900c729e725d128ce01 Mon Sep 17 00:00:00 2001
From: akallabeth <akallabeth@posteo.net>
Date: Mon, 20 Jan 2025 07:59:58 +0100
Subject: [PATCH] [client,android] update gradle to 8.10.2

---
 client/Android/Studio/aFreeRDP/build.gradle   |  2 +-
 .../aFreeRDP/src/main/AndroidManifest.xml     |  1 -
 client/Android/Studio/build.gradle            | 26 ++++++++++++++++---
 .../Android/Studio/freeRDPCore/build.gradle   | 19 +++-----------
 .../freeRDPCore/src/main/AndroidManifest.xml  |  1 -
 .../gradle/wrapper/gradle-wrapper.properties  |  4 +--
 6 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/client/Android/Studio/aFreeRDP/build.gradle b/client/Android/Studio/aFreeRDP/build.gradle
index 96f7184d8..e1878adc8 100644
--- a/client/Android/Studio/aFreeRDP/build.gradle
+++ b/client/Android/Studio/aFreeRDP/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'com.gladed.androidgitversion' version '0.4.4'
+    id 'com.gladed.androidgitversion' version '0.4.14'
 }
 
 androidGitVersion {
diff --git a/client/Android/Studio/aFreeRDP/src/main/AndroidManifest.xml b/client/Android/Studio/aFreeRDP/src/main/AndroidManifest.xml
index 323be7d31..6f7e26783 100644
--- a/client/Android/Studio/aFreeRDP/src/main/AndroidManifest.xml
+++ b/client/Android/Studio/aFreeRDP/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.freerdp.afreerdp"
     android:installLocation="auto">
 
     <application
diff --git a/client/Android/Studio/build.gradle b/client/Android/Studio/build.gradle
index 4047b83d6..0b3a76ecd 100644
--- a/client/Android/Studio/build.gradle
+++ b/client/Android/Studio/build.gradle
@@ -19,10 +19,10 @@ if (!hasProperty('RELEASE_STORE_PASSWORD')) {
 }
 
 ext {
-    compileApi = releaseProperties.get('COMPILE_API', 31)
-    targetApi = releaseProperties.get('TARGET_API', 31)
+    compileApi = releaseProperties.get('COMPILE_API', 35)
+    targetApi = releaseProperties.get('TARGET_API', 35)
     minApi = releaseProperties.get('MIN_API', 23)
-    toolsVersion = releaseProperties.get('TOOLS_VERSION', '31.0.0')
+    toolsVersion = releaseProperties.get('TOOLS_VERSION', '35.0.0')
 
     println '----------------- Project configuration -------------------'
     println 'RELEASE_STORE_FILE: ' + RELEASE_STORE_FILE
@@ -38,9 +38,12 @@ buildscript {
     repositories {
         mavenCentral()
         google()
+        maven {
+            url 'https://maven.google.com'
+        }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.2'
+       classpath 'com.android.tools.build:gradle:8.8.0'
     }
 }
 
@@ -48,5 +51,20 @@ allprojects {
     repositories {
         mavenCentral()
         google()
+        maven {
+            url 'https://maven.google.com'
+        }
+    }
+
+    subprojects {
+        afterEvaluate { project ->
+            if (project.hasProperty('android')) {
+                project.android {
+                    if (namespace == null) {
+                        namespace 'com.freerdp.' + project.name.toLowerCase()
+                    }
+                }
+            }
+        }
     }
 }
diff --git a/client/Android/Studio/freeRDPCore/build.gradle b/client/Android/Studio/freeRDPCore/build.gradle
index cf1b3e073..efb75426c 100644
--- a/client/Android/Studio/freeRDPCore/build.gradle
+++ b/client/Android/Studio/freeRDPCore/build.gradle
@@ -3,24 +3,13 @@ apply plugin: 'com.android.library'
 android {
     compileSdkVersion = rootProject.ext.compileApi
     buildToolsVersion = rootProject.ext.toolsVersion
-
     packagingOptions {
-        pickFirst 'lib/arm64-v8a/libfreerdp3.so'
-        pickFirst 'lib/armeabi-v7a/libfreerdp3.so'
-        pickFirst 'lib/x86/libfreerdp3.so'
-        pickFirst 'lib/x86_64/libfreerdp3.so'
-
-        pickFirst 'lib/arm64-v8a/libfreerdp-client3.so'
-        pickFirst 'lib/armeabi-v7a/libfreerdp-client3.so'
-        pickFirst 'lib/x86/libfreerdp-client3.so'
-        pickFirst 'lib/x86_64/libfreerdp-client3.so'
-
-        pickFirst 'lib/arm64-v8a/libwinpr3.so'
-        pickFirst 'lib/armeabi-v7a/libwinpr3.so'
-        pickFirst 'lib/x86/libwinpr3.so'
-        pickFirst 'lib/x86_64/libwinpr3.so'
+        jniLibs {
+            pickFirsts += ['lib/arm64-v8a/libfreerdp3.so', 'lib/armeabi-v7a/libfreerdp3.so', 'lib/x86/libfreerdp3.so', 'lib/x86_64/libfreerdp3.so', 'lib/arm64-v8a/libfreerdp-client3.so', 'lib/armeabi-v7a/libfreerdp-client3.so', 'lib/x86/libfreerdp-client3.so', 'lib/x86_64/libfreerdp-client3.so', 'lib/arm64-v8a/libwinpr3.so', 'lib/armeabi-v7a/libwinpr3.so', 'lib/x86/libwinpr3.so', 'lib/x86_64/libwinpr3.so']
+        }
     }
 
+
     defaultConfig {
         minSdkVersion rootProject.ext.minApi
         targetSdkVersion rootProject.ext.targetApi
diff --git a/client/Android/Studio/freeRDPCore/src/main/AndroidManifest.xml b/client/Android/Studio/freeRDPCore/src/main/AndroidManifest.xml
index b68230088..15e7483ff 100644
--- a/client/Android/Studio/freeRDPCore/src/main/AndroidManifest.xml
+++ b/client/Android/Studio/freeRDPCore/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.freerdp.freerdpcore"
     android:installLocation="auto">
 
     <uses-permission android:name="android.permission.INTERNET" />
diff --git a/client/Android/Studio/gradle/wrapper/gradle-wrapper.properties b/client/Android/Studio/gradle/wrapper/gradle-wrapper.properties
index ca3f71e7e..ff3dd28fb 100644
--- a/client/Android/Studio/gradle/wrapper/gradle-wrapper.properties
+++ b/client/Android/Studio/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Mar 15 09:39:30 CET 2021
+#Mon Jan 20 07:44:59 CET 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip