Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 923bd94d authored by narinder Rana's avatar narinder Rana
Browse files

update Sdk version, 

Remove NextCloud lib,
Added nextCloud dependencies,
Manage annotation dependencies
parent 907e3be2

app/build.gradle

+27 −3
Original line number Diff line number Diff line
@@ -23,10 +23,12 @@ def getTestProp(String propName) { 




android {

    compileSdkVersion 26

    compileSdkVersion 28



    defaultConfig {

        applicationId "foundation.e.drive"

        minSdkVersion 26



        versionCode 1

        //versionName "1.0"

        versionName "beta-${versionMajor}-build-o-${buildTime()}"
@@ -34,6 +36,8 @@ android { 
        buildConfigField "String", "testAccountName", "\""+getTestProp("testAccountName")+"\""

        buildConfigField "String", "testAccountPWd", "\""+getTestProp("testAccountPwd")+"\""

        buildConfigField "String", "testServerUrl", "\""+getTestProp("testServerUrl")+"\""



        multiDexEnabled true

    }

    buildTypes {

        release {
@@ -54,8 +58,17 @@ android { 
        }

    }



    compileOptions {

        sourceCompatibility JavaVersion.VERSION_1_8

        targetCompatibility JavaVersion.VERSION_1_8

    }



    configurations.all {

        exclude group: "org.slf4j", module: "slf4j-log4j12"

        exclude group: "log4j", module: "log4j"

    }



}



dependencies {

    implementation fileTree(include: ['*.jar'], dir: 'libs')
@@ -66,7 +79,13 @@ dependencies { 
    androidTestImplementation 'com.android.support:support-annotations:27.1.1'

    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'

    api 'com.android.support:support-annotations:27.1.1'

    api project(':NextcloudLib')

    //api project(':NextcloudLib')

    implementation 'androidx.multidex:multidex:2.0.1'

//    implementation project('nextcloud-android-library')

    implementation ("com.github.nextcloud:android-library:master-SNAPSHOT") {

        exclude group: 'org.ogce', module: 'xpp3' // unused in Android and brings wrong Junit version

    }





    //start to add lib for test - 1/4/21

    //@TODO: add junit runner as lib for testImplementation
@@ -81,4 +100,9 @@ dependencies { 
    //testImplementation Libs.AndroidX.Test.archCoreTesting //TODO: replace by not android X version

    //implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0'

    androidTestImplementation  'junit:junit:4.12'



    implementation "commons-httpclient:commons-httpclient:3.1@jar"



    implementation 'androidx.appcompat:appcompat:1.3.1'

    implementation 'androidx.annotation:annotation:1.3.0'

}

app/src/main/java/foundation/e/drive/operations/UploadFileOperation.java

+4 −1
Original line number Diff line number Diff line
@@ -11,8 +11,11 @@ package foundation.e.drive.operations; 
import android.content.Context;

import android.os.Parcel;

import android.os.Parcelable;

import android.support.annotation.VisibleForTesting;



import android.util.Log;



import androidx.annotation.VisibleForTesting;



import com.owncloud.android.lib.common.OwnCloudClient;

import com.owncloud.android.lib.common.UserInfo;

import com.owncloud.android.lib.common.operations.RemoteOperation;

app/src/main/java/foundation/e/drive/providers/MediasSyncProvider.java

+2 −2
Original line number Diff line number Diff line
@@ -12,8 +12,8 @@ import android.content.ContentProvider; 
import android.content.ContentValues;

import android.database.Cursor;

import android.net.Uri;

import android.support.annotation.NonNull;

import android.support.annotation.Nullable;

import androidx.annotation.NonNull;

import androidx.annotation.Nullable;





/**

app/src/main/java/foundation/e/drive/providers/SettingsSyncProvider.java

+4 −2
Original line number Diff line number Diff line
@@ -12,8 +12,10 @@ import android.content.ContentProvider; 
import android.content.ContentValues;

import android.database.Cursor;

import android.net.Uri;

import android.support.annotation.NonNull;

import android.support.annotation.Nullable;



import androidx.annotation.NonNull;

import androidx.annotation.Nullable;





/**

 *

app/src/main/java/foundation/e/drive/services/InitializerService.java

+2 −1
Original line number Diff line number Diff line
@@ -19,7 +19,8 @@ import android.os.Build; 
import android.os.Environment;

import android.os.Handler;

import android.os.IBinder;

import android.support.annotation.Nullable;

import androidx.annotation.NonNull;

import androidx.annotation.Nullable;

import android.util.Log;



import com.owncloud.android.lib.common.OwnCloudClient;