Skip to content
This repository has been archived by the owner on Feb 11, 2022. It is now read-only.

Commit

Permalink
Merge pull request #113 from spacecowboy/bumpversions
Browse files Browse the repository at this point in the history
Bump versions
  • Loading branch information
spacecowboy authored Sep 30, 2016
2 parents 6d1bfec + 1cfe9ba commit 5f6e0b5
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 17 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.1.3'
classpath 'com.android.tools.build:gradle:2.2.0'
classpath 'com.novoda:bintray-release:0.3.4'
}
}
Expand Down
2 changes: 1 addition & 1 deletion examples/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@ dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile project(':library')
testCompile 'junit:junit:4.12'
compile 'com.android.support:appcompat-v7:24.2.0'
compile 'com.android.support:appcompat-v7:24.2.1'
}
12 changes: 6 additions & 6 deletions library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ def gitCommitCount =
Integer.parseInt('git rev-list --count HEAD'.execute([], project.rootDir).text.trim())

android {
compileSdkVersion 23
buildToolsVersion "23.0.2"
compileSdkVersion 24
buildToolsVersion "23.0.3"

defaultConfig {
minSdkVersion 9
targetSdkVersion 23
targetSdkVersion 24
versionCode gitCommitCount
versionName gitTag
vectorDrawables.useSupportLibrary = true
Expand All @@ -28,9 +28,9 @@ android {

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.android.support:appcompat-v7:23.4.0'
compile 'com.android.support:support-v4:23.4.0'
compile 'com.android.support:recyclerview-v7:23.4.0'
compile 'com.android.support:appcompat-v7:24.2.1'
compile 'com.android.support:support-v4:24.2.1'
compile 'com.android.support:recyclerview-v7:24.2.1'

testCompile 'junit:junit:4.12'
}
Expand Down
6 changes: 3 additions & 3 deletions sample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ def gitCommitCount =
Integer.parseInt('git rev-list --count HEAD'.execute([], project.rootDir).text.trim())

android {
compileSdkVersion 23
buildToolsVersion "23.0.2"
compileSdkVersion 24
buildToolsVersion "23.0.3"

packagingOptions {
exclude 'META-INF/LICENSE.txt'
Expand All @@ -25,7 +25,7 @@ android {

defaultConfig {
minSdkVersion 18
targetSdkVersion 23
targetSdkVersion 24
versionCode gitCommitCount
versionName gitTag
archivesBaseName = "nononsensefilepicker-sample-${gitTag}".toString()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,29 +9,24 @@
import android.annotation.SuppressLint;
import android.net.Uri;
import android.os.AsyncTask;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v4.content.AsyncTaskLoader;
import android.support.v4.content.Loader;
import android.support.v7.util.SortedList;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.Toolbar;
import android.support.v7.widget.util.SortedListAdapterCallback;
import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ProgressBar;
import android.widget.TextView;
import android.widget.Toast;

import com.dropbox.client2.DropboxAPI;
import com.dropbox.client2.android.AndroidAuthSession;
import com.dropbox.client2.exception.DropboxException;
import com.nononsenseapps.filepicker.AbstractFilePickerFragment;
import com.nononsenseapps.filepicker.FileItemAdapter;
import com.nononsenseapps.filepicker.sample.R;

import java.io.File;
Expand Down Expand Up @@ -72,7 +67,7 @@ protected View inflateRootView(LayoutInflater inflater, ViewGroup container) {
* @param nextPath path to list files for
*/
@Override
protected void refresh(DropboxAPI.Entry nextPath) {
protected void refresh(@NonNull DropboxAPI.Entry nextPath) {
super.refresh(nextPath);
if (isLoading) {
progressBar.setVisibility(View.VISIBLE);
Expand Down

0 comments on commit 5f6e0b5

Please sign in to comment.