diff --git a/.project b/.project deleted file mode 100644 index 4b5c2951..00000000 --- a/.project +++ /dev/null @@ -1,33 +0,0 @@ - - - ownCloud Android Library - - - - - - com.android.ide.eclipse.adt.ResourceManagerBuilder - - - - - com.android.ide.eclipse.adt.PreCompilerBuilder - - - - - org.eclipse.jdt.core.javabuilder - - - - - com.android.ide.eclipse.adt.ApkBuilder - - - - - - com.android.ide.eclipse.adt.AndroidNature - org.eclipse.jdt.core.javanature - - diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index b080d2dd..00000000 --- a/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/.travis.yml b/.travis.yml index d0bca7a2..6a8a27d3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ branches: - master install: # Let's use the new command 'sdkmanager' to install Android SDK components -- yes | sdkmanager --verbose "build-tools;26.0.2" +- yes | sdkmanager --verbose "build-tools;26.0.3" - yes | sdkmanager --verbose "platform-tools" - yes | sdkmanager --verbose "tools" - yes | sdkmanager --verbose "platforms;android-26" diff --git a/ant.properties b/ant.properties deleted file mode 100644 index 0901c3b2..00000000 --- a/ant.properties +++ /dev/null @@ -1,8 +0,0 @@ -# This file contains custom properties used by the Ant build system. -# -# This file must be checked in Version Control Systems. -# - -# Java version options -java.source=1.7 -java.target=1.7 diff --git a/build.gradle b/build.gradle index ad97f38d..5cd6b67e 100644 --- a/build.gradle +++ b/build.gradle @@ -2,14 +2,13 @@ buildscript { repositories { google() jcenter() + google() } dependencies { classpath 'com.android.tools.build:gradle:3.2.1' } } -apply plugin: 'com.android.library' - allprojects { repositories { google() @@ -17,50 +16,3 @@ allprojects { maven { url 'https://jitpack.io' } } } - -dependencies { - api 'com.squareup.okhttp3:okhttp:3.10.0' - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.51" - implementation 'com.gitlab.ownclouders:dav4android:oc_support' -} - -android { - compileSdkVersion 26 - - defaultConfig { - minSdkVersion 14 - targetSdkVersion 26 - } - - 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... - androidTest.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') - } - - lintOptions { - abortOnError false - } - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } -} diff --git a/build.xml b/build.xml deleted file mode 100644 index a87e590d..00000000 --- a/build.xml +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/custom_rules.xml b/custom_rules.xml deleted file mode 100644 index 64ac6702..00000000 --- a/custom_rules.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - Copying jar file for binary distribution - - - \ No newline at end of file diff --git a/owncloud-android-library/build.gradle b/owncloud-android-library/build.gradle new file mode 100644 index 00000000..77145f18 --- /dev/null +++ b/owncloud-android-library/build.gradle @@ -0,0 +1,26 @@ +apply plugin: 'com.android.library' + +dependencies { + api 'com.squareup.okhttp3:okhttp:3.12.0' + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.11" + implementation 'com.gitlab.ownclouders:dav4android:oc_support' +} + +android { + compileSdkVersion 26 + + defaultConfig { + minSdkVersion 14 + targetSdkVersion 26 + } + + lintOptions { + abortOnError false + ignoreWarnings true + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } +} diff --git a/AndroidManifest.xml b/owncloud-android-library/src/main/AndroidManifest.xml similarity index 89% rename from AndroidManifest.xml rename to owncloud-android-library/src/main/AndroidManifest.xml index b8083d23..ffa15c07 100644 --- a/AndroidManifest.xml +++ b/owncloud-android-library/src/main/AndroidManifest.xml @@ -30,8 +30,12 @@ + + diff --git a/src/com/owncloud/android/lib/common/DynamicSessionManager.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/common/DynamicSessionManager.java similarity index 100% rename from src/com/owncloud/android/lib/common/DynamicSessionManager.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/common/DynamicSessionManager.java diff --git a/src/com/owncloud/android/lib/common/OwnCloudAccount.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/common/OwnCloudAccount.java similarity index 100% rename from src/com/owncloud/android/lib/common/OwnCloudAccount.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/common/OwnCloudAccount.java diff --git a/src/com/owncloud/android/lib/common/OwnCloudClient.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/common/OwnCloudClient.java similarity index 100% rename from src/com/owncloud/android/lib/common/OwnCloudClient.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/common/OwnCloudClient.java diff --git a/src/com/owncloud/android/lib/common/OwnCloudClientFactory.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/common/OwnCloudClientFactory.java similarity index 100% rename from src/com/owncloud/android/lib/common/OwnCloudClientFactory.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/common/OwnCloudClientFactory.java diff --git a/src/com/owncloud/android/lib/common/OwnCloudClientManager.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/common/OwnCloudClientManager.java similarity index 100% rename from src/com/owncloud/android/lib/common/OwnCloudClientManager.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/common/OwnCloudClientManager.java diff --git a/src/com/owncloud/android/lib/common/OwnCloudClientManagerFactory.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/common/OwnCloudClientManagerFactory.java similarity index 100% rename from src/com/owncloud/android/lib/common/OwnCloudClientManagerFactory.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/common/OwnCloudClientManagerFactory.java diff --git a/src/com/owncloud/android/lib/common/SimpleFactoryManager.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/common/SimpleFactoryManager.java similarity index 100% rename from src/com/owncloud/android/lib/common/SimpleFactoryManager.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/common/SimpleFactoryManager.java diff --git a/src/com/owncloud/android/lib/common/SingleSessionManager.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/common/SingleSessionManager.java similarity index 100% rename from src/com/owncloud/android/lib/common/SingleSessionManager.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/common/SingleSessionManager.java diff --git a/src/com/owncloud/android/lib/common/accounts/AccountTypeUtils.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/common/accounts/AccountTypeUtils.java similarity index 100% rename from src/com/owncloud/android/lib/common/accounts/AccountTypeUtils.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/common/accounts/AccountTypeUtils.java diff --git a/src/com/owncloud/android/lib/common/accounts/AccountUtils.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/common/accounts/AccountUtils.java similarity index 99% rename from src/com/owncloud/android/lib/common/accounts/AccountUtils.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/common/accounts/AccountUtils.java index 72126285..27d89dd0 100644 --- a/src/com/owncloud/android/lib/common/accounts/AccountUtils.java +++ b/owncloud-android-library/src/main/java/com/owncloud/android/lib/common/accounts/AccountUtils.java @@ -302,7 +302,7 @@ public class AccountUtils { public static class Constants { /** * Version should be 3 numbers separated by dot so it can be parsed by - * {@link com.owncloud.android.lib.resources.status.OwnCloudVersion} + * {@link OwnCloudVersion} */ public static final String KEY_OC_VERSION = "oc_version"; /** diff --git a/src/com/owncloud/android/lib/common/authentication/OwnCloudBasicCredentials.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/common/authentication/OwnCloudBasicCredentials.java similarity index 100% rename from src/com/owncloud/android/lib/common/authentication/OwnCloudBasicCredentials.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/common/authentication/OwnCloudBasicCredentials.java diff --git a/src/com/owncloud/android/lib/common/authentication/OwnCloudBearerCredentials.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/common/authentication/OwnCloudBearerCredentials.java similarity index 100% rename from src/com/owncloud/android/lib/common/authentication/OwnCloudBearerCredentials.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/common/authentication/OwnCloudBearerCredentials.java diff --git a/src/com/owncloud/android/lib/common/authentication/OwnCloudCredentials.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/common/authentication/OwnCloudCredentials.java similarity index 100% rename from src/com/owncloud/android/lib/common/authentication/OwnCloudCredentials.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/common/authentication/OwnCloudCredentials.java diff --git a/src/com/owncloud/android/lib/common/authentication/OwnCloudCredentialsFactory.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/common/authentication/OwnCloudCredentialsFactory.java similarity index 100% rename from src/com/owncloud/android/lib/common/authentication/OwnCloudCredentialsFactory.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/common/authentication/OwnCloudCredentialsFactory.java diff --git a/src/com/owncloud/android/lib/common/authentication/OwnCloudSamlSsoCredentials.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/common/authentication/OwnCloudSamlSsoCredentials.java similarity index 100% rename from src/com/owncloud/android/lib/common/authentication/OwnCloudSamlSsoCredentials.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/common/authentication/OwnCloudSamlSsoCredentials.java diff --git a/src/com/owncloud/android/lib/common/authentication/oauth/BearerCredentials.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/common/authentication/oauth/BearerCredentials.java similarity index 100% rename from src/com/owncloud/android/lib/common/authentication/oauth/BearerCredentials.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/common/authentication/oauth/BearerCredentials.java diff --git a/src/com/owncloud/android/lib/common/authentication/oauth/OAuth2ClientConfiguration.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/common/authentication/oauth/OAuth2ClientConfiguration.java similarity index 100% rename from src/com/owncloud/android/lib/common/authentication/oauth/OAuth2ClientConfiguration.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/common/authentication/oauth/OAuth2ClientConfiguration.java diff --git a/src/com/owncloud/android/lib/common/authentication/oauth/OAuth2Constants.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/common/authentication/oauth/OAuth2Constants.java similarity index 100% rename from src/com/owncloud/android/lib/common/authentication/oauth/OAuth2Constants.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/common/authentication/oauth/OAuth2Constants.java diff --git a/src/com/owncloud/android/lib/common/authentication/oauth/OAuth2GetAccessTokenOperation.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/common/authentication/oauth/OAuth2GetAccessTokenOperation.java similarity index 100% rename from src/com/owncloud/android/lib/common/authentication/oauth/OAuth2GetAccessTokenOperation.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/common/authentication/oauth/OAuth2GetAccessTokenOperation.java diff --git a/src/com/owncloud/android/lib/common/authentication/oauth/OAuth2GrantType.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/common/authentication/oauth/OAuth2GrantType.java similarity index 100% rename from src/com/owncloud/android/lib/common/authentication/oauth/OAuth2GrantType.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/common/authentication/oauth/OAuth2GrantType.java diff --git a/src/com/owncloud/android/lib/common/authentication/oauth/OAuth2Provider.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/common/authentication/oauth/OAuth2Provider.java similarity index 100% rename from src/com/owncloud/android/lib/common/authentication/oauth/OAuth2Provider.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/common/authentication/oauth/OAuth2Provider.java diff --git a/src/com/owncloud/android/lib/common/authentication/oauth/OAuth2ProvidersRegistry.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/common/authentication/oauth/OAuth2ProvidersRegistry.java similarity index 100% rename from src/com/owncloud/android/lib/common/authentication/oauth/OAuth2ProvidersRegistry.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/common/authentication/oauth/OAuth2ProvidersRegistry.java diff --git a/src/com/owncloud/android/lib/common/authentication/oauth/OAuth2QueryParser.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/common/authentication/oauth/OAuth2QueryParser.java similarity index 100% rename from src/com/owncloud/android/lib/common/authentication/oauth/OAuth2QueryParser.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/common/authentication/oauth/OAuth2QueryParser.java diff --git a/src/com/owncloud/android/lib/common/authentication/oauth/OAuth2RefreshAccessTokenOperation.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/common/authentication/oauth/OAuth2RefreshAccessTokenOperation.java similarity index 100% rename from src/com/owncloud/android/lib/common/authentication/oauth/OAuth2RefreshAccessTokenOperation.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/common/authentication/oauth/OAuth2RefreshAccessTokenOperation.java diff --git a/src/com/owncloud/android/lib/common/authentication/oauth/OAuth2RequestBuilder.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/common/authentication/oauth/OAuth2RequestBuilder.java similarity index 100% rename from src/com/owncloud/android/lib/common/authentication/oauth/OAuth2RequestBuilder.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/common/authentication/oauth/OAuth2RequestBuilder.java diff --git a/src/com/owncloud/android/lib/common/authentication/oauth/OAuth2ResponseParser.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/common/authentication/oauth/OAuth2ResponseParser.java similarity index 100% rename from src/com/owncloud/android/lib/common/authentication/oauth/OAuth2ResponseParser.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/common/authentication/oauth/OAuth2ResponseParser.java diff --git a/src/com/owncloud/android/lib/common/authentication/oauth/OwnCloudOAuth2Provider.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/common/authentication/oauth/OwnCloudOAuth2Provider.java similarity index 100% rename from src/com/owncloud/android/lib/common/authentication/oauth/OwnCloudOAuth2Provider.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/common/authentication/oauth/OwnCloudOAuth2Provider.java diff --git a/src/com/owncloud/android/lib/common/authentication/oauth/OwnCloudOAuth2RequestBuilder.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/common/authentication/oauth/OwnCloudOAuth2RequestBuilder.java similarity index 100% rename from src/com/owncloud/android/lib/common/authentication/oauth/OwnCloudOAuth2RequestBuilder.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/common/authentication/oauth/OwnCloudOAuth2RequestBuilder.java diff --git a/src/com/owncloud/android/lib/common/http/HttpClient.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/common/http/HttpClient.java similarity index 100% rename from src/com/owncloud/android/lib/common/http/HttpClient.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/common/http/HttpClient.java diff --git a/src/com/owncloud/android/lib/common/http/HttpConstants.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/common/http/HttpConstants.java similarity index 100% rename from src/com/owncloud/android/lib/common/http/HttpConstants.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/common/http/HttpConstants.java diff --git a/src/com/owncloud/android/lib/common/http/interceptors/HttpInterceptor.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/common/http/interceptors/HttpInterceptor.java similarity index 100% rename from src/com/owncloud/android/lib/common/http/interceptors/HttpInterceptor.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/common/http/interceptors/HttpInterceptor.java diff --git a/src/com/owncloud/android/lib/common/http/interceptors/RequestHeaderInterceptor.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/common/http/interceptors/RequestHeaderInterceptor.java similarity index 100% rename from src/com/owncloud/android/lib/common/http/interceptors/RequestHeaderInterceptor.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/common/http/interceptors/RequestHeaderInterceptor.java diff --git a/src/com/owncloud/android/lib/common/http/methods/HttpBaseMethod.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/common/http/methods/HttpBaseMethod.java similarity index 100% rename from src/com/owncloud/android/lib/common/http/methods/HttpBaseMethod.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/common/http/methods/HttpBaseMethod.java diff --git a/src/com/owncloud/android/lib/common/http/methods/nonwebdav/DeleteMethod.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/common/http/methods/nonwebdav/DeleteMethod.java similarity index 100% rename from src/com/owncloud/android/lib/common/http/methods/nonwebdav/DeleteMethod.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/common/http/methods/nonwebdav/DeleteMethod.java diff --git a/src/com/owncloud/android/lib/common/http/methods/nonwebdav/GetMethod.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/common/http/methods/nonwebdav/GetMethod.java similarity index 100% rename from src/com/owncloud/android/lib/common/http/methods/nonwebdav/GetMethod.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/common/http/methods/nonwebdav/GetMethod.java diff --git a/src/com/owncloud/android/lib/common/http/methods/nonwebdav/HttpMethod.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/common/http/methods/nonwebdav/HttpMethod.java similarity index 100% rename from src/com/owncloud/android/lib/common/http/methods/nonwebdav/HttpMethod.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/common/http/methods/nonwebdav/HttpMethod.java diff --git a/src/com/owncloud/android/lib/common/http/methods/nonwebdav/PostMethod.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/common/http/methods/nonwebdav/PostMethod.java similarity index 100% rename from src/com/owncloud/android/lib/common/http/methods/nonwebdav/PostMethod.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/common/http/methods/nonwebdav/PostMethod.java diff --git a/src/com/owncloud/android/lib/common/http/methods/nonwebdav/PutMethod.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/common/http/methods/nonwebdav/PutMethod.java similarity index 100% rename from src/com/owncloud/android/lib/common/http/methods/nonwebdav/PutMethod.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/common/http/methods/nonwebdav/PutMethod.java diff --git a/src/com/owncloud/android/lib/common/http/methods/webdav/CopyMethod.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/common/http/methods/webdav/CopyMethod.java similarity index 100% rename from src/com/owncloud/android/lib/common/http/methods/webdav/CopyMethod.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/common/http/methods/webdav/CopyMethod.java diff --git a/src/com/owncloud/android/lib/common/http/methods/webdav/DavConstants.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/common/http/methods/webdav/DavConstants.java similarity index 100% rename from src/com/owncloud/android/lib/common/http/methods/webdav/DavConstants.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/common/http/methods/webdav/DavConstants.java diff --git a/src/com/owncloud/android/lib/common/http/methods/webdav/DavMethod.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/common/http/methods/webdav/DavMethod.java similarity index 100% rename from src/com/owncloud/android/lib/common/http/methods/webdav/DavMethod.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/common/http/methods/webdav/DavMethod.java diff --git a/src/com/owncloud/android/lib/common/http/methods/webdav/DavUtils.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/common/http/methods/webdav/DavUtils.java similarity index 100% rename from src/com/owncloud/android/lib/common/http/methods/webdav/DavUtils.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/common/http/methods/webdav/DavUtils.java diff --git a/src/com/owncloud/android/lib/common/http/methods/webdav/MkColMethod.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/common/http/methods/webdav/MkColMethod.java similarity index 100% rename from src/com/owncloud/android/lib/common/http/methods/webdav/MkColMethod.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/common/http/methods/webdav/MkColMethod.java diff --git a/src/com/owncloud/android/lib/common/http/methods/webdav/MoveMethod.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/common/http/methods/webdav/MoveMethod.java similarity index 100% rename from src/com/owncloud/android/lib/common/http/methods/webdav/MoveMethod.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/common/http/methods/webdav/MoveMethod.java diff --git a/src/com/owncloud/android/lib/common/http/methods/webdav/PropfindMethod.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/common/http/methods/webdav/PropfindMethod.java similarity index 100% rename from src/com/owncloud/android/lib/common/http/methods/webdav/PropfindMethod.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/common/http/methods/webdav/PropfindMethod.java diff --git a/src/com/owncloud/android/lib/common/http/methods/webdav/PutMethod.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/common/http/methods/webdav/PutMethod.java similarity index 100% rename from src/com/owncloud/android/lib/common/http/methods/webdav/PutMethod.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/common/http/methods/webdav/PutMethod.java diff --git a/src/com/owncloud/android/lib/common/network/AdvancedX509TrustManager.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/common/network/AdvancedX509TrustManager.java similarity index 100% rename from src/com/owncloud/android/lib/common/network/AdvancedX509TrustManager.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/common/network/AdvancedX509TrustManager.java diff --git a/src/com/owncloud/android/lib/common/network/CertificateCombinedException.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/common/network/CertificateCombinedException.java similarity index 100% rename from src/com/owncloud/android/lib/common/network/CertificateCombinedException.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/common/network/CertificateCombinedException.java diff --git a/src/com/owncloud/android/lib/common/network/ChunkFromFileRequestBody.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/common/network/ChunkFromFileRequestBody.java similarity index 100% rename from src/com/owncloud/android/lib/common/network/ChunkFromFileRequestBody.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/common/network/ChunkFromFileRequestBody.java diff --git a/src/com/owncloud/android/lib/common/network/FileRequestBody.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/common/network/FileRequestBody.java similarity index 100% rename from src/com/owncloud/android/lib/common/network/FileRequestBody.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/common/network/FileRequestBody.java diff --git a/src/com/owncloud/android/lib/common/network/NetworkUtils.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/common/network/NetworkUtils.java similarity index 100% rename from src/com/owncloud/android/lib/common/network/NetworkUtils.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/common/network/NetworkUtils.java diff --git a/src/com/owncloud/android/lib/common/network/OnDatatransferProgressListener.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/common/network/OnDatatransferProgressListener.java similarity index 100% rename from src/com/owncloud/android/lib/common/network/OnDatatransferProgressListener.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/common/network/OnDatatransferProgressListener.java diff --git a/src/com/owncloud/android/lib/common/network/ProgressiveDataTransferer.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/common/network/ProgressiveDataTransferer.java similarity index 100% rename from src/com/owncloud/android/lib/common/network/ProgressiveDataTransferer.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/common/network/ProgressiveDataTransferer.java diff --git a/src/com/owncloud/android/lib/common/network/RedirectionPath.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/common/network/RedirectionPath.java similarity index 100% rename from src/com/owncloud/android/lib/common/network/RedirectionPath.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/common/network/RedirectionPath.java diff --git a/src/com/owncloud/android/lib/common/network/ServerNameIndicator.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/common/network/ServerNameIndicator.java similarity index 100% rename from src/com/owncloud/android/lib/common/network/ServerNameIndicator.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/common/network/ServerNameIndicator.java diff --git a/src/com/owncloud/android/lib/common/network/WebdavUtils.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/common/network/WebdavUtils.java similarity index 100% rename from src/com/owncloud/android/lib/common/network/WebdavUtils.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/common/network/WebdavUtils.java diff --git a/src/com/owncloud/android/lib/common/network/WriteTimeoutEnforcer.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/common/network/WriteTimeoutEnforcer.java similarity index 100% rename from src/com/owncloud/android/lib/common/network/WriteTimeoutEnforcer.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/common/network/WriteTimeoutEnforcer.java diff --git a/src/com/owncloud/android/lib/common/operations/ErrorMessageParser.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/common/operations/ErrorMessageParser.java similarity index 100% rename from src/com/owncloud/android/lib/common/operations/ErrorMessageParser.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/common/operations/ErrorMessageParser.java diff --git a/src/com/owncloud/android/lib/common/operations/InvalidCharacterExceptionParser.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/common/operations/InvalidCharacterExceptionParser.java similarity index 100% rename from src/com/owncloud/android/lib/common/operations/InvalidCharacterExceptionParser.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/common/operations/InvalidCharacterExceptionParser.java diff --git a/src/com/owncloud/android/lib/common/operations/OnRemoteOperationListener.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/common/operations/OnRemoteOperationListener.java similarity index 100% rename from src/com/owncloud/android/lib/common/operations/OnRemoteOperationListener.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/common/operations/OnRemoteOperationListener.java diff --git a/src/com/owncloud/android/lib/common/operations/OperationCancelledException.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/common/operations/OperationCancelledException.java similarity index 100% rename from src/com/owncloud/android/lib/common/operations/OperationCancelledException.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/common/operations/OperationCancelledException.java diff --git a/src/com/owncloud/android/lib/common/operations/RemoteOperation.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/common/operations/RemoteOperation.java similarity index 100% rename from src/com/owncloud/android/lib/common/operations/RemoteOperation.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/common/operations/RemoteOperation.java diff --git a/src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/common/operations/RemoteOperationResult.java similarity index 100% rename from src/com/owncloud/android/lib/common/operations/RemoteOperationResult.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/common/operations/RemoteOperationResult.java diff --git a/src/com/owncloud/android/lib/common/utils/Log_OC.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/common/utils/Log_OC.java similarity index 100% rename from src/com/owncloud/android/lib/common/utils/Log_OC.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/common/utils/Log_OC.java diff --git a/src/com/owncloud/android/lib/common/utils/RandomUtils.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/common/utils/RandomUtils.java similarity index 100% rename from src/com/owncloud/android/lib/common/utils/RandomUtils.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/common/utils/RandomUtils.java diff --git a/src/com/owncloud/android/lib/resources/files/CopyRemoteFileOperation.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/resources/files/CopyRemoteFileOperation.java similarity index 100% rename from src/com/owncloud/android/lib/resources/files/CopyRemoteFileOperation.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/resources/files/CopyRemoteFileOperation.java diff --git a/src/com/owncloud/android/lib/resources/files/CreateRemoteFolderOperation.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/resources/files/CreateRemoteFolderOperation.java similarity index 100% rename from src/com/owncloud/android/lib/resources/files/CreateRemoteFolderOperation.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/resources/files/CreateRemoteFolderOperation.java diff --git a/src/com/owncloud/android/lib/resources/files/DownloadRemoteFileOperation.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/resources/files/DownloadRemoteFileOperation.java similarity index 100% rename from src/com/owncloud/android/lib/resources/files/DownloadRemoteFileOperation.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/resources/files/DownloadRemoteFileOperation.java diff --git a/src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java similarity index 100% rename from src/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/resources/files/ExistenceCheckRemoteOperation.java diff --git a/src/com/owncloud/android/lib/resources/files/FileUtils.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/resources/files/FileUtils.java similarity index 100% rename from src/com/owncloud/android/lib/resources/files/FileUtils.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/resources/files/FileUtils.java diff --git a/src/com/owncloud/android/lib/resources/files/MoveRemoteFileOperation.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/resources/files/MoveRemoteFileOperation.java similarity index 100% rename from src/com/owncloud/android/lib/resources/files/MoveRemoteFileOperation.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/resources/files/MoveRemoteFileOperation.java diff --git a/src/com/owncloud/android/lib/resources/files/ReadRemoteFileOperation.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/resources/files/ReadRemoteFileOperation.java similarity index 100% rename from src/com/owncloud/android/lib/resources/files/ReadRemoteFileOperation.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/resources/files/ReadRemoteFileOperation.java diff --git a/src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java similarity index 100% rename from src/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/resources/files/ReadRemoteFolderOperation.java diff --git a/src/com/owncloud/android/lib/resources/files/RemoteFile.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/resources/files/RemoteFile.java similarity index 100% rename from src/com/owncloud/android/lib/resources/files/RemoteFile.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/resources/files/RemoteFile.java diff --git a/src/com/owncloud/android/lib/resources/files/RemoveRemoteFileOperation.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/resources/files/RemoveRemoteFileOperation.java similarity index 100% rename from src/com/owncloud/android/lib/resources/files/RemoveRemoteFileOperation.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/resources/files/RemoveRemoteFileOperation.java diff --git a/src/com/owncloud/android/lib/resources/files/RenameRemoteFileOperation.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/resources/files/RenameRemoteFileOperation.java similarity index 100% rename from src/com/owncloud/android/lib/resources/files/RenameRemoteFileOperation.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/resources/files/RenameRemoteFileOperation.java diff --git a/src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java similarity index 100% rename from src/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/resources/files/UploadRemoteFileOperation.java diff --git a/src/com/owncloud/android/lib/resources/files/chunks/ChunkedUploadRemoteFileOperation.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/resources/files/chunks/ChunkedUploadRemoteFileOperation.java similarity index 100% rename from src/com/owncloud/android/lib/resources/files/chunks/ChunkedUploadRemoteFileOperation.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/resources/files/chunks/ChunkedUploadRemoteFileOperation.java diff --git a/src/com/owncloud/android/lib/resources/files/chunks/CreateRemoteChunkFolderOperation.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/resources/files/chunks/CreateRemoteChunkFolderOperation.java similarity index 100% rename from src/com/owncloud/android/lib/resources/files/chunks/CreateRemoteChunkFolderOperation.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/resources/files/chunks/CreateRemoteChunkFolderOperation.java diff --git a/src/com/owncloud/android/lib/resources/files/chunks/MoveRemoteChunksFileOperation.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/resources/files/chunks/MoveRemoteChunksFileOperation.java similarity index 100% rename from src/com/owncloud/android/lib/resources/files/chunks/MoveRemoteChunksFileOperation.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/resources/files/chunks/MoveRemoteChunksFileOperation.java diff --git a/src/com/owncloud/android/lib/resources/files/chunks/RemoveRemoteChunksFolderOperation.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/resources/files/chunks/RemoveRemoteChunksFolderOperation.java similarity index 100% rename from src/com/owncloud/android/lib/resources/files/chunks/RemoveRemoteChunksFolderOperation.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/resources/files/chunks/RemoveRemoteChunksFolderOperation.java diff --git a/src/com/owncloud/android/lib/resources/shares/CreateRemoteShareOperation.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/resources/shares/CreateRemoteShareOperation.java similarity index 100% rename from src/com/owncloud/android/lib/resources/shares/CreateRemoteShareOperation.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/resources/shares/CreateRemoteShareOperation.java diff --git a/src/com/owncloud/android/lib/resources/shares/GetRemoteShareOperation.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/resources/shares/GetRemoteShareOperation.java similarity index 100% rename from src/com/owncloud/android/lib/resources/shares/GetRemoteShareOperation.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/resources/shares/GetRemoteShareOperation.java diff --git a/src/com/owncloud/android/lib/resources/shares/GetRemoteShareesOperation.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/resources/shares/GetRemoteShareesOperation.java similarity index 100% rename from src/com/owncloud/android/lib/resources/shares/GetRemoteShareesOperation.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/resources/shares/GetRemoteShareesOperation.java diff --git a/src/com/owncloud/android/lib/resources/shares/GetRemoteSharesForFileOperation.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/resources/shares/GetRemoteSharesForFileOperation.java similarity index 100% rename from src/com/owncloud/android/lib/resources/shares/GetRemoteSharesForFileOperation.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/resources/shares/GetRemoteSharesForFileOperation.java diff --git a/src/com/owncloud/android/lib/resources/shares/GetRemoteSharesOperation.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/resources/shares/GetRemoteSharesOperation.java similarity index 100% rename from src/com/owncloud/android/lib/resources/shares/GetRemoteSharesOperation.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/resources/shares/GetRemoteSharesOperation.java diff --git a/src/com/owncloud/android/lib/resources/shares/OCShare.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/resources/shares/OCShare.java similarity index 100% rename from src/com/owncloud/android/lib/resources/shares/OCShare.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/resources/shares/OCShare.java diff --git a/src/com/owncloud/android/lib/resources/shares/RemoveRemoteShareOperation.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/resources/shares/RemoveRemoteShareOperation.java similarity index 100% rename from src/com/owncloud/android/lib/resources/shares/RemoveRemoteShareOperation.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/resources/shares/RemoveRemoteShareOperation.java diff --git a/src/com/owncloud/android/lib/resources/shares/ShareParserResult.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/resources/shares/ShareParserResult.java similarity index 100% rename from src/com/owncloud/android/lib/resources/shares/ShareParserResult.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/resources/shares/ShareParserResult.java diff --git a/src/com/owncloud/android/lib/resources/shares/SharePermissionsBuilder.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/resources/shares/SharePermissionsBuilder.java similarity index 100% rename from src/com/owncloud/android/lib/resources/shares/SharePermissionsBuilder.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/resources/shares/SharePermissionsBuilder.java diff --git a/src/com/owncloud/android/lib/resources/shares/ShareToRemoteOperationResultParser.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/resources/shares/ShareToRemoteOperationResultParser.java similarity index 100% rename from src/com/owncloud/android/lib/resources/shares/ShareToRemoteOperationResultParser.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/resources/shares/ShareToRemoteOperationResultParser.java diff --git a/src/com/owncloud/android/lib/resources/shares/ShareType.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/resources/shares/ShareType.java similarity index 100% rename from src/com/owncloud/android/lib/resources/shares/ShareType.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/resources/shares/ShareType.java diff --git a/src/com/owncloud/android/lib/resources/shares/ShareUtils.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/resources/shares/ShareUtils.java similarity index 100% rename from src/com/owncloud/android/lib/resources/shares/ShareUtils.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/resources/shares/ShareUtils.java diff --git a/src/com/owncloud/android/lib/resources/shares/ShareXMLParser.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/resources/shares/ShareXMLParser.java similarity index 100% rename from src/com/owncloud/android/lib/resources/shares/ShareXMLParser.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/resources/shares/ShareXMLParser.java diff --git a/src/com/owncloud/android/lib/resources/shares/UpdateRemoteShareOperation.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/resources/shares/UpdateRemoteShareOperation.java similarity index 100% rename from src/com/owncloud/android/lib/resources/shares/UpdateRemoteShareOperation.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/resources/shares/UpdateRemoteShareOperation.java diff --git a/src/com/owncloud/android/lib/resources/status/CapabilityBooleanType.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/resources/status/CapabilityBooleanType.java similarity index 100% rename from src/com/owncloud/android/lib/resources/status/CapabilityBooleanType.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/resources/status/CapabilityBooleanType.java diff --git a/src/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.java similarity index 100% rename from src/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/resources/status/GetRemoteCapabilitiesOperation.java diff --git a/src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java similarity index 100% rename from src/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.java diff --git a/src/com/owncloud/android/lib/resources/status/OCCapability.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/resources/status/OCCapability.java similarity index 100% rename from src/com/owncloud/android/lib/resources/status/OCCapability.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/resources/status/OCCapability.java diff --git a/src/com/owncloud/android/lib/resources/status/OwnCloudVersion.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/resources/status/OwnCloudVersion.java similarity index 100% rename from src/com/owncloud/android/lib/resources/status/OwnCloudVersion.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/resources/status/OwnCloudVersion.java diff --git a/src/com/owncloud/android/lib/resources/users/GetRemoteUserAvatarOperation.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/resources/users/GetRemoteUserAvatarOperation.java similarity index 100% rename from src/com/owncloud/android/lib/resources/users/GetRemoteUserAvatarOperation.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/resources/users/GetRemoteUserAvatarOperation.java diff --git a/src/com/owncloud/android/lib/resources/users/GetRemoteUserInfoOperation.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/resources/users/GetRemoteUserInfoOperation.java similarity index 100% rename from src/com/owncloud/android/lib/resources/users/GetRemoteUserInfoOperation.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/resources/users/GetRemoteUserInfoOperation.java diff --git a/src/com/owncloud/android/lib/resources/users/GetRemoteUserQuotaOperation.java b/owncloud-android-library/src/main/java/com/owncloud/android/lib/resources/users/GetRemoteUserQuotaOperation.java similarity index 100% rename from src/com/owncloud/android/lib/resources/users/GetRemoteUserQuotaOperation.java rename to owncloud-android-library/src/main/java/com/owncloud/android/lib/resources/users/GetRemoteUserQuotaOperation.java diff --git a/project.properties b/project.properties deleted file mode 100644 index 34c8d58b..00000000 --- a/project.properties +++ /dev/null @@ -1,15 +0,0 @@ -# This file is automatically generated by Android Tools. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must be checked in Version Control Systems. -# -# To customize properties used by the Ant build system edit -# "ant.properties", and override values to adapt the script to your -# project structure. -# -# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home): -#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt - -# Project target. -target=android-24 -android.library=true diff --git a/sample_client/.classpath b/sample_client/.classpath deleted file mode 100644 index 51769745..00000000 --- a/sample_client/.classpath +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/sample_client/.project b/sample_client/.project deleted file mode 100644 index d1b87431..00000000 --- a/sample_client/.project +++ /dev/null @@ -1,33 +0,0 @@ - - - ownCloud Sample Client - - - - - - com.android.ide.eclipse.adt.ResourceManagerBuilder - - - - - com.android.ide.eclipse.adt.PreCompilerBuilder - - - - - org.eclipse.jdt.core.javabuilder - - - - - com.android.ide.eclipse.adt.ApkBuilder - - - - - - com.android.ide.eclipse.adt.AndroidNature - org.eclipse.jdt.core.javanature - - diff --git a/sample_client/.settings/org.eclipse.jdt.core.prefs b/sample_client/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index b080d2dd..00000000 --- a/sample_client/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/sample_client/ant.properties b/sample_client/ant.properties deleted file mode 100644 index b0971e89..00000000 --- a/sample_client/ant.properties +++ /dev/null @@ -1,17 +0,0 @@ -# This file is used to override default values used by the Ant build system. -# -# This file must be checked into Version Control Systems, as it is -# integral to the build system of your project. - -# This file is only used by the Ant script. - -# You can use this to override default values such as -# 'source.dir' for the location of your java source folder and -# 'out.dir' for the location of your output folder. - -# You can also use it define how the release builds are signed by declaring -# the following properties: -# 'key.store' for the location of your keystore and -# 'key.alias' for the name of the key to use. -# The password will be asked during the build when you use the 'release' target. - diff --git a/sample_client/build.gradle b/sample_client/build.gradle index c1b01e3f..2ddad69b 100644 --- a/sample_client/build.gradle +++ b/sample_client/build.gradle @@ -1,11 +1,7 @@ apply plugin: 'com.android.application' -repositories { - jcenter() -} - dependencies { - implementation project(':') + implementation project(':owncloud-android-library') } android { @@ -16,30 +12,6 @@ android { targetSdkVersion 26 } - 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... - androidTest.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') - } - lintOptions { abortOnError false } @@ -47,6 +19,7 @@ android { packagingOptions { exclude 'META-INF/LICENSE.txt' } + compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 diff --git a/sample_client/build.xml b/sample_client/build.xml deleted file mode 100644 index 751356dd..00000000 --- a/sample_client/build.xml +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sample_client/gradle/wrapper/gradle-wrapper.jar b/sample_client/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 13372aef..00000000 Binary files a/sample_client/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/sample_client/gradle/wrapper/gradle-wrapper.properties b/sample_client/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index fc5d4423..00000000 --- a/sample_client/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,6 +0,0 @@ -#Mon Dec 28 10:00:20 PST 2015 -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip \ No newline at end of file diff --git a/sample_client/gradlew b/sample_client/gradlew deleted file mode 100755 index 91a7e269..00000000 --- a/sample_client/gradlew +++ /dev/null @@ -1,164 +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 - -# 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/sample_client/gradlew.bat b/sample_client/gradlew.bat deleted file mode 100644 index aec99730..00000000 --- a/sample_client/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/sample_client/project.properties b/sample_client/project.properties deleted file mode 100644 index 07afc2f8..00000000 --- a/sample_client/project.properties +++ /dev/null @@ -1,15 +0,0 @@ -# This file is automatically generated by Android Tools. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must be checked in Version Control Systems. -# -# To customize properties used by the Ant build system edit -# "ant.properties", and override values to adapt the script to your -# project structure. -# -# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home): -#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt - -# Project target. -target=android-24 -android.library.reference.1=.. diff --git a/sample_client/assets/oc_sample.png b/sample_client/src/assets/oc_sample.png similarity index 100% rename from sample_client/assets/oc_sample.png rename to sample_client/src/assets/oc_sample.png diff --git a/sample_client/assets/oc_sample.txt b/sample_client/src/assets/oc_sample.txt similarity index 100% rename from sample_client/assets/oc_sample.txt rename to sample_client/src/assets/oc_sample.txt diff --git a/sample_client/AndroidManifest.xml b/sample_client/src/main/AndroidManifest.xml similarity index 100% rename from sample_client/AndroidManifest.xml rename to sample_client/src/main/AndroidManifest.xml diff --git a/sample_client/src/com/owncloud/android/lib/sampleclient/FilesArrayAdapter.java b/sample_client/src/main/java/com/owncloud/android/lib/sampleclient/FilesArrayAdapter.java similarity index 100% rename from sample_client/src/com/owncloud/android/lib/sampleclient/FilesArrayAdapter.java rename to sample_client/src/main/java/com/owncloud/android/lib/sampleclient/FilesArrayAdapter.java diff --git a/sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java b/sample_client/src/main/java/com/owncloud/android/lib/sampleclient/MainActivity.java similarity index 100% rename from sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java rename to sample_client/src/main/java/com/owncloud/android/lib/sampleclient/MainActivity.java diff --git a/sample_client/res/drawable-hdpi/ic_launcher.png b/sample_client/src/main/res/drawable-hdpi/ic_launcher.png similarity index 100% rename from sample_client/res/drawable-hdpi/ic_launcher.png rename to sample_client/src/main/res/drawable-hdpi/ic_launcher.png diff --git a/sample_client/res/drawable-ldpi/ic_launcher.png b/sample_client/src/main/res/drawable-ldpi/ic_launcher.png similarity index 100% rename from sample_client/res/drawable-ldpi/ic_launcher.png rename to sample_client/src/main/res/drawable-ldpi/ic_launcher.png diff --git a/sample_client/res/drawable-mdpi/ic_launcher.png b/sample_client/src/main/res/drawable-mdpi/ic_launcher.png similarity index 100% rename from sample_client/res/drawable-mdpi/ic_launcher.png rename to sample_client/src/main/res/drawable-mdpi/ic_launcher.png diff --git a/sample_client/res/layout/file_in_list.xml b/sample_client/src/main/res/layout/file_in_list.xml similarity index 100% rename from sample_client/res/layout/file_in_list.xml rename to sample_client/src/main/res/layout/file_in_list.xml diff --git a/sample_client/res/layout/main.xml b/sample_client/src/main/res/layout/main.xml similarity index 100% rename from sample_client/res/layout/main.xml rename to sample_client/src/main/res/layout/main.xml diff --git a/sample_client/res/values-v11/styles.xml b/sample_client/src/main/res/values-v11/styles.xml similarity index 100% rename from sample_client/res/values-v11/styles.xml rename to sample_client/src/main/res/values-v11/styles.xml diff --git a/sample_client/res/values/dimensions.xml b/sample_client/src/main/res/values/dimensions.xml similarity index 100% rename from sample_client/res/values/dimensions.xml rename to sample_client/src/main/res/values/dimensions.xml diff --git a/sample_client/res/values/setup.xml b/sample_client/src/main/res/values/setup.xml similarity index 100% rename from sample_client/res/values/setup.xml rename to sample_client/src/main/res/values/setup.xml diff --git a/sample_client/res/values/strings.xml b/sample_client/src/main/res/values/strings.xml similarity index 100% rename from sample_client/res/values/strings.xml rename to sample_client/src/main/res/values/strings.xml diff --git a/sample_client/res/values/styles.xml b/sample_client/src/main/res/values/styles.xml similarity index 100% rename from sample_client/res/values/styles.xml rename to sample_client/src/main/res/values/styles.xml diff --git a/settings.gradle b/settings.gradle index 7cf73a38..365861dc 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1,2 @@ -include ':' +include ':owncloud-android-library' include ':sample_client' \ No newline at end of file