diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml index 6d0ee1c2..c224ad56 100644 --- a/.idea/kotlinc.xml +++ b/.idea/kotlinc.xml @@ -1,6 +1,6 @@ - \ No newline at end of file diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 9e1b6015..8d4cada0 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -13,12 +13,12 @@ plugins { android { namespace = "ua.acclorite.book_story" - compileSdk = 34 + compileSdk = 35 defaultConfig { applicationId = "ua.acclorite.book_story" minSdk = 26 - targetSdk = 34 + targetSdk = 35 versionCode = 8 versionName = "1.3.0" @@ -87,26 +87,26 @@ aboutLibraries { dependencies { // Default - implementation("androidx.core:core-ktx:1.13.1") - implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.6") - implementation("androidx.activity:activity-compose:1.9.2") + implementation("androidx.core:core-ktx:1.15.0") + implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.7") + implementation("androidx.activity:activity-compose:1.9.3") // Compose BOM libraries // Compose BOM was eliminated - it is recognized as Closed Source in AboutLibraries. - implementation("androidx.compose.foundation:foundation:1.7.3") - implementation("androidx.compose.animation:animation:1.7.3") - implementation("androidx.compose.animation:animation-android:1.7.3") - implementation("androidx.compose.foundation:foundation-layout:1.7.3") - implementation("androidx.compose.ui:ui:1.7.3") - implementation("androidx.compose.ui:ui-graphics:1.7.3") - implementation("androidx.compose.ui:ui-android:1.7.3") - implementation("androidx.compose.material3:material3:1.3.0") - implementation("androidx.compose.material3:material3-window-size-class:1.3.0") - implementation("androidx.compose.material:material-icons-extended:1.7.3") - implementation("androidx.compose.material:material:1.7.3") + implementation("androidx.compose.foundation:foundation:1.7.5") + implementation("androidx.compose.animation:animation:1.7.5") + implementation("androidx.compose.animation:animation-android:1.7.5") + implementation("androidx.compose.foundation:foundation-layout:1.7.5") + implementation("androidx.compose.ui:ui:1.7.5") + implementation("androidx.compose.ui:ui-graphics:1.7.5") + implementation("androidx.compose.ui:ui-android:1.7.5") + implementation("androidx.compose.material3:material3:1.4.0-alpha03") + implementation("androidx.compose.material3:material3-window-size-class:1.3.1") + implementation("androidx.compose.material:material-icons-extended:1.7.5") + implementation("androidx.compose.material:material:1.7.5") // All dependencies - implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.8.6") + implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.8.7") implementation("com.google.accompanist:accompanist-swiperefresh:0.34.0") // Dagger - Hilt diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/core/components/common/Tooltip.kt b/app/src/main/java/ua/acclorite/book_story/presentation/core/components/common/Tooltip.kt index 9ea2adf4..5edbfed5 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/core/components/common/Tooltip.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/core/components/common/Tooltip.kt @@ -28,7 +28,7 @@ fun Tooltip( content: @Composable () -> Unit ) { TooltipBox( - positionProvider = TooltipDefaults.rememberPlainTooltipPositionProvider(padding), + positionProvider = TooltipDefaults.rememberTooltipPositionProvider(padding), focusable = false, enableUserInput = enabled, tooltip = { diff --git a/app/src/main/java/ua/acclorite/book_story/presentation/ui/Theme.kt b/app/src/main/java/ua/acclorite/book_story/presentation/ui/Theme.kt index 398f4c86..e37ca37b 100644 --- a/app/src/main/java/ua/acclorite/book_story/presentation/ui/Theme.kt +++ b/app/src/main/java/ua/acclorite/book_story/presentation/ui/Theme.kt @@ -18,7 +18,6 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.Immutable import androidx.compose.runtime.SideEffect import androidx.compose.ui.graphics.Color -import androidx.compose.ui.graphics.toArgb import androidx.compose.ui.platform.LocalView import androidx.core.view.WindowCompat import kotlinx.parcelize.Parcelize @@ -95,9 +94,6 @@ fun BookStoryTheme( SideEffect { val window = (view.context as Activity).window - window.statusBarColor = Color.Transparent.toArgb() - window.navigationBarColor = Color.Transparent.toArgb() - // Disabling Autofill window.decorView.importantForAutofill = View.IMPORTANT_FOR_AUTOFILL_NO_EXCLUDE_DESCENDANTS diff --git a/build.gradle.kts b/build.gradle.kts index db23b5aa..0ce680e0 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,9 +1,9 @@ plugins { - id("com.android.application") version "8.3.0" apply false - id("org.jetbrains.kotlin.android") version "2.0.0" apply false - id("org.jetbrains.kotlin.plugin.compose") version "2.0.0" apply false - id("com.google.devtools.ksp") version "2.0.0-1.0.21" apply false - id("com.google.dagger.hilt.android") version "2.50" apply false + id("com.android.application") version "8.7.1" apply false + id("org.jetbrains.kotlin.android") version "2.0.21" apply false + id("org.jetbrains.kotlin.plugin.compose") version "2.0.21" apply false + id("com.google.devtools.ksp") version "2.0.21-1.0.26" apply false + id("com.google.dagger.hilt.android") version "2.52" apply false id("com.mikepenz.aboutlibraries.plugin") version "11.1.3" apply false id("androidx.room") version "2.6.1" apply false } \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7f93135c..2c352119 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 4d03d74d..296a3208 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=3e1af3ae886920c3ac87f7a91f816c0c7c436f276a6eefdb3da152100fef72ae -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionSha256Sum=d725d707bfabd4dfdc958c624003b3c80accc03f7037b5122c4b1d0ef15cecab +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index 1aa94a42..f5feea6d 100644 --- a/gradlew +++ b/gradlew @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -55,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -84,7 +86,8 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/gradlew.bat b/gradlew.bat index 93e3f59f..9d21a218 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,6 +13,8 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem @if "%DEBUG%"=="" @echo off @rem ########################################################################## @@ -43,11 +45,11 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail