Bump target API 34 and update dependencies

d4rken-org · Jul 12, 2024 · 9df0148 · 9df0148
1 parent 247ccd8
commit 9df0148
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 11 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -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
@@ -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'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -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>
@@ -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>
diff --git a/app/src/main/java/eu/darken/bluemusic/main/core/service/BlueMusicService.kt b/app/src/main/java/eu/darken/bluemusic/main/core/service/BlueMusicService.kt
@@ -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
@@ -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")

diff --git a/build.gradle b/build.gradle
@@ -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',
             ]
@@ -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"

diff --git a/gradle/wrapper/gradle-wrapper.properties b/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-8.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip