Atte149/book-story
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

🛠️ Update Sdk to API 35 & Migrate Gradle to 8.9 & Various dependencies update

Browse source
This commit is contained in:
Acclorite 2024-10-31 22:08:37 +02:00
parent c107695c1e
commit d0c0c9e133
9 changed files with 43 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.idea/kotlinc.xml generated
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="KotlinJpsPluginSettings"> <component name="KotlinJpsPluginSettings">
<option name="version" value="2.0.0" /> <option name="version" value="2.0.21" />
</component> </component>
</project> </project>

34
app/build.gradle.kts
View file

@ -13,12 +13,12 @@ plugins {
android { android {
namespace = "ua.acclorite.book_story" namespace = "ua.acclorite.book_story"
compileSdk = 34 compileSdk = 35
defaultConfig { defaultConfig {
applicationId = "ua.acclorite.book_story" applicationId = "ua.acclorite.book_story"
minSdk = 26 minSdk = 26
targetSdk = 34 targetSdk = 35
versionCode = 8 versionCode = 8
versionName = "1.3.0" versionName = "1.3.0"
@ -87,26 +87,26 @@ aboutLibraries {
dependencies { dependencies {
// Default // Default
implementation("androidx.core:core-ktx:1.13.1") implementation("androidx.core:core-ktx:1.15.0")
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.6") implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.7")
implementation("androidx.activity:activity-compose:1.9.2") implementation("androidx.activity:activity-compose:1.9.3")
// Compose BOM libraries // Compose BOM libraries
// Compose BOM was eliminated - it is recognized as Closed Source in AboutLibraries. // Compose BOM was eliminated - it is recognized as Closed Source in AboutLibraries.
implementation("androidx.compose.foundation:foundation:1.7.3") implementation("androidx.compose.foundation:foundation:1.7.5")
implementation("androidx.compose.animation:animation:1.7.3") implementation("androidx.compose.animation:animation:1.7.5")
implementation("androidx.compose.animation:animation-android:1.7.3") implementation("androidx.compose.animation:animation-android:1.7.5")
implementation("androidx.compose.foundation:foundation-layout:1.7.3") implementation("androidx.compose.foundation:foundation-layout:1.7.5")
implementation("androidx.compose.ui:ui:1.7.3") implementation("androidx.compose.ui:ui:1.7.5")
implementation("androidx.compose.ui:ui-graphics:1.7.3") implementation("androidx.compose.ui:ui-graphics:1.7.5")
implementation("androidx.compose.ui:ui-android:1.7.3") implementation("androidx.compose.ui:ui-android:1.7.5")
implementation("androidx.compose.material3:material3:1.3.0") implementation("androidx.compose.material3:material3:1.4.0-alpha03")
implementation("androidx.compose.material3:material3-window-size-class:1.3.0") implementation("androidx.compose.material3:material3-window-size-class:1.3.1")
implementation("androidx.compose.material:material-icons-extended:1.7.3") implementation("androidx.compose.material:material-icons-extended:1.7.5")
implementation("androidx.compose.material:material:1.7.3") implementation("androidx.compose.material:material:1.7.5")
// All dependencies // 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") implementation("com.google.accompanist:accompanist-swiperefresh:0.34.0")
// Dagger - Hilt // Dagger - Hilt

2
app/src/main/java/ua/acclorite/book_story/presentation/core/components/common/Tooltip.kt
View file

@ -28,7 +28,7 @@ fun Tooltip(
content: @Composable () -> Unit content: @Composable () -> Unit
) { ) {
TooltipBox( TooltipBox(
positionProvider = TooltipDefaults.rememberPlainTooltipPositionProvider(padding), positionProvider = TooltipDefaults.rememberTooltipPositionProvider(padding),
focusable = false, focusable = false,
enableUserInput = enabled, enableUserInput = enabled,
tooltip = { tooltip = {

4
app/src/main/java/ua/acclorite/book_story/presentation/ui/Theme.kt
View file

@ -18,7 +18,6 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.Immutable import androidx.compose.runtime.Immutable
import androidx.compose.runtime.SideEffect import androidx.compose.runtime.SideEffect
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.toArgb
import androidx.compose.ui.platform.LocalView import androidx.compose.ui.platform.LocalView
import androidx.core.view.WindowCompat import androidx.core.view.WindowCompat
import kotlinx.parcelize.Parcelize import kotlinx.parcelize.Parcelize
@ -95,9 +94,6 @@ fun BookStoryTheme(
SideEffect { SideEffect {
val window = (view.context as Activity).window val window = (view.context as Activity).window
window.statusBarColor = Color.Transparent.toArgb()
window.navigationBarColor = Color.Transparent.toArgb()
// Disabling Autofill // Disabling Autofill
window.decorView.importantForAutofill = window.decorView.importantForAutofill =
View.IMPORTANT_FOR_AUTOFILL_NO_EXCLUDE_DESCENDANTS View.IMPORTANT_FOR_AUTOFILL_NO_EXCLUDE_DESCENDANTS

10
build.gradle.kts
View file

@ -1,9 +1,9 @@
plugins { plugins {
id("com.android.application") version "8.3.0" apply false id("com.android.application") version "8.7.1" apply false
id("org.jetbrains.kotlin.android") version "2.0.0" apply false id("org.jetbrains.kotlin.android") version "2.0.21" apply false
id("org.jetbrains.kotlin.plugin.compose") version "2.0.0" apply false id("org.jetbrains.kotlin.plugin.compose") version "2.0.21" apply false
id("com.google.devtools.ksp") version "2.0.0-1.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.50" 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("com.mikepenz.aboutlibraries.plugin") version "11.1.3" apply false
id("androidx.room") version "2.6.1" apply false id("androidx.room") version "2.6.1" apply false
} }

BIN
gradle/wrapper/gradle-wrapper.jar vendored
View file

Binary file not shown.

4
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1,7 +1,7 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionSha256Sum=3e1af3ae886920c3ac87f7a91f816c0c7c436f276a6eefdb3da152100fef72ae distributionSha256Sum=d725d707bfabd4dfdc958c624003b3c80accc03f7037b5122c4b1d0ef15cecab
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
networkTimeout=10000 networkTimeout=10000
validateDistributionUrl=true validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME

7
gradlew vendored
View file

@ -15,6 +15,8 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# #
# SPDX-License-Identifier: Apache-2.0
#
############################################################################## ##############################################################################
# #
@ -55,7 +57,7 @@
# Darwin, MinGW, and NonStop. # Darwin, MinGW, and NonStop.
# #
# (3) This script is generated from the Groovy template # (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. # within the Gradle project.
# #
# You can find Gradle at https://github.com/gradle/gradle/. # You can find Gradle at https://github.com/gradle/gradle/.
@ -84,7 +86,8 @@ done
# shellcheck disable=SC2034 # shellcheck disable=SC2034
APP_BASE_NAME=${0##*/} APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) # 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. # Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum MAX_FD=maximum

22
gradlew.bat vendored
View file

@ -13,6 +13,8 @@
@rem See the License for the specific language governing permissions and @rem See the License for the specific language governing permissions and
@rem limitations under the License. @rem limitations under the License.
@rem @rem
@rem SPDX-License-Identifier: Apache-2.0
@rem
@if "%DEBUG%"=="" @echo off @if "%DEBUG%"=="" @echo off
@rem ########################################################################## @rem ##########################################################################
@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1 %JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute if %ERRORLEVEL% equ 0 goto execute
echo. echo. 1>&2
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
echo. echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. echo location of your Java installation. 1>&2
goto fail goto fail
@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto execute if exist "%JAVA_EXE%" goto execute
echo. echo. 1>&2
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
echo. echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. echo location of your Java installation. 1>&2
goto fail goto fail