diff --git a/build_scripts/GitlabCI/Android.Dockerfile b/build_scripts/GitlabCI/Android.Dockerfile deleted file mode 100644 index bc4bd0755..000000000 --- a/build_scripts/GitlabCI/Android.Dockerfile +++ /dev/null @@ -1,48 +0,0 @@ -ARG ANDROID_NDK_ARCH=arm -FROM registry.gitlab.com/retroshare/retroshare:android_${ANDROID_NDK_ARCH}_base - -ENV APT_UNAT="--assume-yes --quiet" - -RUN apt-get update $APT_UNAT && apt-get upgrade $APT_UNAT --show-upgraded - -ARG REPO_URL=https://gitlab.com/RetroShare/RetroShare.git -ARG REPO_BRANCH=master - -WORKDIR /RetroShare -RUN git remote add testing $REPO_URL && \ - git fetch --tags testing $REPO_BRANCH && \ - git reset --hard testing/$REPO_BRANCH && \ - git --no-pager log --max-count 1 - -RUN rm -rf /jsonapi-generator-build ; mkdir /jsonapi-generator-build -WORKDIR /jsonapi-generator-build/ -RUN qmake ../RetroShare/jsonapi-generator/src/ \ - CONFIG+=no_retroshare_plugins \ - CONFIG+=no_retroshare_service CONFIG+=no_retroshare_gui \ - CONFIG+=rs_jsonapi CONFIG+=no_rs_sam3_libsam3 && \ - make -j$(nproc) - -RUN rm -rf /retroshare-service-android-build ; mkdir /retroshare-service-android-build -WORKDIR /retroshare-service-android-build - -# ARG declared before FROM get wiped after it, so we need declaring it again -ARG ANDROID_NDK_ARCH=arm -ARG RS_SERVICE_QMAKE_EXTRA_OPTS -RUN $($PREPARE_TOOLCHAIN get_qt_dir | head -n 1)/bin/qmake ../RetroShare \ - -spec android-clang \ - CONFIG+=retroshare_service CONFIG+=rs_jsonapi \ - RS_UPNP_LIB=miniupnpc \ - JSONAPI_GENERATOR_EXE=/jsonapi-generator-build/jsonapi-generator \ - NATIVE_LIBS_TOOLCHAIN_PATH=$NATIVE_LIBS_TOOLCHAIN_PATH \ - CONFIG+=no_retroshare_gui CONFIG+=no_rs_service_webui_terminal_password \ - CONFIG+=no_rs_service_terminal_login \ - CONFIG+=no_rs_sam3 CONFIG+=no_rs_sam3_libsam3 \ - $RS_SERVICE_QMAKE_EXTRA_OPTS -RUN make -j$(nproc) -RUN make install INSTALL_ROOT=/retroshare-service-android-build/android-build/ - -ARG ANDROID_PLATFORM_VER=16 -RUN $($PREPARE_TOOLCHAIN get_qt_dir | head -n 1)/bin/androiddeployqt \ - --input retroshare-service/src/android-libretroshare-service.so-deployment-settings.json \ - --output android-build --android-platform android-$ANDROID_PLATFORM_VER \ - --jdk $JAVA_HOME --gradle diff --git a/build_scripts/OBS b/build_scripts/OBS index 83e96a35a..199ea96b2 160000 --- a/build_scripts/OBS +++ b/build_scripts/OBS @@ -1 +1 @@ -Subproject commit 83e96a35adc1b63cda0e9740352ff7ffc9af910f +Subproject commit 199ea96b27804f974c4b23adf2f1a24c94d95070 diff --git a/libbitdht b/libbitdht index 0412d366a..4355ea96b 160000 --- a/libbitdht +++ b/libbitdht @@ -1 +1 @@ -Subproject commit 0412d366adb2c88d3938a688c0c8fb931ee075c1 +Subproject commit 4355ea96b2662be893ae4fe785d3dc729b58022a diff --git a/openpgpsdk b/openpgpsdk index 400bf3092..40db9d6bf 160000 --- a/openpgpsdk +++ b/openpgpsdk @@ -1 +1 @@ -Subproject commit 400bf3092e515bde49467ec475c356125722dd94 +Subproject commit 40db9d6bfeffa3ff4f4f0ed41dd065f656c1816f diff --git a/retroshare-service/src/android/.gitignore b/retroshare-service/src/android/.gitignore deleted file mode 100644 index dfe00b261..000000000 --- a/retroshare-service/src/android/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -*~ -gradle.properties -local.properties diff --git a/retroshare-service/src/android/AndroidManifest.xml b/retroshare-service/src/android/AndroidManifest.xml deleted file mode 100644 index ecf8ba78a..000000000 --- a/retroshare-service/src/android/AndroidManifest.xml +++ /dev/null @@ -1,108 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -]]> - - - - - - - - - - - - - - - - -]]> - - - - - - - - - - - - - - - - - - - - - - -]]> - - - --> -]]> - diff --git a/retroshare-service/src/android/build.gradle b/retroshare-service/src/android/build.gradle deleted file mode 100644 index 8affd3c0b..000000000 --- a/retroshare-service/src/android/build.gradle +++ /dev/null @@ -1,57 +0,0 @@ -buildscript { - repositories { - google() - jcenter() - } - - dependencies { - classpath 'com.android.tools.build:gradle:3.0.1' - } -} - -repositories { - google() - jcenter() -} - -apply plugin: 'com.android.application' - -dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) -} - -android { - /******************************************************* - * The following variables: - * - androidBuildToolsVersion, - * - androidCompileSdkVersion - * - qt5AndroidDir - holds the path to qt android files - * needed to build any Qt application - * on Android. - * - * are defined in gradle.properties file. This file is - * updated by QtCreator and androiddeployqt tools. - * Changing them manually might break the compilation! - *******************************************************/ - - compileSdkVersion androidCompileSdkVersion.toInteger() - - buildToolsVersion androidBuildToolsVersion - - sourceSets { - main { - manifest.srcFile 'AndroidManifest.xml' - java.srcDirs = [qt5AndroidDir + '/src', 'src', 'java'] - aidl.srcDirs = [qt5AndroidDir + '/src', 'src', 'aidl'] - res.srcDirs = [qt5AndroidDir + '/res', 'res'] - resources.srcDirs = ['src'] - renderscript.srcDirs = ['src'] - assets.srcDirs = ['assets'] - jniLibs.srcDirs = ['libs'] - } - } - - lintOptions { - abortOnError false - } -} diff --git a/retroshare-service/src/android/gradle/wrapper/gradle-wrapper.jar b/retroshare-service/src/android/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index f6b961fd5..000000000 Binary files a/retroshare-service/src/android/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/retroshare-service/src/android/gradle/wrapper/gradle-wrapper.properties b/retroshare-service/src/android/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index bf3de2183..000000000 --- a/retroshare-service/src/android/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,5 +0,0 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-bin.zip -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists diff --git a/retroshare-service/src/android/gradlew b/retroshare-service/src/android/gradlew deleted file mode 100755 index cccdd3d51..000000000 --- a/retroshare-service/src/android/gradlew +++ /dev/null @@ -1,172 +0,0 @@ -#!/usr/bin/env sh - -############################################################################## -## -## Gradle start up script for UN*X -## -############################################################################## - -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" - -warn () { - echo "$*" -} - -die () { - echo - echo "$*" - echo - exit 1 -} - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi -fi - -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi - -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - i=$((i+1)) - done - case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac -fi - -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=$(save "$@") - -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" - -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" -fi - -exec "$JAVACMD" "$@" diff --git a/retroshare-service/src/android/gradlew.bat b/retroshare-service/src/android/gradlew.bat deleted file mode 100644 index f9553162f..000000000 --- a/retroshare-service/src/android/gradlew.bat +++ /dev/null @@ -1,84 +0,0 @@ -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/retroshare-service/src/android/res/drawable/retroshare_service_128x128.png b/retroshare-service/src/android/res/drawable/retroshare_service_128x128.png deleted file mode 120000 index 5fc093940..000000000 --- a/retroshare-service/src/android/res/drawable/retroshare_service_128x128.png +++ /dev/null @@ -1 +0,0 @@ -../../../../data/retroshare-service_128x128.png \ No newline at end of file diff --git a/retroshare-service/src/android/res/drawable/retroshare_service_48x48.png b/retroshare-service/src/android/res/drawable/retroshare_service_48x48.png deleted file mode 120000 index a05dabbff..000000000 --- a/retroshare-service/src/android/res/drawable/retroshare_service_48x48.png +++ /dev/null @@ -1 +0,0 @@ -../../../../data/retroshare-service_48x48.png \ No newline at end of file diff --git a/retroshare-service/src/android/res/layout/retroshare_service_control_layout.xml b/retroshare-service/src/android/res/layout/retroshare_service_control_layout.xml deleted file mode 100644 index a2a84fda8..000000000 --- a/retroshare-service/src/android/res/layout/retroshare_service_control_layout.xml +++ /dev/null @@ -1,11 +0,0 @@ - - -