From 040e4cb7e454d532d249d2a5de6f2aba0c902baa Mon Sep 17 00:00:00 2001 From: assiduous Date: Tue, 24 Dec 2019 19:23:32 -0800 Subject: Updated submodules; removed tests folder (tests are now part of every submodule) --- Tests/Android/.gitignore | 6 - Tests/Android/TestApp/build.gradle | 28 ---- Tests/Android/TestApp/src/main/AndroidManifest.xml | 31 ---- .../java/com/diligentengine/testapp/TestApp.java | 22 --- .../testapp/TestAppNativeActivity.java | 22 --- .../TestApp/src/main/res/values/strings.xml | 5 - Tests/Android/build.gradle | 18 --- Tests/Android/gradle/wrapper/gradle-wrapper.jar | Bin 53636 -> 0 bytes .../gradle/wrapper/gradle-wrapper.properties | 6 - Tests/Android/gradlew | 160 --------------------- Tests/Android/gradlew.bat | 90 ------------ Tests/Android/settings.gradle | 2 - 12 files changed, 390 deletions(-) delete mode 100644 Tests/Android/.gitignore delete mode 100644 Tests/Android/TestApp/build.gradle delete mode 100644 Tests/Android/TestApp/src/main/AndroidManifest.xml delete mode 100644 Tests/Android/TestApp/src/main/java/com/diligentengine/testapp/TestApp.java delete mode 100644 Tests/Android/TestApp/src/main/java/com/diligentengine/testapp/TestAppNativeActivity.java delete mode 100644 Tests/Android/TestApp/src/main/res/values/strings.xml delete mode 100644 Tests/Android/build.gradle delete mode 100644 Tests/Android/gradle/wrapper/gradle-wrapper.jar delete mode 100644 Tests/Android/gradle/wrapper/gradle-wrapper.properties delete mode 100644 Tests/Android/gradlew delete mode 100644 Tests/Android/gradlew.bat delete mode 100644 Tests/Android/settings.gradle (limited to 'Tests/Android') diff --git a/Tests/Android/.gitignore b/Tests/Android/.gitignore deleted file mode 100644 index 8334aec..0000000 --- a/Tests/Android/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -.gradle -.idea -build -local.properties -**/*.iml -.externalNativeBuild \ No newline at end of file diff --git a/Tests/Android/TestApp/build.gradle b/Tests/Android/TestApp/build.gradle deleted file mode 100644 index 70e486a..0000000 --- a/Tests/Android/TestApp/build.gradle +++ /dev/null @@ -1,28 +0,0 @@ -apply plugin: 'com.android.application' -apply from: "../../../Common/NativeApp/Android/android_common.gradle" - -android { - defaultConfig { - applicationId = 'com.diligentengine.testapp' - } - buildTypes { - release { - minifyEnabled = false - proguardFiles getDefaultProguardFile('proguard-android.txt'), - 'proguard-rules.pro' - } - } - sourceSets { - main { - assets.srcDirs = ['../../TestApp/assets'] - } - } -} - -buildDir '../build/TestApp' - -dependencies { - implementation project(":Common") - implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'com.android.support:appcompat-v7:28.0.0' -} diff --git a/Tests/Android/TestApp/src/main/AndroidManifest.xml b/Tests/Android/TestApp/src/main/AndroidManifest.xml deleted file mode 100644 index 4475bee..0000000 --- a/Tests/Android/TestApp/src/main/AndroidManifest.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/Tests/Android/TestApp/src/main/java/com/diligentengine/testapp/TestApp.java b/Tests/Android/TestApp/src/main/java/com/diligentengine/testapp/TestApp.java deleted file mode 100644 index 4da060e..0000000 --- a/Tests/Android/TestApp/src/main/java/com/diligentengine/testapp/TestApp.java +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright 2013 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.diligentengine.testapp; -import com.diligentengine.android.common.DiligentApplicationBase; - -public class TestApp extends DiligentApplicationBase { - -} diff --git a/Tests/Android/TestApp/src/main/java/com/diligentengine/testapp/TestAppNativeActivity.java b/Tests/Android/TestApp/src/main/java/com/diligentengine/testapp/TestAppNativeActivity.java deleted file mode 100644 index f29f0eb..0000000 --- a/Tests/Android/TestApp/src/main/java/com/diligentengine/testapp/TestAppNativeActivity.java +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright 2013 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.diligentengine.testapp; -import com.diligentengine.android.common.NativeActivityBase; - -public class TestAppNativeActivity extends NativeActivityBase { - -} diff --git a/Tests/Android/TestApp/src/main/res/values/strings.xml b/Tests/Android/TestApp/src/main/res/values/strings.xml deleted file mode 100644 index 9c20773..0000000 --- a/Tests/Android/TestApp/src/main/res/values/strings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - Test Application - - diff --git a/Tests/Android/build.gradle b/Tests/Android/build.gradle deleted file mode 100644 index 8139abe..0000000 --- a/Tests/Android/build.gradle +++ /dev/null @@ -1,18 +0,0 @@ -// Top-level build file where you can add configuration options common to all sub-projects/modules. -buildscript { - repositories { - jcenter() - google() - } - dependencies { - classpath 'com.android.tools.build:gradle:3.4.0' - } -} - -allprojects { - repositories { - jcenter() - google() - } -} - diff --git a/Tests/Android/gradle/wrapper/gradle-wrapper.jar b/Tests/Android/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 13372ae..0000000 Binary files a/Tests/Android/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/Tests/Android/gradle/wrapper/gradle-wrapper.properties b/Tests/Android/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index 4db3b1f..0000000 --- a/Tests/Android/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,6 +0,0 @@ -#Fri May 10 20:41:52 PDT 2019 -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip diff --git a/Tests/Android/gradlew b/Tests/Android/gradlew deleted file mode 100644 index 9d82f78..0000000 --- a/Tests/Android/gradlew +++ /dev/null @@ -1,160 +0,0 @@ -#!/usr/bin/env bash - -############################################################################## -## -## Gradle start up script for UN*X -## -############################################################################## - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# 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 -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; -esac - -# 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 - -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" ] ; 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 - -# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules -function splitJvmOpts() { - JVM_OPTS=("$@") -} -eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS -JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" - -exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/Tests/Android/gradlew.bat b/Tests/Android/gradlew.bat deleted file mode 100644 index aec9973..0000000 --- a/Tests/Android/gradlew.bat +++ /dev/null @@ -1,90 +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 - -@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= - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@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 Windowz variants - -if not "%OS%" == "Windows_NT" goto win9xME_args -if "%@eval[2+2]" == "4" goto 4NT_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=%* -goto execute - -:4NT_args -@rem Get arguments from the 4NT Shell from JP Software -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/Tests/Android/settings.gradle b/Tests/Android/settings.gradle deleted file mode 100644 index ae824cd..0000000 --- a/Tests/Android/settings.gradle +++ /dev/null @@ -1,2 +0,0 @@ -include 'Common', ':TestApp' -project(':Common').projectDir = new File(settingsDir, '../../Common/NativeApp/Android') -- cgit v1.2.3