update Sdk version,

Remove NextCloud lib,
Added nextCloud dependencies,
Manage annotation dependencies

app/build.gradle

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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;

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

@@ -19,7 +19,8 @@ import android.os.Handler;
 import android.os.IBinder;
 import android.os.Parcelable;
 import android.provider.MediaStore;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.util.Log;
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.operations.OnRemoteOperationListener;

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

@@ -20,7 +20,8 @@ import android.os.Handler;
 import android.os.IBinder;
 import android.os.Message;
 import android.os.Parcelable;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.util.Log;
 
 import com.owncloud.android.lib.common.OwnCloudClient;

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

@@ -14,7 +14,8 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.IBinder;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.util.Log;
 
 import java.io.File;

app/src/main/java/foundation/e/drive/utils/CommonUtils.java

@@ -20,7 +20,8 @@ import android.net.ConnectivityManager;
 import android.net.Network;
 import android.net.NetworkInfo;
 import android.net.Uri;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.util.Log;
 import android.webkit.MimeTypeMap;
 

build.gradle

 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
+    ext.kotlin_version = '1.6.0-RC2'
 
     repositories {
         google()
@@ -8,6 +9,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.1.3'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
 
         // NOTE: Do not place your application dependencies here; they belong
@@ -19,6 +21,7 @@ allprojects {
     repositories {
         google()
         jcenter()
+        maven { url "https://jitpack.io" }
     }
 }
 

gradle.properties

-# Project-wide Gradle settings.
-
-# IDE (e.g. Android Studio) users:
-# Gradle settings configured through the IDE *will override*
-# any settings specified in this file.
-
-# For more details on how to configure your build environment visit
+## For more details on how to configure your build environment visit
 # http://www.gradle.org/docs/current/userguide/build_environment.html
-
+#
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx1536m
-
+# Default value: -Xmx1024m -XX:MaxPermSize=256m
+# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+#
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
+#Mon Nov 08 18:56:33 IST 2021
+org.gradle.jvmargs=-Xmx1536m
+android.useAndroidX=true
+android.enableJetifier=true

nextcloud-android-lib @ 353568a7

-Subproject commit 353568a74c0708496b36614b3ff69b9fafe9af0b