Skip to content

Commit 73a0c26

Browse files
authored
Update compileSdk to 35 (#3846)
Signed-off-by: mueller-ma <[email protected]>
1 parent 369b211 commit 73a0c26

File tree

3 files changed

+15
-11
lines changed

3 files changed

+15
-11
lines changed

mobile/build.gradle

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
1+
import com.mikepenz.aboutlibraries.plugin.DuplicateMode
2+
13
def taskRequests = getGradle().getStartParameter().getTaskRequests().toString()
24
def isFoss = taskRequests.contains("Foss") || taskRequests.contains("foss")
35

46
buildscript {
57
ext.kotlin_coroutines_version = '1.8.1'
68
ext.ok_http_version = '4.12.0'
7-
ext.work_manager_version = '2.9.0'
9+
ext.work_manager_version = '2.10.0'
810
ext.about_libraries_version = '11.2.3'
911
ext.powermock_version = '2.0.9'
10-
ext.espresso_version = '3.5.1'
11-
ext.media3_version = '1.3.1'
12+
ext.espresso_version = '3.6.1'
13+
ext.media3_version = '1.5.1'
1214
ext.acra_version = '5.12.0'
1315

1416
repositories {
@@ -21,7 +23,7 @@ buildscript {
2123

2224
dependencies {
2325
classpath "com.google.gms:google-services:4.4.2"
24-
classpath "com.google.firebase:firebase-crashlytics-gradle:2.9.9"
26+
classpath "com.google.firebase:firebase-crashlytics-gradle:3.0.2"
2527
classpath 'com.github.bjoernq:unmockplugin:0.8.0'
2628
classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:$about_libraries_version"
2729
classpath "de.jjohannes.gradle:missing-metadata-guava:31.1.1"
@@ -46,7 +48,7 @@ android {
4648
defaultConfig {
4749
applicationId "org.openhab.habdroid"
4850
minSdkVersion 21
49-
compileSdk 34
51+
compileSdk 35
5052
targetSdkVersion 34
5153
versionCode 566
5254
versionName "3.17.3-beta"
@@ -123,7 +125,7 @@ android {
123125
}
124126

125127
aboutLibraries {
126-
duplicationMode = com.mikepenz.aboutlibraries.plugin.DuplicateMode.MERGE
128+
duplicationMode = DuplicateMode.MERGE
127129
}
128130

129131
unMock {
@@ -148,7 +150,7 @@ dependencies {
148150
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_coroutines_version"
149151
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-jdk9:$kotlin_coroutines_version"
150152
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlin_coroutines_version"
151-
implementation "androidx.core:core-ktx:1.13.1"
153+
implementation "androidx.core:core-ktx:1.15.0"
152154
implementation "androidx.activity:activity-ktx:1.9.3"
153155
implementation "androidx.fragment:fragment-ktx:1.8.5"
154156
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
@@ -176,7 +178,7 @@ dependencies {
176178
implementation "com.github.chrisbanes:PhotoView:2.3.0"
177179
implementation "com.faltenreich:skeletonlayout:5.0.0"
178180
// MapView support
179-
fullImplementation "com.google.android.gms:play-services-maps:18.2.0"
181+
fullImplementation "com.google.android.gms:play-services-maps:19.0.0"
180182
fossImplementation "org.osmdroid:osmdroid-android:6.1.20"
181183
// About screen
182184
implementation "com.github.daniel-stoneuk:material-about-library:3.1.2"
@@ -185,7 +187,7 @@ dependencies {
185187
implementation "com.mikepenz:aboutlibraries:$about_libraries_version"
186188

187189
// Firebase
188-
implementation platform("com.google.firebase:firebase-bom:33.1.2")
190+
implementation platform("com.google.firebase:firebase-bom:33.7.0")
189191
fullImplementation "com.google.firebase:firebase-messaging-ktx"
190192
fullImplementation "com.google.firebase:firebase-crashlytics-ktx"
191193

mobile/src/main/java/org/openhab/habdroid/ui/AbstractBaseActivity.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,7 @@ abstract class AbstractBaseActivity : AppCompatActivity(), CoroutineScope {
200200
resolveThemedColor(android.R.attr.windowBackground, black)
201201
else -> black
202202
}
203+
@Suppress("DEPRECATION")
203204
window.navigationBarColor = windowColor
204205

205206
insetsController.isAppearanceLightNavigationBars = currentNightMode != Configuration.UI_MODE_NIGHT_YES

mobile/src/main/java/org/openhab/habdroid/ui/WidgetListFragment.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -605,13 +605,14 @@ class WidgetListFragment :
605605
null
606606
}
607607

608-
val icon = if (iconBitmap != null) {
608+
val bitmapConfig = iconBitmap?.config
609+
val icon = if (bitmapConfig != null) {
609610
val borderSize = activity.resources.dpToPixel(31F)
610611
val totalFrameWidth = (borderSize * 2).toInt()
611612
val bitmapWithBackground = Bitmap.createBitmap(
612613
iconBitmap.width + totalFrameWidth,
613614
iconBitmap.height + totalFrameWidth,
614-
iconBitmap.config
615+
bitmapConfig
615616
)
616617
with(Canvas(bitmapWithBackground)) {
617618
drawColor(if (whiteBackground) Color.WHITE else Color.DKGRAY)

0 commit comments

Comments
 (0)