Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump target API 34 and update dependencies #83

Merged
merged 1 commit into from
Jul 12, 2024
Merged

Bump target API 34 and update dependencies #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,8 @@ android {
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}
buildFeatures {
viewBinding true
Expand Down Expand Up @@ -163,5 +163,5 @@ dependencies {
androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.5.0-alpha03'

// IAP
implementation 'com.android.billingclient:billing:6.0.1'
implementation 'com.android.billingclient:billing:6.2.1'
}
5 changes: 4 additions & 1 deletion app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
<uses-permission android:name="android.permission.ACCESS_NOTIFICATION_POLICY" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_CONNECTED_DEVICE" />

<queries>
<intent>
Expand Down Expand Up @@ -63,7 +64,9 @@
</intent-filter>
</receiver>

<service android:name=".main.core.service.BlueMusicService"/>
<service
android:name=".main.core.service.BlueMusicService"
android:foregroundServiceType="connectedDevice" />
</application>

</manifest>
3 changes: 1 addition & 2 deletions app/src/main/java/eu/darken/bluemusic/main/core/service/BlueMusicService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ import io.reactivex.rxjava3.disposables.CompositeDisposable
import io.reactivex.rxjava3.disposables.Disposable
import io.reactivex.rxjava3.schedulers.Schedulers
import timber.log.Timber
import java.util.*
import java.util.concurrent.CountDownLatch
import java.util.concurrent.Executors
import java.util.concurrent.TimeUnit
Expand Down Expand Up @@ -282,7 +281,7 @@ class BlueMusicService : Service(), VolumeObserver.Callback {
}
}
}
.subscribe { action, throwable ->
.subscribe { action: ManagedDevice.Action, throwable: Throwable? ->
Timber.d("action=%s, throwable=%s", action, throwable)
if (throwable != null && throwable !is UnmanagedDeviceException && throwable !is MissingDeviceException) {
Timber.e(throwable, "Device error")
Expand Down
8 changes: 4 additions & 4 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
buildscript {
ext.buildConfig = [
'kotlin' : '1.6.21',
'compileSdk': 33,
'kotlin' : '1.9.24',
'compileSdk': 34,
'minSdk' : 21,
'targetSdk' : 33,
'targetSdk' : 34,
'deps' : [
'dagger': '2.21',
]
Expand All @@ -14,7 +14,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:8.0.2'
classpath 'com.android.tools.build:gradle:8.4.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${buildConfig.kotlin}"

classpath "io.realm:realm-gradle-plugin:10.16.1"
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.6-all.zip
Loading