morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-14 00:14:11 +09:00
Code Issues Packages Projects Releases Wiki Activity

[client,android] update gradle to 8.10.2

Browse Source
This commit is contained in:
akallabeth
2025-01-20 07:59:58 +01:00
parent 2c727222d1
commit c03714c5de
6 changed files with 29 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/Android/Studio/aFreeRDP/build.gradle
View File

@@ -1,5 +1,5 @@
plugins {
id 'com.gladed.androidgitversion' version '0.4.4'
id 'com.gladed.androidgitversion' version '0.4.14'
}
androidGitVersion {

1
client/Android/Studio/aFreeRDP/src/main/AndroidManifest.xml
View File

@@ -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

26
client/Android/Studio/build.gradle
View File

@@ -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()
}
}
}
}
}
}

19
client/Android/Studio/freeRDPCore/build.gradle
View File

@@ -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

1
client/Android/Studio/freeRDPCore/src/main/AndroidManifest.xml
View File

@@ -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" />

4
client/Android/Studio/gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -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