Updated OpenSSL and android dependencies

(cherry picked from commit 54fa29dc2d2125578efe6c80b214f42b669a140d)

diff --git a/client/Android/Studio/aFreeRDP/build.gradle b/client/Android/Studio/aFreeRDP/build.gradle
index fc3dba2..a625e6b 100644 (file)
--- a/client/Android/Studio/aFreeRDP/build.gradle
+++ b/client/Android/Studio/aFreeRDP/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion = 28
-    buildToolsVersion = "28.0.3"
+    compileSdkVersion = rootProject.ext.compileApi
+    buildToolsVersion = rootProject.ext.toolsVersion
 
     defaultConfig {
         applicationId "com.freerdp.afreerdp"
-        minSdkVersion 21
-        targetSdkVersion 28
+        minSdkVersion rootProject.ext.minApi
+        targetSdkVersion rootProject.ext.targetApi
         vectorDrawables.useSupportLibrary = true
         versionCode = rootProject.ext.versionCode
         versionName = rootProject.ext.versionName

diff --git a/client/Android/Studio/build.gradle b/client/Android/Studio/build.gradle
index 197a16b..745c99f 100644 (file)
--- a/client/Android/Studio/build.gradle
+++ b/client/Android/Studio/build.gradle
@@ -30,12 +30,20 @@ def getVersionName = { ->
 ext {
     versionName = properties.get('VERSION_NAME', getVersionName())
     versionCode = properties.get('VERSION_CODE', 22)
+    compileApi = properties.get('COMPILE_API', 30)
+    targetApi = properties.get('TARGET_API', 30)
+    minApi = properties.get('MIN_API', 21)
+    toolsVersion = properties.get('TOOLS_VERSION', '30.0.3')
 
     println '----------------- Project configuration -------------------'
     println 'VERSION_NAME:       ' + versionName
     println 'VERSION_CODE:       ' + versionCode
-    println 'RELEASE_STORE_FILE: '+ RELEASE_STORE_FILE
-    println 'RELEASE_KEY_ALIAS:  '+ RELEASE_KEY_ALIAS
+    println 'RELEASE_STORE_FILE: ' + RELEASE_STORE_FILE
+    println 'RELEASE_KEY_ALIAS:  ' + RELEASE_KEY_ALIAS
+    println 'compile API:        ' + compileApi
+    println 'target API:         ' + targetApi
+    println 'min API:            ' + minApi
+    println 'tools version:      ' + toolsVersion
     println '-----------------------------------------------------------'
 }
 
@@ -45,7 +53,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:4.1.2'
     }
 }
 

diff --git a/client/Android/Studio/freeRDPCore/build.gradle b/client/Android/Studio/freeRDPCore/build.gradle
index c275b39..713ad37 100644 (file)
--- a/client/Android/Studio/freeRDPCore/build.gradle
+++ b/client/Android/Studio/freeRDPCore/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion = 28
-    buildToolsVersion = "28.0.3"
+    compileSdkVersion = rootProject.ext.compileApi
+    buildToolsVersion = rootProject.ext.toolsVersion
 
     defaultConfig {
-        minSdkVersion 21
-        targetSdkVersion 28
+        minSdkVersion rootProject.ext.minApi
+        targetSdkVersion rootProject.ext.targetApi
         vectorDrawables.useSupportLibrary = true
         versionCode = rootProject.ext.versionCode
         versionName = rootProject.ext.versionName

diff --git a/client/Android/Studio/gradle/wrapper/gradle-wrapper.properties b/client/Android/Studio/gradle/wrapper/gradle-wrapper.properties
index ecf74d7..cbba7b0 100644 (file)
--- a/client/Android/Studio/gradle/wrapper/gradle-wrapper.properties
+++ b/client/Android/Studio/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Jan 17 10:58:32 UTC 2018
+#Mon Mar 15 09:39:30 CET 2021
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip

diff --git a/scripts/android-build-32.conf b/scripts/android-build-32.conf
index 6b6ac79..4bafb23 100644 (file)
--- a/scripts/android-build-32.conf
+++ b/scripts/android-build-32.conf
@@ -18,7 +18,7 @@ NDK_TARGET=21
 
 JPEG_TAG=master
 OPENH264_TAG=v1.8.0  # NOTE: NDK r15c or earlier needed in --openh624-ndk for v1.8.0
-OPENSSL_TAG=OpenSSL_1_1_1h
+OPENSSL_TAG=OpenSSL_1_1_1j
 
 SRC_DIR=$SCRIPT_PATH/..
 BUILD_DST=$SCRIPT_PATH/../client/Android/Studio/freeRDPCore/src/main/jniLibs

diff --git a/scripts/android-build-64.conf b/scripts/android-build-64.conf
index 7a59a47..a3dcf71 100644 (file)
--- a/scripts/android-build-64.conf
+++ b/scripts/android-build-64.conf
@@ -18,7 +18,7 @@ NDK_TARGET=21
 
 JPEG_TAG=master
 OPENH264_TAG=v1.8.0  # NOTE: NDK r15c or earlier needed in --openh624-ndk for v1.8.0
-OPENSSL_TAG=OpenSSL_1_1_1h
+OPENSSL_TAG=OpenSSL_1_1_1j
 
 SRC_DIR=$SCRIPT_PATH/..
 BUILD_DST=$SCRIPT_PATH/../client/Android/Studio/freeRDPCore/src/main/jniLibs

diff --git a/scripts/android-build.conf b/scripts/android-build.conf
index 722327c..c8eb40c 100644 (file)
--- a/scripts/android-build.conf
+++ b/scripts/android-build.conf
@@ -18,7 +18,7 @@ NDK_TARGET=26
 
 JPEG_TAG=master
 OPENH264_TAG=v1.8.0  # NOTE: NDK r15c or earlier needed in --openh624-ndk for v1.8.0
-OPENSSL_TAG=OpenSSL_1_1_1h
+OPENSSL_TAG=OpenSSL_1_1_1j
 
 SRC_DIR=$SCRIPT_PATH/..
 BUILD_DST=$SCRIPT_PATH/../client/Android/Studio/freeRDPCore/src/main/jniLibs