diff --git a/src/musikdroid/app/build.gradle b/src/musikdroid/app/build.gradle index 05bed3013..2141c4a37 100644 --- a/src/musikdroid/app/build.gradle +++ b/src/musikdroid/app/build.gradle @@ -16,13 +16,12 @@ apply plugin: 'kotlin-android' apply plugin: 'kotlin-kapt' android { - compileSdkVersion 27 - buildToolsVersion '27.0.3' + compileSdkVersion 28 defaultConfig { applicationId "io.casey.musikcube.remote" minSdkVersion 21 - targetSdkVersion 27 + targetSdkVersion 28 versionCode 32 versionName "0.30.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" diff --git a/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/service/playback/impl/remote/RemotePlaybackService.kt b/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/service/playback/impl/remote/RemotePlaybackService.kt index ac5bc1de7..fc5476120 100644 --- a/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/service/playback/impl/remote/RemotePlaybackService.kt +++ b/src/musikdroid/app/src/main/java/io/casey/musikcube/remote/service/playback/impl/remote/RemotePlaybackService.kt @@ -438,7 +438,7 @@ class RemotePlaybackService : IPlaybackService { } companion object { - private val NANOSECONDS_PER_SECOND = 1000000000.0 - private val SYNC_TIME_INTERVAL_MS = 5000L + private const val NANOSECONDS_PER_SECOND = 1000000000.0 + private const val SYNC_TIME_INTERVAL_MS = 5000L } } diff --git a/src/musikdroid/build.gradle b/src/musikdroid/build.gradle index d14c219fe..216517c7a 100644 --- a/src/musikdroid/build.gradle +++ b/src/musikdroid/build.gradle @@ -1,5 +1,5 @@ buildscript { - ext.kotlin_version = '1.2.41' + ext.kotlin_version = '1.2.71' repositories { google() @@ -7,7 +7,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.1.4' + classpath 'com.android.tools.build:gradle:3.2.1' 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 030613505..5ea16ea35 100644 --- a/src/musikdroid/gradle/wrapper/gradle-wrapper.properties +++ b/src/musikdroid/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip diff --git a/src/musikdroid/gradlew b/src/musikdroid/gradlew old mode 100644 new mode 100755 diff --git a/src/plugins/pulseout/PulseOut.cpp b/src/plugins/pulseout/PulseOut.cpp index c620b5fee..fda1cc6b9 100755 --- a/src/plugins/pulseout/PulseOut.cpp +++ b/src/plugins/pulseout/PulseOut.cpp @@ -373,7 +373,7 @@ int PulseOut::Play(IBuffer *buffer, IBufferProvider* provider) { double PulseOut::Latency() { Lock lock(this->stateMutex); - + if (!this->audioConnection) { return 0.0; }