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
Pipeline #145178 failed with stages
in 3 minutes and 8 seconds
...@@ -23,10 +23,12 @@ def getTestProp(String propName) { ...@@ -23,10 +23,12 @@ def getTestProp(String propName) {
android { android {
compileSdkVersion 26 compileSdkVersion 28
defaultConfig { defaultConfig {
applicationId "foundation.e.drive" applicationId "foundation.e.drive"
minSdkVersion 26 minSdkVersion 26
versionCode 1 versionCode 1
//versionName "1.0" //versionName "1.0"
versionName "beta-${versionMajor}-build-o-${buildTime()}" versionName "beta-${versionMajor}-build-o-${buildTime()}"
...@@ -34,6 +36,8 @@ android { ...@@ -34,6 +36,8 @@ android {
buildConfigField "String", "testAccountName", "\""+getTestProp("testAccountName")+"\"" buildConfigField "String", "testAccountName", "\""+getTestProp("testAccountName")+"\""
buildConfigField "String", "testAccountPWd", "\""+getTestProp("testAccountPwd")+"\"" buildConfigField "String", "testAccountPWd", "\""+getTestProp("testAccountPwd")+"\""
buildConfigField "String", "testServerUrl", "\""+getTestProp("testServerUrl")+"\"" buildConfigField "String", "testServerUrl", "\""+getTestProp("testServerUrl")+"\""
multiDexEnabled true
} }
buildTypes { buildTypes {
release { release {
...@@ -54,8 +58,17 @@ android { ...@@ -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 { dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs') implementation fileTree(include: ['*.jar'], dir: 'libs')
...@@ -66,7 +79,13 @@ dependencies { ...@@ -66,7 +79,13 @@ dependencies {
androidTestImplementation 'com.android.support:support-annotations:27.1.1' androidTestImplementation 'com.android.support:support-annotations:27.1.1'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1' androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
api 'com.android.support:support-annotations:27.1.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 //start to add lib for test - 1/4/21
//@TODO: add junit runner as lib for testImplementation //@TODO: add junit runner as lib for testImplementation
...@@ -81,4 +100,9 @@ dependencies { ...@@ -81,4 +100,9 @@ dependencies {
//testImplementation Libs.AndroidX.Test.archCoreTesting //TODO: replace by not android X version //testImplementation Libs.AndroidX.Test.archCoreTesting //TODO: replace by not android X version
//implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0' //implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0'
androidTestImplementation 'junit:junit:4.12' 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'
} }
...@@ -11,8 +11,11 @@ package foundation.e.drive.operations; ...@@ -11,8 +11,11 @@ package foundation.e.drive.operations;
import android.content.Context; import android.content.Context;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
import android.support.annotation.VisibleForTesting;
import android.util.Log; import android.util.Log;
import androidx.annotation.VisibleForTesting;
import com.owncloud.android.lib.common.OwnCloudClient; import com.owncloud.android.lib.common.OwnCloudClient;
import com.owncloud.android.lib.common.UserInfo; import com.owncloud.android.lib.common.UserInfo;
import com.owncloud.android.lib.common.operations.RemoteOperation; import com.owncloud.android.lib.common.operations.RemoteOperation;
......
...@@ -12,8 +12,8 @@ import android.content.ContentProvider; ...@@ -12,8 +12,8 @@ import android.content.ContentProvider;
import android.content.ContentValues; import android.content.ContentValues;
import android.database.Cursor; import android.database.Cursor;
import android.net.Uri; import android.net.Uri;
import android.support.annotation.NonNull; import androidx.annotation.NonNull;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
/** /**
......
...@@ -12,8 +12,10 @@ import android.content.ContentProvider; ...@@ -12,8 +12,10 @@ import android.content.ContentProvider;
import android.content.ContentValues; import android.content.ContentValues;
import android.database.Cursor; import android.database.Cursor;
import android.net.Uri; import android.net.Uri;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable; import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
/** /**
* *
......
...@@ -19,7 +19,8 @@ import android.os.Build; ...@@ -19,7 +19,8 @@ import android.os.Build;
import android.os.Environment; import android.os.Environment;
import android.os.Handler; import android.os.Handler;
import android.os.IBinder; import android.os.IBinder;
import android.support.annotation.Nullable; import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import android.util.Log; import android.util.Log;
import com.owncloud.android.lib.common.OwnCloudClient; import com.owncloud.android.lib.common.OwnCloudClient;
......
...@@ -19,7 +19,8 @@ import android.os.Handler; ...@@ -19,7 +19,8 @@ import android.os.Handler;
import android.os.IBinder; import android.os.IBinder;
import android.os.Parcelable; import android.os.Parcelable;
import android.provider.MediaStore; import android.provider.MediaStore;
import android.support.annotation.Nullable; import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import android.util.Log; import android.util.Log;
import com.owncloud.android.lib.common.OwnCloudClient; import com.owncloud.android.lib.common.OwnCloudClient;
import com.owncloud.android.lib.common.operations.OnRemoteOperationListener; import com.owncloud.android.lib.common.operations.OnRemoteOperationListener;
......
...@@ -20,7 +20,8 @@ import android.os.Handler; ...@@ -20,7 +20,8 @@ import android.os.Handler;
import android.os.IBinder; import android.os.IBinder;
import android.os.Message; import android.os.Message;
import android.os.Parcelable; import android.os.Parcelable;
import android.support.annotation.Nullable; import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import android.util.Log; import android.util.Log;
import com.owncloud.android.lib.common.OwnCloudClient; import com.owncloud.android.lib.common.OwnCloudClient;
......
...@@ -14,7 +14,8 @@ import android.content.Context; ...@@ -14,7 +14,8 @@ import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.os.IBinder; import android.os.IBinder;
import android.support.annotation.Nullable; import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import android.util.Log; import android.util.Log;
import java.io.File; import java.io.File;
......
...@@ -20,7 +20,8 @@ import android.net.ConnectivityManager; ...@@ -20,7 +20,8 @@ import android.net.ConnectivityManager;
import android.net.Network; import android.net.Network;
import android.net.NetworkInfo; import android.net.NetworkInfo;
import android.net.Uri; import android.net.Uri;
import android.support.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import android.util.Log; import android.util.Log;
import android.webkit.MimeTypeMap; import android.webkit.MimeTypeMap;
......
// Top-level build file where you can add configuration options common to all sub-projects/modules. // Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript { buildscript {
ext.kotlin_version = '1.6.0-RC2'
repositories { repositories {
google() google()
...@@ -8,6 +9,7 @@ buildscript { ...@@ -8,6 +9,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:4.1.3' 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 // NOTE: Do not place your application dependencies here; they belong
...@@ -19,6 +21,7 @@ allprojects { ...@@ -19,6 +21,7 @@ allprojects {
repositories { repositories {
google() google()
jcenter() jcenter()
maven { url "https://jitpack.io" }
} }
} }
......
# Project-wide Gradle settings. ## For more details on how to configure your build environment visit
# 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
# http://www.gradle.org/docs/current/userguide/build_environment.html # http://www.gradle.org/docs/current/userguide/build_environment.html
#
# Specifies the JVM arguments used for the daemon process. # Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings. # 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. # When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit # 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 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true # org.gradle.parallel=true
#Mon Nov 08 18:56:33 IST 2021
org.gradle.jvmargs=-Xmx1536m
android.useAndroidX=true
android.enableJetifier=true
Subproject commit 353568a74c0708496b36614b3ff69b9fafe9af0b
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment