Upgraded gradle and gradle plugin to latest, and removed dependence on symlinks.

iiordanov · iiordanov · commit 73bf3dcf97cc · 2021-04-04T21:25:20.000-04:00
Updated build documentation with instructions for various new ways of building the project.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/CustomVnc-app/gradle/wrapper/gradle-wrapper.properties b/CustomVnc-app/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sun Jan 27 17:01:43 EST 2019
+#Sun Apr 04 15:13:19 EDT 2021
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
diff --git a/Opaque-app/gradle/wrapper/gradle-wrapper.properties b/Opaque-app/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sun Jan 27 17:01:43 EST 2019
+#Sun Apr 04 15:13:19 EDT 2021
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
diff --git a/README.md b/README.md
@@ -7,21 +7,24 @@ Please see the LICENSE file for information on how the source is licensed.
 
 # Building
 
-There are two ways to build the applications. With pre-built libraries, or from
-scratch.
+There are different ways to build the applications depending on OS and whether you are using
+pre-built libraries, or building them from scratch.
 
-The build automation of requires Linux at the moment, due to the use of symlinks.
+## On Linux and WSL2
+
+These instructions should work on Ubuntu 18.04, 20.04, and Windows Subsystem for Linux 2.
+Builds are likely to also work on MacOS, feedback is welcome.
 
 Pick one of I-a, I-b, or I-c below, then move onto II.
 
-## I-a With Prebuilt Libraries
+### I-a With Prebuilt Libraries
 
 Building the projects with pre-built dependencies.
 
         ./download-prebuilt-dependencies.sh
         ./bVNC/prepare_project.sh --skip-build libs nopath
 
-## I-b From Scratch with Docker
+### I-b From Scratch with Docker
 
 Make sure you're running the commands below from the root of the project.
 Ensure ANDROID_SDK is set to the path to your SDK.
@@ -35,7 +38,7 @@ echo "CURRENT_WORKING_DIR=$(pwd)" >> docker/.env
 docker-compose -f docker/docker-compose.yml up
 ```
 
-## I-c From Scratch
+### I-c From Scratch
 
 Building from scratch and working in Android Studio.
 
@@ -51,7 +54,7 @@ Building from scratch and working in Android Studio.
 
     - If building a non-custom client, set PROJECT to libs. For a custom VNC client, set PROJECT to a string
       that stars with Custom and contains Vnc, i.e. `CustomYourVncClient` (see III below for details).
-      
+
     - Set the environment variables ANDROID_SDK to your SDK installation. The scripts will install the NDK automatically.
 
     - Example:
@@ -73,6 +76,22 @@ Building from scratch and working in Android Studio.
 
     - If using an emulator, choose x86_64 as the architecture to avoid "has text relocations" errors loading gstreamer on Android.
 
+## On Windows with Git Bash
+
+These instructions are for Windows without WSL2 installed. For now, only pre-build dependencies are
+supported in this configuration.
+
+- First [download and install install git from here](https://git-scm.com/downloads)
+- Then, start Git Bash, clone this project, cd into the project root directory and run:
+        ./download-prebuilt-dependencies.sh
+- Start Android Studio and open the project directory.
+- Click File->Sync Project with Gradle Files
+- If Android Studio reports any missing android versions (such as `android-28`, for instance),
+find and start SDK Manager and ensure any missing Android versions are installed. As of today
+the required versions are `android-28`, `android-29`, and `android-30`, but in future other versions
+will need to be installed if Android Studio shows an error.
+
+
 ## II Importing projects into Android Studio
 
 This should be as simple as selecting "Open an existing Android Studio project" on the
@@ -140,4 +159,4 @@ https://github.com/iiordanov/remote-desktop-clients/issues
 
 Questions and general discussion should be posted at the following forum:
 
-https://groups.google.com/forum/#!forum/bvnc-ardp-aspice-opaque-remote-desktop-clients
+https://groups.google.com/forum/#!forum/bvnc-ardp-aspice-opaque-remote-desktop-clients
diff --git a/aRDP-app/gradle/wrapper/gradle-wrapper.properties b/aRDP-app/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sun Jan 27 17:01:43 EST 2019
+#Sun Apr 04 15:13:19 EDT 2021
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
diff --git a/aSPICE-app/gradle/wrapper/gradle-wrapper.properties b/aSPICE-app/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sun Jan 27 17:01:43 EST 2019
+#Sun Apr 04 15:13:19 EDT 2021
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
diff --git a/bVNC-app/gradle/wrapper/gradle-wrapper.properties b/bVNC-app/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sun Jan 27 17:01:43 EST 2019
+#Sun Apr 04 15:13:19 EDT 2021
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
diff --git a/bVNC/build.gradle b/bVNC/build.gradle
@@ -35,7 +35,7 @@ android {
 
 dependencies {
     implementation project(':pubkeyGenerator')
-    implementation project(':freeRDPCore')
+    implementation project(':remoteClientLib:jni:libs:deps:FreeRDP:client:Android:Studio:freeRDPCore')
     implementation project(':remoteClientLib')
     implementation 'com.android.support:appcompat-v7:28.0.0'
     implementation 'com.android.support:support-v4:28.0.0'
diff --git a/bVNC/prepare_project.sh b/bVNC/prepare_project.sh
@@ -112,6 +112,7 @@ then
   if echo $PRJ | grep -qi "SPICE\|Opaque\|libs\|remoteClientLib"
   then
     pushd ../remoteClientLib
+    export NDK_LIBS_OUT=./src/main/jniLibs
     ${ANDROID_NDK}/ndk-build -j 2
 
     echo "Adding any custom certificate authority files in $(pwd)/certificate_authorities/ to certificate bundle from gstreamer."
@@ -132,18 +133,20 @@ then
   echo "Done building libraries"
 fi
 
-freerdp_libs_dir=../freeRDPCore/src/main/jniLibs
-freerdp_libs_link=../freeRDPCore/src/main/libs
+freerdp_libs_dir=../remoteClientLib/jni/libs/deps/FreeRDP/client/Android/Studio/freeRDPCore/src/main/jniLibs
+freerdp_libs_link=../remoteClientLib/jni/libs/deps/FreeRDP/client/Android/Studio/freeRDPCore/src/main/libs
 if echo $PRJ | grep -iq "VNC"
 then
   clean_libs "sqlcipher" libs/
   clean_libs "sqlcipher" ../remoteClientLib/libs/
+  clean_libs "sqlcipher" ../remoteClientLib/src/main/jniLibs/
   [ -d ${freerdp_libs_dir} ] && rm -rf ${freerdp_libs_dir}.DISABLED && mv ${freerdp_libs_dir} ${freerdp_libs_dir}.DISABLED
   rm -rf ${freerdp_libs_link}
 elif echo $PRJ | grep -iq "RDP"
 then
   clean_libs "sqlcipher" libs/
   clean_libs "sqlcipher" ../remoteClientLib/libs/
+  clean_libs "sqlcipher" ../remoteClientLib/src/main/jniLibs/
   [ -d ${freerdp_libs_dir}.DISABLED ] && rm -rf ${freerdp_libs_dir} && mv ${freerdp_libs_dir}.DISABLED ${freerdp_libs_dir}
   rm -rf ${freerdp_libs_link}
   ln -s jniLibs ${freerdp_libs_link}
diff --git a/bVNC/src/main/AndroidManifest.xml b/bVNC/src/main/AndroidManifest.xml
@@ -21,5 +21,5 @@
         <activity android:name="com.iiordanov.bVNC.GlobalPreferencesActivity"></activity>
     </application>
 
-    <uses-sdk android:minSdkVersion="14" tools:overrideLibrary="com.github.luben.zstd"/>
+    <uses-sdk tools:overrideLibrary="com.github.luben.zstd"/>
 </manifest>
diff --git a/build.gradle b/build.gradle
@@ -20,4 +20,4 @@ ext {
     compileApi = properties.get('COMPILE_API', 30)
     targetApi = properties.get('TARGET_API', 29)
     minApi = properties.get('MIN_API', 21)
-}
+}
diff --git a/download-prebuilt-dependencies.sh b/download-prebuilt-dependencies.sh
@@ -5,14 +5,23 @@ pushd $DIR
 
 DEPVER=12
 
-wget -c https://github.com/iiordanov/remote-desktop-clients/releases/download/dependencies/remote-desktop-clients-libs-${DEPVER}.tar.gz
+if $(which wget)
+then
+  wget -c https://github.com/iiordanov/remote-desktop-clients/releases/download/dependencies/remote-desktop-clients-libs-${DEPVER}.tar.gz
+else
+  curl -L https://github.com/iiordanov/remote-desktop-clients/releases/download/dependencies/remote-desktop-clients-libs-${DEPVER}.tar.gz -o remote-desktop-clients-libs-${DEPVER}.tar.gz
+fi
 
+rm -rf remoteClientLib/jni/libs/deps/FreeRDP/
 mkdir -p remoteClientLib/jni/libs/deps/FreeRDP/
-mkdir -p EXTRACT/
 
-tar xf remote-desktop-clients-libs-${DEPVER}.tar.gz -C EXTRACT/
-rsync -avP EXTRACT/ ./
-rm -rf EXTRACT/
+tar xf remote-desktop-clients-libs-${DEPVER}.tar.gz
+
+if [ ! -d remoteClientLib/src/main/jniLibs -a -d remoteClientLib/libs/ ]
+then
+  rm -f remoteClientLib/src/main/jniLibs
+  cp -a remoteClientLib/libs/ remoteClientLib/src/main/jniLibs/
+fi
 
 echo "Done downloading and extracting dependencies."
 popd
diff --git a/freeRDPCore b/freeRDPCore
diff --git a/freeaRDP-app/gradle/wrapper/gradle-wrapper.properties b/freeaRDP-app/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sun Jan 27 17:01:43 EST 2019
+#Sun Apr 04 15:13:19 EDT 2021
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
diff --git a/freeaSPICE-app/gradle/wrapper/gradle-wrapper.properties b/freeaSPICE-app/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sun Jan 27 17:01:43 EST 2019
+#Sun Apr 04 15:13:19 EDT 2021
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
diff --git a/freebVNC-app/gradle/wrapper/gradle-wrapper.properties b/freebVNC-app/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sun Jan 27 17:01:43 EST 2019
+#Sun Apr 04 15:13:19 EDT 2021
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Mar 24 11:46:47 EDT 2021
+#Sun Apr 04 15:13:19 EDT 2021
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
diff --git a/pubkeyGenerator/AndroidManifest.xml b/pubkeyGenerator/AndroidManifest.xml
diff --git a/pubkeyGenerator/src/main/AndroidManifest.xml b/pubkeyGenerator/src/main/AndroidManifest.xml
diff --git a/pubkeyGenerator/src/main/AndroidManifest.xml b/pubkeyGenerator/src/main/AndroidManifest.xml
@@ -0,0 +1,16 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.iiordanov.pubkeygenerator"
+    android:versionCode="1"
+    android:versionName="1.0" >
+
+    <application
+        android:theme="@style/AppTheme" >
+        <activity
+            android:name=".GeneratePubkeyActivity"
+            android:screenOrientation="landscape"
+            android:windowSoftInputMode="stateHidden|adjustResize"
+            android:label="@string/title_activity_pubkey_generator" >
+        </activity>
+    </application>
+
+</manifest>
diff --git a/remoteClientLib/build-debug.gradle b/remoteClientLib/build-debug.gradle
@@ -94,6 +94,7 @@ android {
         ndkBuild {
             path file('jni/Application.mk')
             path file('jni/Android.mk')
+            buildStagingDirectory 'src/main/jniLibs'
         }
     }
 
diff --git a/remoteClientLib/build.gradle b/remoteClientLib/build.gradle
@@ -8,7 +8,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.3'
+        classpath 'com.android.tools.build:gradle:4.1.3'
     }
 }
 
@@ -62,7 +62,7 @@ tasks.all { task ->
     }
 }
 dependencies {
-    implementation project(':freeRDPCore')
+    implementation project(':remoteClientLib:jni:libs:deps:FreeRDP:client:Android:Studio:freeRDPCore')
     api 'com.android.support:multidex:1.0.3'
     implementation 'com.android.support:appcompat-v7:28.0.0'
     implementation 'org.apache.httpcomponents:httpcore:4.4.10'
diff --git a/remoteClientLib/src/main/jniLibs b/remoteClientLib/src/main/jniLibs
diff --git a/settings.gradle b/settings.gradle
@@ -1,4 +1,4 @@
-include ':freeRDPCore'
+include ':remoteClientLib:jni:libs:deps:FreeRDP:client:Android:Studio:freeRDPCore'
 include ':pubkeyGenerator'
 include ':bVNC'
 include ':bVNC-app'
