Skip to content

Commit 3e666ed

Browse files
authored
Merge pull request #342 from WhosNickDoglio/ndoglio/sdk35
Ensure all modules compile and target SDK 35
2 parents 8a98538 + 747511b commit 3e666ed

6 files changed

Lines changed: 6 additions & 6 deletions

File tree

android/gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[versions]
22
activityCompose = "1.9.3"
33
android-minSdk = "29"
4-
android-targetSdk = "34"
4+
android-targetSdk = "35"
55
androidxLifecycle = "2.8.2"
66
androidxVersion = "1.15.0"
77
ble = "1.0.16"

android/pebble_bt_transport/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ plugins {
55

66
android {
77
namespace = "com.example.pebble_ble"
8-
compileSdk = 34
8+
compileSdk = 35
99

1010
defaultConfig {
1111
minSdk = libs.versions.android.minSdk.get().toInt()

android/pebblekit_android/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44

55
android {
66
namespace = "com.getpebble.android.kit"
7-
compileSdk = 34
7+
compileSdk = 35
88

99
defaultConfig {
1010
minSdk = 29

android/shared/src/androidMain/kotlin/io/rebble/cobble/shared/handlers/music/ActiveMediaSessionProvider.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ class ActiveMediaSessionProvider :
122122
}
123123
}
124124

125-
override fun onAudioInfoChanged(info: MediaController.PlaybackInfo?) {
125+
override fun onAudioInfoChanged(playbackInfo: MediaController.PlaybackInfo) {
126126
updateControllerIfNeeded()
127127
}
128128
}

android/shared/src/androidMain/kotlin/io/rebble/cobble/shared/handlers/music/MusicHandler.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ class MusicHandler(private val pebbleDevice: PebbleDevice): CobbleHandler, KoinC
8282
val name = packageManager
8383
.getPackageInfo(mediaController.packageName, 0)
8484
.applicationInfo
85-
.loadLabel(packageManager)
85+
?.loadLabel(packageManager)
8686
.toString()
8787

8888
if (!musicControl.tryEmit(MusicControl.UpdatePlayerInfo(name, mediaController.packageName))) {

android/speex_codec/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ plugins {
55

66
android {
77
namespace = "com.example.speex_codec"
8-
compileSdk = 34
8+
compileSdk = 35
99

1010
defaultConfig {
1111
minSdk = 29

0 commit comments

Comments
 (0)