From 9b2835694dbe8c2c9dee3836ec6197a45675b4e4 Mon Sep 17 00:00:00 2001 From: Karim Abou Zeid Date: Sat, 6 Feb 2016 00:41:45 +0100 Subject: [PATCH] Updated libs and gradle. --- app/build.gradle | 10 +++++----- .../gramophone/lastfm/rest/LastFMRestClient.java | 2 +- .../gramophone/ui/activities/ArtistDetailActivity.java | 10 +++------- .../activities/tageditor/AlbumTagEditorActivity.java | 5 +++-- build.gradle | 2 +- 5 files changed, 13 insertions(+), 16 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 5424c209..dd301929 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -104,10 +104,10 @@ dependencies { transitive = true } - compile('com.github.afollestad.material-dialogs:core:0.8.5.3@aar') { + compile('com.github.afollestad.material-dialogs:core:0.8.5.4@aar') { transitive = true } - compile('com.github.afollestad.material-dialogs:commons:0.8.5.3@aar') { + compile('com.github.afollestad.material-dialogs:commons:0.8.5.4@aar') { transitive = true } @@ -134,8 +134,8 @@ dependencies { compile 'asia.ivity.android:drag-sort-listview:1.0' compile 'com.github.semoncat.seekarc:library:0.1' compile 'com.github.kabouzeid:AndroidSlidingUpPanel:3.2.1' - compile 'com.squareup.retrofit2:retrofit:2.0.0-beta3' - compile 'com.squareup.retrofit2:converter-gson:2.0.0-beta3' + compile 'com.squareup.retrofit2:retrofit:2.0.0-beta4' + compile 'com.squareup.retrofit2:converter-gson:2.0.0-beta4' compile 'com.jakewharton:butterknife:7.0.1' compile 'org.solovyev.android.views:linear-layout-manager:0.5@aar' //noinspection GradleDynamicVersion @@ -143,5 +143,5 @@ dependencies { compile 'de.psdev.licensesdialog:licensesdialog:1.8.0' compile 'com.github.kabouzeid:AppIntro:3.3.0k' compile 'com.github.bumptech.glide:glide:3.6.1' - compile 'com.github.kabouzeid:RecyclerView-FastScroll:v1.2-kmod' + compile 'com.github.kabouzeid:RecyclerView-FastScroll:v1.4-kmod' } diff --git a/app/src/main/java/com/kabouzeid/gramophone/lastfm/rest/LastFMRestClient.java b/app/src/main/java/com/kabouzeid/gramophone/lastfm/rest/LastFMRestClient.java index d963e675..77cac50a 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/lastfm/rest/LastFMRestClient.java +++ b/app/src/main/java/com/kabouzeid/gramophone/lastfm/rest/LastFMRestClient.java @@ -15,8 +15,8 @@ import okhttp3.Interceptor; import okhttp3.OkHttpClient; import okhttp3.Request; import okhttp3.Response; -import retrofit2.GsonConverterFactory; import retrofit2.Retrofit; +import retrofit2.converter.gson.GsonConverterFactory; /** diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java index 2d00f27f..b0bdcf2b 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java @@ -28,7 +28,6 @@ import com.bumptech.glide.request.target.Target; import com.github.ksoichiro.android.observablescrollview.ObservableListView; import com.kabouzeid.appthemehelper.util.ColorUtil; import com.kabouzeid.appthemehelper.util.MaterialValueHelper; -import com.kabouzeid.gramophone.BuildConfig; import com.kabouzeid.gramophone.R; import com.kabouzeid.gramophone.adapter.album.HorizontalAlbumAdapter; import com.kabouzeid.gramophone.adapter.song.ArtistSongAdapter; @@ -59,6 +58,7 @@ import java.util.ArrayList; import butterknife.Bind; import butterknife.ButterKnife; +import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; @@ -219,13 +219,9 @@ public class ArtistDetailActivity extends AbsSlidingMusicPanelActivity implement } private void loadBiography() { - if (BuildConfig.DEBUG) { - biography = Html.fromHtml("Not available in debug builds, because this is causing a crash for whatever reason."); - return; - } lastFMRestClient.getApiService().getArtistInfo(artist.name, null).enqueue(new Callback() { @Override - public void onResponse(Response response) { + public void onResponse(Call call, Response response) { LastFmArtist lastFmArtist = response.body(); if (lastFmArtist.getArtist() != null) { String bio = lastFmArtist.getArtist().getBio().getContent(); @@ -238,7 +234,7 @@ public class ArtistDetailActivity extends AbsSlidingMusicPanelActivity implement } @Override - public void onFailure(Throwable t) { + public void onFailure(Call call, Throwable t) { t.printStackTrace(); biography = null; } diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/AlbumTagEditorActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/AlbumTagEditorActivity.java index 667a7763..577a00e7 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/AlbumTagEditorActivity.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/AlbumTagEditorActivity.java @@ -45,6 +45,7 @@ import java.util.Map; import butterknife.Bind; import butterknife.ButterKnife; +import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; @@ -108,7 +109,7 @@ public class AlbumTagEditorActivity extends AbsTagEditorActivity implements Text } lastFMRestClient.getApiService().getAlbumInfo(albumTitleStr, albumArtistNameStr).enqueue(new Callback() { @Override - public void onResponse(final Response response) { + public void onResponse(Call call, Response response) { LastFmAlbum lastFmAlbum = response.body(); if (lastFmAlbum.getAlbum() != null) { String url = LastFMUtil.getLargestAlbumImageUrl(lastFmAlbum.getAlbum().getImage()); @@ -143,7 +144,7 @@ public class AlbumTagEditorActivity extends AbsTagEditorActivity implements Text } @Override - public void onFailure(Throwable t) { + public void onFailure(Call call, Throwable t) { toastLoadingFailed(); } diff --git a/build.gradle b/build.gradle index d57759c4..1b370376 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.0.0-alpha9' + classpath 'com.android.tools.build:gradle:2.0.0-beta2' classpath 'com.github.triplet.gradle:play-publisher:1.1.3' } }