mirror/musikcube
1
0
Fork 0
mirror of https://github.com/clangen/musikcube.git synced 2025-03-14 13:21:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update to Android Studio Koala, bump dependencies, fix compile errors.

Browse Source
This commit is contained in:
casey langen 2024-07-05 12:36:37 -07:00
parent 40a26d7f98
commit bb978334cc
9 changed files with 33 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/musikdroid/app/build.gradle
View File

@ -12,12 +12,14 @@ apply plugin: 'kotlin-kapt'
apply plugin: 'com.google.firebase.crashlytics'
android {
compileSdk 33
namespace 'io.casey.musikcube.remote'
compileSdk 34
defaultConfig {
applicationId "io.casey.musikcube.remote"
minSdkVersion 21
targetSdk 33
targetSdk 34
versionCode 302
versionName "3.0.2"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@ -45,7 +47,9 @@ android {
}
}
namespace 'io.casey.musikcube.remote'
buildFeatures {
buildConfig true
}
}
repositories {
@ -62,23 +66,22 @@ dependencies {
exclude group: 'com.android.support', module: 'support-annotations'
})
implementation 'com.google.firebase:firebase-analytics:21.3.0'
implementation 'com.google.firebase:firebase-analytics:22.0.2'
implementation 'com.google.firebase:firebase-core:21.1.1'
implementation 'com.google.firebase:firebase-crashlytics:18.4.0'
implementation 'com.google.firebase:firebase-crashlytics:19.0.2'
implementation 'org.slf4j:slf4j-android:1.7.21'
implementation "androidx.room:room-runtime:2.5.2"
kapt "androidx.room:room-compiler:2.5.2"
implementation "androidx.room:room-runtime:2.6.1"
kapt "androidx.room:room-compiler:2.6.1"
implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.6.1"
implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.8.3"
implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"
implementation "androidx.lifecycle:lifecycle-common-java8:2.6.1"
implementation "androidx.lifecycle:lifecycle-common-java8:2.8.3"
compileOnly 'org.glassfish:javax.annotation:10.0-b28'
implementation 'com.google.dagger:dagger:2.42'
kapt 'com.google.dagger:dagger-compiler:2.42'
implementation 'com.google.dagger:dagger:2.51.1'
kapt 'com.google.dagger:dagger-compiler:2.51.1'
implementation 'com.neovisionaries:nv-websocket-client:1.31'
implementation 'com.squareup.okhttp3:okhttp:4.11.0'
implementation 'com.github.bumptech.glide:glide:4.10.0'
@ -87,15 +90,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.19.0'
implementation 'com.google.android.exoplayer:extension-okhttp:2.19.0'
implementation 'com.google.android.exoplayer:exoplayer:2.19.1'
implementation 'com.google.android.exoplayer:extension-okhttp:2.19.1'
implementation 'com.simplecityapps:recyclerview-fastscroll:2.0.0'
implementation 'me.zhanghai.android.materialprogressbar:library:1.6.1'
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'androidx.recyclerview:recyclerview:1.3.1'
implementation 'com.google.android.material:material:1.9.0'
implementation 'androidx.media:media:1.6.0'
implementation 'androidx.appcompat:appcompat:1.7.0'
implementation 'androidx.recyclerview:recyclerview:1.3.2'
implementation 'com.google.android.material:material:1.12.0'
implementation 'androidx.media:media:1.7.0'
testImplementation 'junit:junit:4.13.1'
}

8
src/musikdroid/app/src/main/java/io/casey/musikcube/remote/Application.kt
View File

@ -22,10 +22,10 @@ class Application : android.app.Application() {
super.onCreate()
val prefs = getSharedPreferences(Prefs.NAME, Context.MODE_PRIVATE)
deviceId = prefs.getString(Prefs.Key.DEVICE_ID) ?: ""
if (deviceId.isBlank()) {
deviceId = UUID.randomUUID().toString()
prefs.edit().putString(Prefs.Key.DEVICE_ID, deviceId).apply()
Application.deviceId = prefs.getString(Prefs.Key.DEVICE_ID) ?: ""
if (Application.deviceId.isBlank()) {
Application.deviceId = UUID.randomUUID().toString()
prefs.edit().putString(Prefs.Key.DEVICE_ID, Application.deviceId).apply()
}
appComponent = DaggerAppComponent.builder()

2
src/musikdroid/app/src/main/java/io/casey/musikcube/remote/service/gapless/db/GaplessDb.kt
View File

@ -6,7 +6,7 @@ import io.reactivex.Single
import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.schedulers.Schedulers
@Database(entities = [GaplessTrack::class], version = 1)
@Database(entities = [GaplessTrack::class], exportSchema = false, version = 1)
abstract class GaplessDb: RoomDatabase() {
abstract fun dao(): GaplessDao

2
src/musikdroid/app/src/main/java/io/casey/musikcube/remote/service/playback/impl/streaming/db/OfflineDb.kt
View File

@ -16,7 +16,7 @@ import org.json.JSONArray
import org.json.JSONObject
import javax.inject.Inject
@Database(entities = [OfflineTrack::class], version = 1)
@Database(entities = [OfflineTrack::class], exportSchema = false, version = 1)
abstract class OfflineDb : RoomDatabase() {
@Inject lateinit var wss: WebSocketService
@Inject lateinit var streamProxy: StreamProxy

2
src/musikdroid/app/src/main/java/io/casey/musikcube/remote/service/websocket/model/impl/remote/IdListTrackListQueryFactory.kt
View File

@ -12,7 +12,7 @@ import kotlin.math.min
class IdListTrackListQueryFactory(private val idList: List<String>): ITrackListQueryFactory {
@Inject
protected lateinit var metadataProxy: IMetadataProxy
lateinit var metadataProxy: IMetadataProxy
init {
DaggerDataComponent.builder()

2
src/musikdroid/app/src/main/java/io/casey/musikcube/remote/ui/settings/model/ConnectionsDb.kt
View File

@ -3,7 +3,7 @@ package io.casey.musikcube.remote.ui.settings.model
import androidx.room.Database
import androidx.room.RoomDatabase
@Database(entities = [Connection::class], version = 1)
@Database(entities = [Connection::class], exportSchema = false, version = 1)
abstract class ConnectionsDb : RoomDatabase() {
abstract fun connectionsDao(): ConnectionsDao
}

6
src/musikdroid/build.gradle
View File

@ -7,10 +7,10 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:8.1.0'
classpath 'com.android.tools.build:gradle:8.5.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'com.google.gms:google-services:4.3.15'
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.7'
classpath 'com.google.gms:google-services:4.4.2'
classpath 'com.google.firebase:firebase-crashlytics-gradle:3.0.2'
}
}

1
src/musikdroid/gradle.properties
View File

@ -4,6 +4,5 @@ org.gradle.parallel=true
android.useAndroidX=true
android.enableJetifier=true
android.suppressUnsupportedCompileSdk=33
android.defaults.buildfeatures.buildconfig=true
android.nonTransitiveRClass=false
android.nonFinalResIds=false

2
src/musikdroid/gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -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-8.0-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip