From 45dab6d5136652292f9647e71908be14dd291407 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Thu, 8 Aug 2024 03:38:03 +0530 Subject: [PATCH] fix(build): compile against SDK 35 --- .../kotlin/dev/msfjarvis/claw/gradle/AndroidCommonPlugin.kt | 4 ++-- .../src/main/kotlin/dev/msfjarvis/claw/common/theme/Theme.kt | 3 --- gradle.properties | 1 + 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/build-logic/src/main/kotlin/dev/msfjarvis/claw/gradle/AndroidCommonPlugin.kt b/build-logic/src/main/kotlin/dev/msfjarvis/claw/gradle/AndroidCommonPlugin.kt index 787f75f9..f061127b 100644 --- a/build-logic/src/main/kotlin/dev/msfjarvis/claw/gradle/AndroidCommonPlugin.kt +++ b/build-logic/src/main/kotlin/dev/msfjarvis/claw/gradle/AndroidCommonPlugin.kt @@ -1,5 +1,5 @@ /* - * Copyright © 2022-2023 Harsh Shandilya. + * Copyright © 2022-2024 Harsh Shandilya. * Use of this source code is governed by an MIT-style * license that can be found in the LICENSE file or at * https://opensource.org/licenses/MIT. @@ -26,7 +26,7 @@ import org.gradle.kotlin.dsl.findByType class AndroidCommonPlugin : Plugin { private companion object { - const val COMPILE_SDK = 34 + const val COMPILE_SDK = 35 const val MIN_SDK = 26 const val TARGET_SDK = 34 const val SLIM_TESTS_PROPERTY = "slimTests" diff --git a/common/src/main/kotlin/dev/msfjarvis/claw/common/theme/Theme.kt b/common/src/main/kotlin/dev/msfjarvis/claw/common/theme/Theme.kt index b4a49e3a..c0eba459 100644 --- a/common/src/main/kotlin/dev/msfjarvis/claw/common/theme/Theme.kt +++ b/common/src/main/kotlin/dev/msfjarvis/claw/common/theme/Theme.kt @@ -18,8 +18,6 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.runtime.ProvidedValue import androidx.compose.runtime.SideEffect -import androidx.compose.ui.graphics.Color -import androidx.compose.ui.graphics.toArgb import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalView import androidx.core.view.WindowCompat @@ -106,7 +104,6 @@ fun LobstersTheme( if (!view.isInEditMode) { SideEffect { val window = (view.context as Activity).window - window.statusBarColor = Color.Transparent.toArgb() WindowCompat.getInsetsController(window, view).isAppearanceLightStatusBars = !darkTheme } } diff --git a/gradle.properties b/gradle.properties index dd79d973..cd60bc73 100644 --- a/gradle.properties +++ b/gradle.properties @@ -50,6 +50,7 @@ android.disableEarlyManifestParsing=true # Disable warnings about unsupported features android.suppressUnsupportedOptionWarnings=android.dependencyResolutionAtConfigurationTime.disallow,android.disableEarlyManifestParsing,android.suppressUnsupportedOptionWarnings +android.suppressUnsupportedCompileSdk=35 # Make Spotless default to keeping license headers years in sync spotlessSetLicenseHeaderYearsFromGitHistory=true