mirror of
https://github.com/clangen/musikcube.git
synced 2025-01-28 18:32:38 +00:00
Dependency updates for Android app. Opus decoding seems more stable now.
This commit is contained in:
casey langen
parent
efd3138ef9
commit
5b91e0dd50
2
src/3rdparty/bin
vendored
2
src/3rdparty/bin
vendored
@ -1 +1 @@
|
||||
Subproject commit d0c091be64b2c124b2791c7e51916876ef0e1a76
|
||||
Subproject commit 8b6a9f577c49864fbfe3c01e6151099bd25c4c4d
|
||||
@ -12,14 +12,14 @@ apply plugin: 'kotlin-kapt'
|
||||
apply plugin: 'com.google.firebase.crashlytics'
|
||||
|
||||
android {
|
||||
compileSdkVersion 31
|
||||
compileSdkVersion 33
|
||||
|
||||
defaultConfig {
|
||||
applicationId "io.casey.musikcube.remote"
|
||||
minSdkVersion 21
|
||||
targetSdkVersion 31
|
||||
targetSdkVersion 33
|
||||
versionCode 111
|
||||
versionName "0.96.10"
|
||||
versionName "0.98.1"
|
||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||
}
|
||||
|
||||
@ -60,22 +60,22 @@ dependencies {
|
||||
exclude group: 'com.android.support', module: 'support-annotations'
|
||||
})
|
||||
|
||||
implementation 'com.google.firebase:firebase-analytics:20.1.0'
|
||||
implementation 'com.google.firebase:firebase-core:20.1.0'
|
||||
implementation 'com.google.firebase:firebase-crashlytics:18.2.9'
|
||||
implementation 'com.google.firebase:firebase-analytics:21.1.0'
|
||||
implementation 'com.google.firebase:firebase-core:21.1.0'
|
||||
implementation 'com.google.firebase:firebase-crashlytics:18.2.11'
|
||||
|
||||
implementation 'org.slf4j:slf4j-android:1.7.21'
|
||||
|
||||
implementation "androidx.room:room-runtime:2.4.2"
|
||||
kapt "androidx.room:room-compiler:2.4.2"
|
||||
|
||||
implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.4.1"
|
||||
implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.5.0"
|
||||
implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"
|
||||
implementation "androidx.lifecycle:lifecycle-common-java8:2.4.1"
|
||||
implementation "androidx.lifecycle:lifecycle-common-java8:2.5.0"
|
||||
|
||||
compileOnly 'org.glassfish:javax.annotation:10.0-b28'
|
||||
implementation 'com.google.dagger:dagger:2.38.1'
|
||||
kapt 'com.google.dagger:dagger-compiler:2.38.1'
|
||||
implementation 'com.google.dagger:dagger:2.42'
|
||||
kapt 'com.google.dagger:dagger-compiler:2.42'
|
||||
|
||||
implementation 'com.neovisionaries:nv-websocket-client:1.31'
|
||||
implementation 'com.squareup.okhttp3:okhttp:4.9.2'
|
||||
@ -85,15 +85,15 @@ dependencies {
|
||||
implementation 'io.reactivex.rxjava2:rxjava:2.2.16'
|
||||
implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
|
||||
implementation 'io.reactivex.rxjava2:rxkotlin:2.4.0'
|
||||
implementation 'com.google.android.exoplayer:exoplayer:2.17.1'
|
||||
implementation 'com.google.android.exoplayer:extension-okhttp:2.17.1'
|
||||
implementation 'com.google.android.exoplayer:exoplayer:2.18.0'
|
||||
implementation 'com.google.android.exoplayer:extension-okhttp:2.18.0'
|
||||
implementation 'com.simplecityapps:recyclerview-fastscroll:2.0.0'
|
||||
implementation 'me.zhanghai.android.materialprogressbar:library:1.6.1'
|
||||
|
||||
implementation 'androidx.appcompat:appcompat:1.4.1'
|
||||
implementation 'androidx.appcompat:appcompat:1.4.2'
|
||||
implementation 'androidx.recyclerview:recyclerview:1.2.1'
|
||||
implementation 'com.google.android.material:material:1.6.0-alpha03'
|
||||
implementation 'androidx.media:media:1.5.0'
|
||||
implementation 'com.google.android.material:material:1.7.0-alpha03'
|
||||
implementation 'androidx.media:media:1.6.0'
|
||||
|
||||
testImplementation 'junit:junit:4.13.1'
|
||||
}
|
||||
|
||||
@ -228,9 +228,6 @@ class GaplessExoPlayerWrapper : PlayerWrapper() {
|
||||
}
|
||||
|
||||
private var eventListener = object : Player.Listener {
|
||||
override fun onTracksChanged(trackGroups: TrackGroupArray, trackSelections: TrackSelectionArray) {
|
||||
}
|
||||
|
||||
override fun onLoadingChanged(isLoading: Boolean) {
|
||||
}
|
||||
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
package io.casey.musikcube.remote.ui.settings.activity
|
||||
|
||||
import android.annotation.SuppressLint
|
||||
import android.content.Context
|
||||
import android.content.Intent
|
||||
import android.os.Bundle
|
||||
@ -80,10 +81,8 @@ class RemoteSettingsActivity: BaseActivity() {
|
||||
return super.onOptionsItemSelected(item)
|
||||
}
|
||||
|
||||
override fun onPrepareOptionsMenu(menu: Menu?): Boolean {
|
||||
menu?.findItem(R.id.action_save)?.isEnabled =
|
||||
viewModel.state == ViewModelState.Ready
|
||||
|
||||
override fun onPrepareOptionsMenu(menu: Menu): Boolean {
|
||||
menu.findItem(R.id.action_save)?.isEnabled = viewModel.state == ViewModelState.Ready
|
||||
return super.onPrepareOptionsMenu(menu)
|
||||
}
|
||||
|
||||
@ -139,6 +138,7 @@ class RemoteSettingsActivity: BaseActivity() {
|
||||
viewModel.save(replayGainMode, preampGain, transport, driverName, deviceId)
|
||||
}
|
||||
|
||||
@SuppressLint("CheckResult")
|
||||
private fun initListeners() {
|
||||
/* metadata */
|
||||
reindexButton.setOnClickListener {
|
||||
|
||||
@ -32,16 +32,14 @@ class Connection : Parcelable {
|
||||
return name.isNotBlank() && hostname.isNotEmpty() && httpPort > 0 && wssPort > 0
|
||||
}
|
||||
|
||||
override fun writeToParcel(parcel: Parcel?, flags: Int) {
|
||||
if (parcel != null) {
|
||||
parcel.writeString(name)
|
||||
parcel.writeString(hostname)
|
||||
parcel.writeString(password)
|
||||
parcel.writeInt(httpPort)
|
||||
parcel.writeInt(wssPort)
|
||||
parcel.writeInt(if (ssl) 1 else 0)
|
||||
parcel.writeInt(if (noValidate) 1 else 0)
|
||||
}
|
||||
override fun writeToParcel(parcel: Parcel, flags: Int) {
|
||||
parcel.writeString(name)
|
||||
parcel.writeString(hostname)
|
||||
parcel.writeString(password)
|
||||
parcel.writeInt(httpPort)
|
||||
parcel.writeInt(wssPort)
|
||||
parcel.writeInt(if (ssl) 1 else 0)
|
||||
parcel.writeInt(if (noValidate) 1 else 0)
|
||||
}
|
||||
|
||||
override fun describeContents(): Int {
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
buildscript {
|
||||
ext.kotlin_version = '1.6.10'
|
||||
ext.kotlin_version = '1.7.10'
|
||||
|
||||
repositories {
|
||||
google()
|
||||
@ -7,10 +7,10 @@ buildscript {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
classpath 'com.android.tools.build:gradle:7.1.2'
|
||||
classpath 'com.android.tools.build:gradle:7.2.1'
|
||||
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
||||
classpath 'com.google.gms:google-services:4.3.10'
|
||||
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.8.1'
|
||||
classpath 'com.google.gms:google-services:4.3.13'
|
||||
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.1'
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -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-7.2-all.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user