diff --git a/.travis.yml b/.travis.yml
index 2598e3e7..030fa16d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,8 +2,11 @@ sudo: false
language: android
android:
components:
- - build-tools-22.0.1
- - android-19
+ - platform-tools
+ - tools
+ - build-tools-23.0.2
+ - android-23
+ - sys-img-armeabi-v7a-android-23
branches:
only:
- master
@@ -33,7 +36,7 @@ env:
- secure: AnxLVarfwM7IhJ7Sca35USyRlFHFvlcBhWTt2TVDcyQ+ldDyb+U6IWXFK0Yy82QP0ZH/RCLu7FnmHK/rKG0BHNRt1Ymco1VkTQql0MZcHXP+4IKgEvgJyUn1TqYj+hSVmM6lgTA+QUjZYGSfwU8mhUFiU7644ZTdTe6ALdqa+v8=
- secure: ezKyZbb3q1Phcv/vJntuJe0C2req+Hp4/C+tFZIWZ3o8wRO9jVI3bnED9TWQyQOOT0SoRYjJ5zqp0UcEOGCzPeWFO6bA7RWp+zA/R9sziLNcVWMVv3WXnuClQjPBHJeXRnP7YmNjxDmSfV97a14dk5d9LgJZYliTDepH4dLsxro=
matrix:
- - ANDROID_TARGET=android-19 ANDROID_ABI=armeabi-v7a
+ - ANDROID_TARGET=android-23 ANDROID_ABI=armeabi-v7a
addons:
coverity_scan:
project:
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 98463b39..bd1b0f78 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -30,7 +30,7 @@
+ android:targetSdkVersion="23" />
diff --git a/build.gradle b/build.gradle
index 2fc53f41..6483cddb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,7 @@ buildscript {
mavenCentral()
}
dependencies {
- classpath 'com.android.tools.build:gradle:1.2.3'
+ classpath 'com.android.tools.build:gradle:1.5.0'
}
}
@@ -18,8 +18,8 @@ dependencies {
}
android {
- compileSdkVersion 19
- buildToolsVersion "22.0.1"
+ compileSdkVersion 23
+ buildToolsVersion "23.0.2"
sourceSets {
main {
diff --git a/project.properties b/project.properties
index 91d2b024..b2ef7dcc 100644
--- a/project.properties
+++ b/project.properties
@@ -11,5 +11,5 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
# Project target.
-target=android-19
+target=android-23
android.library=true
diff --git a/sample_client/AndroidManifest.xml b/sample_client/AndroidManifest.xml
index 0dcaaa73..27c13660 100644
--- a/sample_client/AndroidManifest.xml
+++ b/sample_client/AndroidManifest.xml
@@ -30,7 +30,7 @@
+ android:targetSdkVersion="23" />
+ android:targetSdkVersion="23" />
private static final String SRC_PATH_TO_FILE_6 = SRC_BASE_FOLDER + FILE6;
- private static final String SRC_PATH_TO_FILE_7 = SRC_BASE_FOLDER + FILE7;
-
private static final String SRC_PATH_TO_NON_EXISTENT_FILE = SRC_BASE_FOLDER + NO_FILE;
private static final String SRC_PATH_TO_EMPTY_FOLDER = SRC_BASE_FOLDER + EMPTY;
diff --git a/test_client/tests/src/com/owncloud/android/lib/test_project/test/DownloadFileTest.java b/test_client/tests/src/com/owncloud/android/lib/test_project/test/DownloadFileTest.java
index ed04d443..04f36090 100644
--- a/test_client/tests/src/com/owncloud/android/lib/test_project/test/DownloadFileTest.java
+++ b/test_client/tests/src/com/owncloud/android/lib/test_project/test/DownloadFileTest.java
@@ -94,9 +94,8 @@ public class DownloadFileTest extends RemoteTest {
*/
public void testDownloadFile() {
RemoteOperationResult result = mActivity.downloadFile(
- new RemoteFile(mFullPath2Image),
- mActivity.getFilesDir().getAbsolutePath()
- );
+ new RemoteFile(mFullPath2Image), ""
+ );
mDownloadedFilePath = mFullPath2Image;
assertTrue(result.isSuccess());
// TODO some checks involving the local file
@@ -107,9 +106,8 @@ public class DownloadFileTest extends RemoteTest {
*/
public void testDownloadFileSpecialChars() {
RemoteOperationResult result = mActivity.downloadFile(
- new RemoteFile(mFullPath2ImageWitSpecialChars),
- mActivity.getFilesDir().getAbsolutePath()
- );
+ new RemoteFile(mFullPath2ImageWitSpecialChars), ""
+ );
mDownloadedFilePath = mFullPath2ImageWitSpecialChars;
assertTrue(result.isSuccess());
// TODO some checks involving the local file
@@ -120,9 +118,8 @@ public class DownloadFileTest extends RemoteTest {
*/
public void testDownloadFileNotFound() {
RemoteOperationResult result = mActivity.downloadFile(
- new RemoteFile(mFullPath2ImageNotFound),
- mActivity.getFilesDir().getAbsolutePath()
- );
+ new RemoteFile(mFullPath2ImageNotFound), ""
+ );
assertFalse(result.isSuccess());
}
diff --git a/test_client/tests/src/com/owncloud/android/lib/test_project/test/OwnCloudClientTest.java b/test_client/tests/src/com/owncloud/android/lib/test_project/test/OwnCloudClientTest.java
index e11aff8a..0e8eca0a 100644
--- a/test_client/tests/src/com/owncloud/android/lib/test_project/test/OwnCloudClientTest.java
+++ b/test_client/tests/src/com/owncloud/android/lib/test_project/test/OwnCloudClientTest.java
@@ -30,10 +30,9 @@ import java.security.GeneralSecurityException;
import org.apache.commons.httpclient.ConnectTimeoutException;
import org.apache.commons.httpclient.HttpException;
import org.apache.commons.httpclient.methods.HeadMethod;
-import org.apache.commons.httpclient.params.HttpMethodParams;
import org.apache.commons.httpclient.protocol.Protocol;
import org.apache.commons.httpclient.protocol.ProtocolSocketFactory;
-import org.apache.http.HttpStatus;
+import org.apache.commons.httpclient.HttpStatus;
import org.apache.jackrabbit.webdav.DavConstants;
import org.apache.jackrabbit.webdav.client.methods.PropFindMethod;
diff --git a/test_client/tests/src/com/owncloud/android/lib/test_project/test/UpdatePrivateShareTest.java b/test_client/tests/src/com/owncloud/android/lib/test_project/test/UpdatePrivateShareTest.java
index d839530b..128b0641 100644
--- a/test_client/tests/src/com/owncloud/android/lib/test_project/test/UpdatePrivateShareTest.java
+++ b/test_client/tests/src/com/owncloud/android/lib/test_project/test/UpdatePrivateShareTest.java
@@ -28,7 +28,6 @@ package com.owncloud.android.lib.test_project.test;
import java.io.File;
import java.security.GeneralSecurityException;
-import java.util.Calendar;
import junit.framework.AssertionFailedError;
@@ -207,8 +206,8 @@ public class UpdatePrivateShareTest extends RemoteTest {
UpdateRemoteShareOperation updateNoShare = new UpdateRemoteShareOperation(
mFileShare.getRemoteId()
);
- updateShare.setPermissions(OCShare.READ_PERMISSION_FLAG); // minimum permissions
- result = updateShare.execute(mClient);
+ updateNoShare.setPermissions(OCShare.READ_PERMISSION_FLAG); // minimum permissions
+ result = updateNoShare.execute(mClient);
assertFalse(result.isSuccess());
}