diff --git a/.gitignore b/.gitignore index 9b9bd8e396..98923747ee 100644 --- a/.gitignore +++ b/.gitignore @@ -30,5 +30,11 @@ oc_framework/proguard-project.txt oc_framework-test-project/proguard-project.txt tests/proguard-project.txt -# Should not be commited inside this repo: -actionbarsherlock/ \ No newline at end of file +# Android Studio and Gradle specific entries +.gradle +.idea +*.iml +build + +# Actionbarsherlock is now ignored since scripts takes care of init the sub-modules. +actionbarsherlock diff --git a/.gitmodules b/.gitmodules index f0ca872146..119bb294ea 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ -[submodule "actionbarsherlock"] - path = actionbarsherlock - url = git://github.com/JakeWharton/ActionBarSherlock.git [submodule "owncloud-android-library"] path = owncloud-android-library - url = git://github.com/owncloud/android-library.git + url = git://github.com/owncloudChalmers/android-library.git diff --git a/.travis.yml b/.travis.yml index 50b73d1b98..fbab8f4162 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,22 +1,16 @@ language: android android: components: + - platform-tools + - tools - build-tools-20.0.0 - android-19 - - android-17 - - android-14 - - extra-android-support - licenses: - - 'android-sdk-license-5be876d5' - - 'android-sdk-license-598b93a6' - -jdk: oraclejdk7 - before_install: - rm pom.xml - - ./setup_env.sh - + - ./setup_env.sh gradle script: + - ./gradlew clean build + - ./setup_env.sh ant - ant clean - ant debug diff --git a/SETUP.md b/SETUP.md index 39539038e9..3392db27de 100644 --- a/SETUP.md +++ b/SETUP.md @@ -1,13 +1,9 @@ - -If you want to start help developing ownCloud please follow the [contribution guidelines][0] and observe these instructions. -If you have any problems, start again with 1) and work your way down. If something still does not work as described here, please open a new issue describing exactly what you did, what happened, and what should have happened. - -### 1) Fork and download android/develop repository: +If you want to start help developing ownCloud please follow the [contribution guidelines][0] and observe these instructions: -NOTE: Android SDK with platforms 8, 14 and 19 (and maybe others) need to be installed. - You must have the Android SDK 'tools/', and 'platforms-tools/' folders in your environment path variable. - "git" need to be installed and in your environment path variable. +### 1. Fork and download android/develop repository: + +NOTE: You must have git in your environment path variable to perform the next operations. * Navigate to https://github.com/owncloud/android, click fork. * Clone your new repo: "git clone git@github.com:YOURGITHUBNAME/android.git" @@ -16,23 +12,28 @@ NOTE: Android SDK with platforms 8, 14 and 19 (and maybe others) need to be inst * Pull changes from your develop branch: "git pull origin develop" * Make official ownCloud repo known as upstream: "git remote add upstream git@github.com:owncloud/android.git" * Make sure to get the latest changes from official android/develop branch: "git pull upstream develop" -* Complete the setup of project properties and resolve pending dependencies running "setup_env.bat" or "./setup_env.sh" . -At this point you can continue using different tools to build the project. Sections 2a), 2b), and 2c) describe some of the existing alternatives. +At this point you can continue using different tools to build the project. Section 2, 3, 4, 5 and 6 describe some of the existing alternatives. + +### 2. Building with Ant: -### 2a) Building with Ant: - NOTE: You must have the Android SDK 'tools/', and 'platforms-tools/' folders in your environment path variable. -* Run "ant clean" . +* Resolve necessary dependencies running: + - Windows: "setup_env.bat ant" + - Mac OS/Linux: "./setup_env.sh ant" +* Run "ant clean". * Run "ant debug" to generate a debuggable version of the ownCloud app. -### 2b) Building with console/maven: +### 3. Building with console/maven: NOTE: You must have mvn (version >= 3.1.1) in your environment path. Current Android 'platforms-tools' need to be installed. -Download/install Android plugin for Maven, install owncloud-android-library, then build ownCloud with mvn: +Download/install Android plugin for Maven, then build ownCloud with mvn: +* Resolve necessary dependencies running: + - Windows: "setup_env.bat maven" + - Mac OS/Linux: "./setup_env.sh maven" * cd .. * git clone https://github.com/mosabua/maven-android-sdk-deployer.git * cd maven-android-sdk-deployer @@ -41,43 +42,65 @@ Download/install Android plugin for Maven, install owncloud-android-library, the * mvn install * cd .. -Now you can create ownCloud APK using "mvn package" +Now you can create ownCloud APK using "mvn package" and find it as ownCloud.apk under the target -### 2c) Building with Eclipse: +### 4. Building with Gradle: + +* Complete the setup of project properties running: + - Windows: "setup_env.bat gradle" + - Mac OS/Linux: "./setup_env.sh gradle" +* Open a terminal and go to the "android" directory that contains the repository. +* Run the 'clean' and 'build' tasks using the Gradle wrapper provided: + - Windows: gradlew.bat clean build + - Mac OS/Linux: ./gradlew clean build +* You can find the generated apk file in android/build/outputs/apk + +### 5. Building with Eclipse: NOTE: You must have the Android SDK 'tools/', and 'platforms-tools/' folders in your environment path variable. -* Complete the setup of project properties and resolve pending dependencies running "setup_env.bat" or "./setup_env.sh" . -* Open Eclipse and create new "Android Project from Existing Code". Choose android/actionbarsherlock/library as root. +* Resolve necessary dependencies running: + - Windows: "setup_env.bat ant" + - Mac OS/Linux: "./setup_env.sh ant" + * Open Eclipse and create new "Android Project from Existing Code". Choose android/actionbarsherlock/library as root. * Clean project and compile. -* If any error appear, check the project properties; in the 'Android' section, API Level should be greater or equal than 14. -* If "error loading libz.so.1" appears, try "sudo apt-get install lib32z1" +* If any error appears, check the project properties; in the 'Android' section, API Level should be greater or equal than 14. * Make sure android/actionbarsherlock/library/bin/library.jar was created. -* Create a new "Android Project from Existing Code". Choose android/owncloud-android-library as root. (test and sample clients are not required.) +* Create a new "Android Project from Existing Code". Choose android/owncloud-android-library as root. * Clean project and compile. -* If any error appear, check the project properties; in the 'Android' section, API Level should be 19 or greater. -* Make sure 'android/owncloud-android-library/bin/owncloud android library.jar' was created. +* If any error appears, check the project properties; in the 'Android' section, API Level should be 19 or greater. +* Make sure android/owncloud-android-library/bin/classes.jar was created. * Import ownCloud Android project. * Clean project and compile. * If any error appears, check the project properties of owncloud-android project; in the 'Android' section: - - API Level should be 19 or greater. - - Two library projects should appear referred in the bottom square: actionbarsherlock/library and owncloud-android-library. Add them if needed. + - API Level should be 19 or greater. + - Two library projects should appear referred in the bottom square: actionbarsherlock/library and owncloud-android-library. Add them if needed. * After those actions you should be good to go. HAVE FUN! NOTE: Even though API level is set to 19, APK also runs on older devices because in AndroidManifest.xml minSdkVersion is set to 8. -### 3) Create pull request: - +### 6. Building with Android Studio: + +* Complete the setup of project properties running: + - Windows: "setup_env.bat gradle" + - Mac OS/Linux: "./setup_env.sh gradle" +* The first time you want to open the project in Android Studio, select 'Import Project...' and choose the file "android/settings.gradle". + Android Studio will then create the '.iml' files it needs. If you ever close the project but the files are still there, you just select + 'Open Project...'. The file chooser will show an Android face as the folder icon, which you can select to reopen the project. +* To build the project, follow the guidelines shown on [4. Building with Gradle][2]. + +### 7. Create pull request: + NOTE: You must sign the [Contributor Agreement][1] before your changes can be accepted! * Commit your changes locally: "git commit -a" -* Push your changes to your Github repo: "git push" +* Push your changes to your GitHub repo: "git push" * Browse to https://github.com/YOURGITHUBNAME/android/pulls and issue pull request * Click "Edit" and set "base:develop" * Again, click "Edit" and set "compare:develop" * Enter description and send pull request. -### 4) Create another pull request: +### 8. Create another pull request: To make sure your new pull request does not contain commits which are already contained in previous PRs, create a new branch which is a clone of upstream/develop. @@ -85,8 +108,9 @@ To make sure your new pull request does not contain commits which are already co * git checkout -b my_new_develop_branch upstream/develop * If you want to rename that branch later: "git checkout -b my_new_develop_branch_with_new_name" * Push branch to server: "git push -u origin name_of_local_develop_branch" -* Use Github to issue PR +* Use GitHub to issue PR [0]: https://github.com/owncloud/android/blob/master/CONTRIBUTING.md [1]: http://owncloud.org/about/contributor-agreement/ +[2]: https://github.com/owncloud/android/blob/master/SETUP.md#4-building-with-gradle diff --git a/actionbarsherlock b/actionbarsherlock deleted file mode 160000 index 9598f2bb2c..0000000000 --- a/actionbarsherlock +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 9598f2bb2ceed4a834cd5586a903f270ca4c0ccc diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000000..75231ed9f8 --- /dev/null +++ b/build.gradle @@ -0,0 +1,78 @@ +buildscript { + repositories { + mavenCentral() + } + dependencies { + classpath 'com.android.tools.build:gradle:0.13.0' + } +} + +apply plugin: 'com.android.application' + + +repositories { + mavenCentral() + + flatDir { + dirs 'libs' + } +} + +artifacts.add("default", file('libs/actionbarsherlock.aar')) + +dependencies { + compile name: 'touch-image-view' + compile 'com.android.support:support-v4:19.1.0' + compile project('libs/actionbarsherlock_lib') + compile project(':owncloud-android-library') + compile 'com.jakewharton:disklrucache:2.0.2' +} + +android { + compileSdkVersion 19 + buildToolsVersion "20.0.0" + sourceSets { + main { + manifest.srcFile 'AndroidManifest.xml' + java.srcDirs = ['src'] + resources.srcDirs = ['src'] + aidl.srcDirs = ['src'] + renderscript.srcDirs = ['src'] + res.srcDirs = ['res'] + assets.srcDirs = ['res'] + } + + // Move the tests to tests/java, tests/res, etc... + instrumentTest.setRoot('tests') + + // Move the build types to build-types/ + // For instance, build-types/debug/java, build-types/debug/AndroidManifest.xml, ... + // This moves them out of them default location under src//... which would + // conflict with src/ being used by the main source set. + // Adding new build types or product flavors should be accompanied + // by a similar customization. + debug.setRoot('build-types/debug') + release.setRoot('build-types/release') + } + + android { + lintOptions { + abortOnError false + } + } + + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_7 + targetCompatibility JavaVersion.VERSION_1_7 + } + + productFlavors { + } + + packagingOptions { + exclude 'META-INF/LICENSE.txt' + } +} + + diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000..3d0dee6e8e Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000000..8d63f892d1 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Wed Oct 15 10:45:44 CEST 2014 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-2.1-all.zip diff --git a/gradlew b/gradlew new file mode 100755 index 0000000000..91a7e269e1 --- /dev/null +++ b/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/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000000..aec99730b4 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,90 @@ +@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/libs/actionbarsherlock_lib/build.gradle b/libs/actionbarsherlock_lib/build.gradle new file mode 100644 index 0000000000..58172e2c57 --- /dev/null +++ b/libs/actionbarsherlock_lib/build.gradle @@ -0,0 +1,2 @@ +configurations.create("default") +artifacts.add("default", file('library-4.1.0.aar')) diff --git a/libs/actionbarsherlock_lib/library-4.1.0.aar b/libs/actionbarsherlock_lib/library-4.1.0.aar new file mode 100644 index 0000000000..f340e01183 Binary files /dev/null and b/libs/actionbarsherlock_lib/library-4.1.0.aar differ diff --git a/oc_jb_workaround/build.gradle b/oc_jb_workaround/build.gradle new file mode 100644 index 0000000000..882a090f5e --- /dev/null +++ b/oc_jb_workaround/build.gradle @@ -0,0 +1,42 @@ +buildscript { + repositories { + mavenCentral() + } + dependencies { + classpath 'com.android.tools.build:gradle:0.13.0' + } +} +apply plugin: 'com.android.library' + +dependencies { + compile fileTree(dir: 'libs', include: '*.jar') +} + +android { + compileSdkVersion 19 + buildToolsVersion "20.0.0" + + sourceSets { + main { + manifest.srcFile 'AndroidManifest.xml' + java.srcDirs = ['src'] + resources.srcDirs = ['src'] + aidl.srcDirs = ['src'] + renderscript.srcDirs = ['src'] + res.srcDirs = ['res'] + assets.srcDirs = ['assets'] + } + + // Move the tests to tests/java, tests/res, etc... + instrumentTest.setRoot('tests') + + // Move the build types to build-types/ + // For instance, build-types/debug/java, build-types/debug/AndroidManifest.xml, ... + // This moves them out of them default location under src//... which would + // conflict with src/ being used by the main source set. + // Adding new build types or product flavors should be accompanied + // by a similar customization. + debug.setRoot('build-types/debug') + release.setRoot('build-types/release') + } +} diff --git a/oc_jb_workaround/gradle/wrapper/gradle-wrapper.jar b/oc_jb_workaround/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000..8c0fb64a86 Binary files /dev/null and b/oc_jb_workaround/gradle/wrapper/gradle-wrapper.jar differ diff --git a/oc_jb_workaround/gradle/wrapper/gradle-wrapper.properties b/oc_jb_workaround/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000000..1e61d1fd3a --- /dev/null +++ b/oc_jb_workaround/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Wed Apr 10 15:27:10 PDT 2013 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip diff --git a/oc_jb_workaround/gradlew b/oc_jb_workaround/gradlew new file mode 100755 index 0000000000..91a7e269e1 --- /dev/null +++ b/oc_jb_workaround/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/oc_jb_workaround/gradlew.bat b/oc_jb_workaround/gradlew.bat new file mode 100644 index 0000000000..aec99730b4 --- /dev/null +++ b/oc_jb_workaround/gradlew.bat @@ -0,0 +1,90 @@ +@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/oc_jb_workaround/project.properties b/oc_jb_workaround/project.properties index a3ee5ab64f..4ab125693c 100644 --- a/oc_jb_workaround/project.properties +++ b/oc_jb_workaround/project.properties @@ -11,4 +11,4 @@ #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt # Project target. -target=android-17 +target=android-19 diff --git a/owncloud-android-library b/owncloud-android-library index 5bd0d73877..b1ed64d9c6 160000 --- a/owncloud-android-library +++ b/owncloud-android-library @@ -1 +1 @@ -Subproject commit 5bd0d7387712ce3f53869294761ac4d8537841cd +Subproject commit b1ed64d9c6ab35d4c0bd504ad63476ddcee3ad61 diff --git a/pom.xml b/pom.xml index 6a8cf6a75d..538df03c7c 100644 --- a/pom.xml +++ b/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 com.owncloud.android @@ -13,7 +14,7 @@ 1.5.1-SNAPSHOT 1.6 - 4.4.2_r3 + 4.4.2_r4 19 4.2.0 @@ -26,8 +27,17 @@ scm:git:git@github.com:owncloud/android.git https://github.com/owncloud/android - + + + + + + + + + + touch-image-view.jar @@ -44,6 +54,13 @@ 19.1.0 --> + + + com.jakewharton + disklrucache + 2.0.2 + + android-support-v4.jar android-support-v4.jar @@ -51,7 +68,15 @@ system ${basedir}/third_party/android-support-library/android-support-v4.jar - + + + + com.actionbarsherlock + library + ${actionbarsherlock-version} + apklib + + android android @@ -59,26 +84,19 @@ provided - - com.actionbarsherlock - actionbarsherlock - ${actionbarsherlock-version} - provided - + + + + + - - com.actionbarsherlock - actionbarsherlock - ${actionbarsherlock-version} - apklib - - com.owncloud.android - owncloud-android-library - ${owncloud.version} - + com.owncloud.android + owncloud-android-library + ${owncloud.version} + @@ -92,7 +110,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.0 + 3.1 ${java-version} ${java-version} @@ -102,7 +120,7 @@ com.jayway.maven.plugins.android.generation2 android-maven-plugin - 3.8.0 + 3.8.2 ${env.ANDROID_HOME} diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000000..66022f5e87 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,3 @@ +include ':owncloud-android-library' +include 'libs/actionbarsherlock_lib' +include ':' diff --git a/setup_env.bat b/setup_env.bat index dc44a12069..0781036c76 100644 --- a/setup_env.bat +++ b/setup_env.bat @@ -1,8 +1,59 @@ +@echo off + +:: Use argument to decide which build system should be used +if "%1" == "gradle" goto initForGradle +if "%1" == "maven" goto initForMaven +if "%1" == "ant" goto initForAnt +goto invalidInput + +:initForGradle +echo "Executing Gradle setup..." +goto initDefault + +:initForMaven +echo "Executing Maven setup..." +goto initDefault + +:initForAnt +echo "Executing Ant setup..." +::If the directory exists the script has already been executed +if not exist .\actionbarsherlock ( + + ::Gets the owncloud-android-library + call git submodule init + call git submodule update + + ::Clones the actionbarsherlock and checks-out the right release (4.2.0) + git clone "https://github.com/JakeWharton/ActionBarSherlock.git" "actionbarsherlock" + cd "actionbarsherlock" + git checkout "90939dc3925ffaaa0de269bbbe1b35e274968ea1" + cd ../ + + call android.bat update project -p actionbarsherlock/library -n ActionBarSherlock --target android-19 + call android.bat update lib-project -p owncloud-android-library + call android.bat update project -p . + call android.bat update project -p oc_jb_workaround + copy /Y third_party\android-support-library\android-support-v4.jar actionbarsherlock\library\libs\android-support-v4.jar + call android.bat update test-project -p tests -m .. +) +goto complete + +:initDefault call git submodule init call git submodule update -call android.bat update project -p actionbarsherlock\library -n ActionBarSherlock call android.bat update lib-project -p owncloud-android-library call android.bat update project -p . call android.bat update project -p oc_jb_workaround -copy /Y third_party\android-support-library\android-support-v4.jar actionbarsherlock\library\libs\android-support-v4.jar call android.bat update test-project -p tests -m .. +goto complete + +:invalidInput +echo "Input argument invalid." +echo "Usage: %0 [ant | maven | gradle]." +goto exit + +:complete +echo "...setup complete." +goto exit + +:exit \ No newline at end of file diff --git a/setup_env.sh b/setup_env.sh index ae4214238b..8c9af07188 100755 --- a/setup_env.sh +++ b/setup_env.sh @@ -1,10 +1,75 @@ #!/bin/bash -e -git submodule init -git submodule update -android update project -p actionbarsherlock/library -n ActionBarSherlock -android update lib-project -p owncloud-android-library -android update project -p . -android update project -p oc_jb_workaround -cp third_party/android-support-library/android-support-v4.jar actionbarsherlock/library/libs/android-support-v4.jar -android update test-project -p tests -m .. + +#Repository +ActionBarSherlockRepo="https://github.com/JakeWharton/ActionBarSherlock.git" + +#Directory for actionbarsherlock +DIRECTORY="actionbarsherlock" + +#Commit for version 4.2 of actionbar sherlock +COMMIT="90939dc3925ffaaa0de269bbbe1b35e274968ea1" + + +function initDefault { + git submodule init + git submodule update + android update lib-project -p owncloud-android-library + android update project -p . + android update project -p oc_jb_workaround + android update test-project -p tests -m .. +} + +function initForAnt { + #If the directory exists the script has already been executed + if [ ! -d "$DIRECTORY" ]; then + + #Gets the owncloud-android-library + git submodule init + git submodule update + + #Clones the actionbarsherlock and checks-out the right release (4.2.0) + git clone $ActionBarSherlockRepo $DIRECTORY + cd $DIRECTORY + git checkout $COMMIT + cd ../ + + #As default it updates the ant scripts + android update project -p "$DIRECTORY"/library -n ActionBarSherlock --target android-19 + android update lib-project -p owncloud-android-library + android update project -p . + android update project -p oc_jb_workaround + cp third_party/android-support-library/android-support-v4.jar actionbarsherlock/library/libs/android-support-v4.jar + android update test-project -p tests -m .. + fi +} + +#No args +if [ $# -lt 1 ]; then + echo "No args found" + echo "Usage : $0 [gradle | maven | ant]" + exit +fi + +#checking args +case "$1" in + + "ant") + echo "Creating Ant environment" + initForAnt + ;; + + "gradle") echo "Creating gradle environment" + initDefault + ;; + + "maven") echo "Creating maven environment" + initDefault + ;; + + *) echo "Argument not recognized" + echo "Usage : $0 [gradle | maven | ant]" + ;; +esac + +exit diff --git a/src/com/owncloud/android/datamodel/FileDataStorageManager.java b/src/com/owncloud/android/datamodel/FileDataStorageManager.java index 5b1bef1b5d..e7895e4998 100644 --- a/src/com/owncloud/android/datamodel/FileDataStorageManager.java +++ b/src/com/owncloud/android/datamodel/FileDataStorageManager.java @@ -1401,7 +1401,7 @@ public class FileDataStorageManager { path = path + FileUtils.PATH_SEPARATOR; } - // Update OCFile with data from share: ShareByLink ¿and publicLink? + // Update OCFile with data from share: ShareByLink and publicLink OCFile file = getFileByPath(path); if (file != null) { if (share.getShareType().equals(ShareType.PUBLIC_LINK)) { diff --git a/src/com/owncloud/android/operations/CreateShareOperation.java b/src/com/owncloud/android/operations/CreateShareOperation.java index c32c4771ec..b563790fda 100644 --- a/src/com/owncloud/android/operations/CreateShareOperation.java +++ b/src/com/owncloud/android/operations/CreateShareOperation.java @@ -57,20 +57,20 @@ public class CreateShareOperation extends SyncOperation { /** * Constructor * @param path Full path of the file/folder being shared. Mandatory argument - * @param shareType ‘0’ = user, ‘1’ = group, ‘3’ = Public link. Mandatory argument + * @param shareType 0 = user, 1 = group, 3 = Public link. Mandatory argument * @param shareWith User/group ID with who the file should be shared. This is mandatory for shareType of 0 or 1 - * @param publicUpload If ‘false’ (default) public cannot upload to a public shared folder. - * If ‘true’ public can upload to a shared folder. Only available for public link shares + * @param publicUpload If false (default) public cannot upload to a public shared folder. + * If true public can upload to a shared folder. Only available for public link shares * @param password Password to protect a public link share. Only available for public link shares - * @param permissions 1 - Read only – Default for “public” shares + * @param permissions 1 - Read only - Default for public shares * 2 - Update * 4 - Create * 8 - Delete * 16- Re-share - * 31- All above – Default for “private” shares + * 31- All above - Default for private shares * For user or group shares. * To obtain combinations, add the desired values together. - * For instance, for “Re-Share”, “delete”, “read”, “update”, add 16+8+2+1 = 27. + * For instance, for Re-Share, delete, read, update, add 16+8+2+1 = 27. */ public CreateShareOperation(String path, ShareType shareType, String shareWith, boolean publicUpload, String password, int permissions, Intent sendIntent) { diff --git a/src/com/owncloud/android/operations/GetSharesForFileOperation.java b/src/com/owncloud/android/operations/GetSharesForFileOperation.java index c319d620f2..649437d29a 100644 --- a/src/com/owncloud/android/operations/GetSharesForFileOperation.java +++ b/src/com/owncloud/android/operations/GetSharesForFileOperation.java @@ -45,10 +45,10 @@ public class GetSharesForFileOperation extends SyncOperation { * Constructor * * @param path Path to file or folder - * @param reshares If set to ‘false’ (default), only shares from the current user are returned - * If set to ‘true’, all shares from the given file are returned - * @param subfiles If set to ‘false’ (default), lists only the folder being shared - * If set to ‘true’, all shared files within the folder are returned. + * @param reshares If set to false (default), only shares from the current user are returned + * If set to true, all shares from the given file are returned + * @param subfiles If set to false (default), lists only the folder being shared + * If set to true, all shared files within the folder are returned. */ public GetSharesForFileOperation(String path, boolean reshares, boolean subfiles) { mPath = path; diff --git a/tests/.classpath b/tests/.classpath index 9b141f6f1c..26d8fe4850 100644 --- a/tests/.classpath +++ b/tests/.classpath @@ -1,10 +1,10 @@ - - + + diff --git a/third_party/android-support-library/android-support-v4.jar b/third_party/android-support-library/android-support-v4.jar index 187bdf48b1..d0b8535585 100644 Binary files a/third_party/android-support-library/android-support-v4.jar and b/third_party/android-support-library/android-support-v4.jar differ