From 75abe1f0f52dc4a6d2e9fc487ef204be538e87d5 Mon Sep 17 00:00:00 2001 From: casey langen Date: Mon, 31 Jul 2017 20:05:43 -0700 Subject: [PATCH] Upgraded to Android Studio Canary Alpha 9, and also suppressed a strange NPE caused by Room. --- .../main/java/io/casey/musikcube/remote/offline/OfflineDb.kt | 2 +- src/musikdroid/build.gradle | 2 +- src/musikdroid/gradle/wrapper/gradle-wrapper.properties | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/offline/OfflineDb.kt b/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/offline/OfflineDb.kt index 1c9db1142..bbf83e704 100644 --- a/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/offline/OfflineDb.kt +++ b/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/offline/OfflineDb.kt @@ -59,7 +59,7 @@ abstract class OfflineDb : RoomDatabase() { } .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) - .subscribe() + .subscribe({ _ -> }, { }) } fun queryTracks(message: SocketMessage, responder: WebSocketService.Responder) { diff --git a/src/musikdroid/build.gradle b/src/musikdroid/build.gradle index f01e99cda..589d4eb7d 100644 --- a/src/musikdroid/build.gradle +++ b/src/musikdroid/build.gradle @@ -4,7 +4,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.0.0-alpha8' + classpath 'com.android.tools.build:gradle:3.0.0-alpha9' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } diff --git a/src/musikdroid/gradle/wrapper/gradle-wrapper.properties b/src/musikdroid/gradle/wrapper/gradle-wrapper.properties index 0daa1b259..aee9f1b42 100644 --- a/src/musikdroid/gradle/wrapper/gradle-wrapper.properties +++ b/src/musikdroid/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Jul 11 22:05:46 PDT 2017 +#Mon Jul 31 19:43:07 PDT 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-milestone-1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-rc-1-all.zip