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

Unverified Commit 355a496b authored by Andy Scherzinger's avatar Andy Scherzinger Committed by GitHub
Browse files

Merge pull request #219 from nextcloud/androidX 

Switch to AndroidX
parents 2659f378 4ee1138f

build.gradle

+1 −1
Original line number Original line Diff line number Diff line
@@ -23,7 +23,7 @@ dependencies { 
    implementation 'org.parceler:parceler-api:1.1.12'

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

    annotationProcessor 'org.parceler:parceler:1.1.12'

    annotationProcessor 'org.parceler:parceler:1.1.12'

    implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.5'

    implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.5'

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

    implementation 'androidx.annotation:annotation:1.0.1'

    

    

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

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

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

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

gradle.properties

0 → 100644
+2 −0
Original line number Original line Diff line number Diff line 
android.enableJetifier=true

android.useAndroidX=true

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -27,8 +27,6 @@ 




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

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





import android.support.annotation.NonNull;



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

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

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

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

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

import com.owncloud.android.lib.common.network.WebdavUtils;
@@ -45,6 +43,8 @@ import org.apache.jackrabbit.webdav.property.DavPropertyNameSet; 




import java.util.ArrayList;

import java.util.ArrayList;





import androidx.annotation.NonNull;



/**

/**

 * Remote operation performing the read of remote trashbin folder on Nextcloud server.

 * Remote operation performing the read of remote trashbin folder on Nextcloud server.

 */

 */

src/com/owncloud/android/lib/resources/shares/OCShare.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -26,13 +26,14 @@ package com.owncloud.android.lib.resources.shares; 




import android.os.Parcel;

import android.os.Parcel;

import android.os.Parcelable;

import android.os.Parcelable;

import android.support.annotation.NonNull;





import com.owncloud.android.lib.common.utils.Log_OC;

import com.owncloud.android.lib.common.utils.Log_OC;

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

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





import java.io.Serializable;

import java.io.Serializable;





import androidx.annotation.NonNull;







/**

/**

 * Contains the data of a Share from the Share API

 * Contains the data of a Share from the Share API

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

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




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

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





import android.support.annotation.NonNull;

import androidx.annotation.NonNull;





public class OwnCloudVersion implements Comparable<OwnCloudVersion> {

public class OwnCloudVersion implements Comparable<OwnCloudVersion> {

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

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