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

Update compileSdk to 35 #3846

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update compileSdk to 35 #3846

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
20 changes: 11 additions & 9 deletions mobile/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
import com.mikepenz.aboutlibraries.plugin.DuplicateMode

def taskRequests = getGradle().getStartParameter().getTaskRequests().toString()
def isFoss = taskRequests.contains("Foss") || taskRequests.contains("foss")

buildscript {
ext.kotlin_coroutines_version = '1.8.1'
ext.ok_http_version = '4.12.0'
ext.work_manager_version = '2.9.0'
ext.work_manager_version = '2.10.0'
ext.about_libraries_version = '11.2.3'
ext.powermock_version = '2.0.9'
ext.espresso_version = '3.5.1'
ext.media3_version = '1.3.1'
ext.espresso_version = '3.6.1'
ext.media3_version = '1.5.1'
ext.acra_version = '5.12.0'

repositories {
Expand All @@ -21,7 +23,7 @@ buildscript {

dependencies {
classpath "com.google.gms:google-services:4.4.2"
classpath "com.google.firebase:firebase-crashlytics-gradle:2.9.9"
classpath "com.google.firebase:firebase-crashlytics-gradle:3.0.2"
classpath 'com.github.bjoernq:unmockplugin:0.8.0'
classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:$about_libraries_version"
classpath "de.jjohannes.gradle:missing-metadata-guava:31.1.1"
Expand All @@ -46,7 +48,7 @@ android {
defaultConfig {
applicationId "org.openhab.habdroid"
minSdkVersion 21
compileSdk 34
compileSdk 35
targetSdkVersion 34
versionCode 562
versionName "3.16.8-beta"
Expand Down Expand Up @@ -123,7 +125,7 @@ android {
}

aboutLibraries {
duplicationMode = com.mikepenz.aboutlibraries.plugin.DuplicateMode.MERGE
duplicationMode = DuplicateMode.MERGE
}

unMock {
Expand All @@ -148,7 +150,7 @@ dependencies {
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_coroutines_version"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-jdk9:$kotlin_coroutines_version"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlin_coroutines_version"
implementation "androidx.core:core-ktx:1.13.1"
implementation "androidx.core:core-ktx:1.15.0"
implementation "androidx.activity:activity-ktx:1.9.3"
implementation "androidx.fragment:fragment-ktx:1.8.5"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
Expand Down Expand Up @@ -176,7 +178,7 @@ dependencies {
implementation "com.github.chrisbanes:PhotoView:2.3.0"
implementation "com.faltenreich:skeletonlayout:5.0.0"
// MapView support
fullImplementation "com.google.android.gms:play-services-maps:18.2.0"
fullImplementation "com.google.android.gms:play-services-maps:19.0.0"
fossImplementation "org.osmdroid:osmdroid-android:6.1.20"
// About screen
implementation "com.github.daniel-stoneuk:material-about-library:3.1.2"
Expand All @@ -185,7 +187,7 @@ dependencies {
implementation "com.mikepenz:aboutlibraries:$about_libraries_version"

// Firebase
implementation platform("com.google.firebase:firebase-bom:33.1.2")
implementation platform("com.google.firebase:firebase-bom:33.7.0")
fullImplementation "com.google.firebase:firebase-messaging-ktx"
fullImplementation "com.google.firebase:firebase-crashlytics-ktx"

Expand Down
1 change: 1 addition & 0 deletions mobile/src/main/java/org/openhab/habdroid/ui/AbstractBaseActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,7 @@ abstract class AbstractBaseActivity : AppCompatActivity(), CoroutineScope {
resolveThemedColor(android.R.attr.windowBackground, black)
else -> black
}
@Suppress("DEPRECATION")
window.navigationBarColor = windowColor

insetsController.isAppearanceLightNavigationBars = currentNightMode != Configuration.UI_MODE_NIGHT_YES
Expand Down
5 changes: 3 additions & 2 deletions mobile/src/main/java/org/openhab/habdroid/ui/WidgetListFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -605,13 +605,14 @@ class WidgetListFragment :
null
}

val icon = if (iconBitmap != null) {
val bitmapConfig = iconBitmap?.config
val icon = if (bitmapConfig != null) {
val borderSize = activity.resources.dpToPixel(31F)
val totalFrameWidth = (borderSize * 2).toInt()
val bitmapWithBackground = Bitmap.createBitmap(
iconBitmap.width + totalFrameWidth,
iconBitmap.height + totalFrameWidth,
iconBitmap.config
bitmapConfig
)
with(Canvas(bitmapWithBackground)) {
drawColor(if (whiteBackground) Color.WHITE else Color.DKGRAY)
Expand Down
Loading