Skip to content

Commit

Permalink
Updated dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
mauriciotogneri committed Dec 26, 2019
1 parent c9cdff4 commit 8d39a54
Show file tree
Hide file tree
Showing 11 changed files with 38 additions and 35 deletions.
23 changes: 9 additions & 14 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ apply plugin: 'io.fabric'

android
{
compileSdkVersion 28
buildToolsVersion '28.0.3'
compileSdkVersion 29
buildToolsVersion '29.0.2'

defaultConfig
{
applicationId 'com.mauriciotogneri.fileexplorer'
minSdkVersion 14
targetSdkVersion 27
minSdkVersion 16
targetSdkVersion 28
versionCode 17
versionName '1.4.0'
}
Expand Down Expand Up @@ -64,20 +64,15 @@ android
}
}

ext
{
support = '28.0.0'
}

dependencies
{
implementation "com.android.support:support-v4:$support"
implementation "com.android.support:appcompat-v7:$support"
implementation "com.android.support:design:$support"
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'com.google.android.material:material:1.2.0-alpha03'

// firebase
implementation 'com.google.firebase:firebase-core:16.0.7'
implementation 'com.google.firebase:firebase-core:17.2.1'

// crashlytics
implementation 'com.crashlytics.sdk.android:crashlytics:2.9.9'
implementation 'com.crashlytics.sdk.android:crashlytics:2.10.1'
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package com.mauriciotogneri.fileexplorer.adapters;

import android.content.Context;
import android.support.v4.content.ContextCompat;
import android.util.TypedValue;
import android.view.View;
import android.widget.ImageView;
Expand All @@ -16,6 +15,8 @@
import java.util.ArrayList;
import java.util.List;

import androidx.core.content.ContextCompat;

public class FolderAdapter extends BaseListAdapter<FileInfo, ViewHolder>
{
private int itemsSelected = 0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,6 @@
import android.os.Bundle;
import android.os.Environment;
import android.os.StatFs;
import android.support.v4.app.ActivityCompat;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentTransaction;
import android.support.v4.content.ContextCompat;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;

import com.mauriciotogneri.fileexplorer.R;
import com.mauriciotogneri.fileexplorer.fragments.FolderFragment;
Expand All @@ -27,6 +21,13 @@
import java.util.List;
import java.util.Stack;

import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar;
import androidx.core.app.ActivityCompat;
import androidx.core.content.ContextCompat;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction;

public class MainActivity extends AppCompatActivity
{
private ToolBar toolBar;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package com.mauriciotogneri.fileexplorer.base;

import android.content.Context;
import android.support.annotation.NonNull;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
Expand All @@ -10,6 +9,8 @@
import java.util.ArrayList;
import java.util.List;

import androidx.annotation.NonNull;

public abstract class BaseListAdapter<T, V> extends ArrayAdapter<T>
{
private final int resourceId;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@
import android.net.Uri;
import android.os.AsyncTask;
import android.os.Bundle;
import android.support.annotation.StringRes;
import android.support.v4.app.Fragment;
import android.support.v4.widget.SwipeRefreshLayout;
import android.view.LayoutInflater;
import android.view.MotionEvent;
import android.view.View;
Expand All @@ -34,6 +31,10 @@
import java.util.Collections;
import java.util.List;

import androidx.annotation.StringRes;
import androidx.fragment.app.Fragment;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;

public class FolderFragment extends Fragment
{
private static final String PARAMETER_FOLDER_PATH = "folder.path";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import android.content.Context;
import android.os.Bundle;
import android.support.v4.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
Expand All @@ -14,6 +13,8 @@

import java.util.Arrays;

import androidx.fragment.app.Fragment;

public class StorageFragment extends Fragment
{
private static final String PARAMETER_STORAGES_PATH = "storages.path";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import android.graphics.BitmapFactory;
import android.net.Uri;
import android.os.Build;
import android.support.v4.content.FileProvider;

import com.mauriciotogneri.fileexplorer.BuildConfig;
import com.mauriciotogneri.fileexplorer.utils.CrashUtils;
Expand All @@ -22,6 +21,8 @@
import java.util.ArrayList;
import java.util.List;

import androidx.core.content.FileProvider;

public class FileInfo
{
private final File file;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@

import android.database.Cursor;
import android.net.Uri;
import android.support.annotation.NonNull;
import android.support.v4.content.FileProvider;

import androidx.annotation.NonNull;
import androidx.core.content.FileProvider;

public class LegacyCompatFileProvider extends FileProvider
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import android.annotation.SuppressLint;
import android.app.ProgressDialog;
import android.content.Context;
import android.support.v7.app.AlertDialog;
import android.text.Editable;
import android.text.TextWatcher;
import android.view.LayoutInflater;
Expand All @@ -19,6 +18,8 @@

import java.util.List;

import androidx.appcompat.app.AlertDialog;

public class Dialogs
{
private Dialogs()
Expand Down
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ buildscript

dependencies
{
classpath 'com.android.tools.build:gradle:3.3.1'
classpath 'com.google.gms:google-services:4.2.0'
classpath 'io.fabric.tools:gradle:1.27.1'
classpath 'com.android.tools.build:gradle:3.5.3'
classpath 'com.google.gms:google-services:4.3.3'
classpath 'io.fabric.tools:gradle:1.28.0'
}
}

Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Tue Feb 19 13:50:19 CET 2019
#Thu Dec 26 15:11:39 CET 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip

0 comments on commit 8d39a54

Please sign in to comment.