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

Commit b312a39e authored by Vincent Bourgmayer's avatar Vincent Bourgmayer
Browse files

Merge branch 'stability-oreo' into 'master' 

Update to AndroidX Annotation

See merge request e/apps/nextcloud-android-lib!1
parents 353568a7 5d0cdc7f

build.gradle

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ dependencies { 
    api 'org.apache.jackrabbit:jackrabbit-webdav:2.12.6+'

    implementation 'org.parceler:parceler-api:1.1.12'

    annotationProcessor 'org.parceler:parceler:1.1.12'

    implementation "com.android.support:support-annotations:28.0.0"

    implementation 'androidx.annotation:annotation:1.3.0'



    //findbugsPlugins 'com.h3xstream.findsecbugs:findsecbugs-plugin:1.8.0'

    //findbugsPlugins 'com.mebigfatguy.fb-contrib:fb-contrib:7.4.3'

src/com/owncloud/android/lib/resources/files/ReadFileVersionsRemoteOperation.java

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 


package com.owncloud.android.lib.resources.files;



import android.support.annotation.NonNull;

import androidx.annotation.NonNull;



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

import com.owncloud.android.lib.common.network.WebdavEntry;

src/com/owncloud/android/lib/resources/files/model/SynchronizableFileInfo.java

+1 −1
Original line number Diff line number Diff line
@@ -23,10 +23,10 @@ 
 */

package com.owncloud.android.lib.resources.files.model;



import android.support.annotation.NonNull;

import android.util.Log;





import androidx.annotation.NonNull;

import com.owncloud.android.lib.resources.files.FileUtils;



import java.io.File;

src/com/owncloud/android/lib/resources/status/OwnCloudVersion.java

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 


package com.owncloud.android.lib.resources.status;



import android.support.annotation.NonNull;

import androidx.annotation.NonNull;



public class OwnCloudVersion implements Comparable<OwnCloudVersion> {

    public static final OwnCloudVersion nextcloud_10 = new OwnCloudVersion(0x0A000000); // 10.0