diff options
author | Morris Jobke <hey@morrisjobke.de> | 2016-09-19 17:32:43 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-09-19 17:32:43 +0300 |
commit | 0b5da69c0d3aff51595a8b807bc5ebe89460d2be (patch) | |
tree | e72b4e8c0f1345b4924574977547a364d165317e | |
parent | 1ce40b0cc40a95eb348ed3885ec868ada799d340 (diff) | |
parent | feacb1758f5b1f1d29868252ce1b9e1398f060f4 (diff) |
Merge pull request #15 from nextcloud/android-2android-2
add dependencies to docker container
-rw-r--r-- | android/Dockerfile | 3 | ||||
-rw-r--r-- | android/gradle/build.gradle | 90 | ||||
-rw-r--r-- | android/gradle/gradle/wrapper/gradle-wrapper.jar | bin | 0 -> 53636 bytes | |||
-rw-r--r-- | android/gradle/gradle/wrapper/gradle-wrapper.properties | 6 | ||||
-rwxr-xr-x | android/gradle/gradlew | 164 | ||||
-rw-r--r-- | android/gradle/src/main/AndroidManifest.xml | 7 |
6 files changed, 270 insertions, 0 deletions
diff --git a/android/Dockerfile b/android/Dockerfile index ce4b9f9..a579da0 100644 --- a/android/Dockerfile +++ b/android/Dockerfile @@ -5,3 +5,6 @@ RUN cd /opt && /opt/tools/android-accept-licenses.sh "android-sdk-linux/tools/an RUN apt-get update && apt-get install -y libxdamage1 libxfixes3 libpulse0 && apt-get clean ENV SHELL /bin/bash + +ADD gradle /gradle +RUN cd /gradle && ./gradlew clean diff --git a/android/gradle/build.gradle b/android/gradle/build.gradle new file mode 100644 index 0000000..f0109c9 --- /dev/null +++ b/android/gradle/build.gradle @@ -0,0 +1,90 @@ +// Gradle build file +// +// This project was started in Eclipse and later moved to Android Studio. In the transition, both IDEs were supported. +// Due to this, the files layout is not the usual in new projects created with Android Studio / gradle. This file +// merges declarations usually split in two separates build.gradle file, one for global settings of the project in +// its root folder, another one for the app module in subfolder of root. + +buildscript { + repositories { + jcenter() + } + dependencies { + classpath 'com.android.tools.build:gradle:2.1.3' + } +} + +apply plugin: 'com.android.application' + +ext { + supportLibraryVersion = '23.4.0' +} + +repositories { + jcenter() + maven { url "https://jitpack.io" } + + flatDir { + dirs 'libs' + } +} + +dependencies { + /// dependencies for app building + + compile "com.android.support:support-v4:${supportLibraryVersion}" + compile "com.android.support:design:${supportLibraryVersion}" + compile 'com.jakewharton:disklrucache:2.0.2' + compile "com.android.support:appcompat-v7:${supportLibraryVersion}" + compile "com.android.support:cardview-v7:${supportLibraryVersion}" + compile 'com.getbase:floatingactionbutton:1.10.1' + + + /// dependencies for local unit tests + testCompile 'junit:junit:4.12' + testCompile 'org.mockito:mockito-core:1.10.19' + + + /// dependencies for instrumented tests + // JUnit4 Rules + androidTestCompile 'com.android.support.test:rules:0.5' + + // Android JUnit Runner + androidTestCompile 'com.android.support.test:runner:0.5' + + // Android Annotation Support + androidTestCompile "com.android.support:support-annotations:${supportLibraryVersion}" + + // Espresso core + androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2' + + // UIAutomator - for cross-app UI tests, and to grant screen is turned on in Espresso tests + androidTestCompile 'com.android.support.test.uiautomator:uiautomator-v18:2.1.1' + +} + +tasks.withType(Test) { + /// increased logging for tests + testLogging { + events "passed", "skipped", "failed" + } +} + +android { + compileSdkVersion 23 + buildToolsVersion "23.0.3" + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_7 + targetCompatibility JavaVersion.VERSION_1_7 + } + + lintOptions { + abortOnError false + } + + packagingOptions { + exclude 'META-INF/LICENSE.txt' + } + +} diff --git a/android/gradle/gradle/wrapper/gradle-wrapper.jar b/android/gradle/gradle/wrapper/gradle-wrapper.jar Binary files differnew file mode 100644 index 0000000..13372ae --- /dev/null +++ b/android/gradle/gradle/wrapper/gradle-wrapper.jar diff --git a/android/gradle/gradle/wrapper/gradle-wrapper.properties b/android/gradle/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..24fae26 --- /dev/null +++ b/android/gradle/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Tue Aug 16 10:44:46 CEST 2016 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip diff --git a/android/gradle/gradlew b/android/gradle/gradlew new file mode 100755 index 0000000..91a7e26 --- /dev/null +++ b/android/gradle/gradlew @@ -0,0 +1,164 @@ +#!/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 + +# For Cygwin, ensure paths are in UNIX format before anything is touched. +if $cygwin ; then + [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` +fi + +# 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\"`/" >&- +APP_HOME="`pwd -P`" +cd "$SAVED" >&- + +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"` + + # 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/android/gradle/src/main/AndroidManifest.xml b/android/gradle/src/main/AndroidManifest.xml new file mode 100644 index 0000000..cac27a1 --- /dev/null +++ b/android/gradle/src/main/AndroidManifest.xml @@ -0,0 +1,7 @@ +<manifest package="com.demo.myapplication" + xmlns:android="http://schemas.android.com/apk/res/android"> + <application + android:allowBackup="true" + android:label="dependencies"> + </application> +</manifest> |