diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 5d4d8ad..074c92c 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -1,9 +1,15 @@ +/* + * Created by sweetbread + * Copyright (c) 2025. All rights reserved. + */ + import java.time.LocalDateTime import java.time.format.DateTimeFormatter plugins { alias(libs.plugins.androidApplication) alias(libs.plugins.jetbrainsKotlinAndroid) + alias(libs.plugins.kotlin.compose) id("com.google.android.libraries.mapsplatform.secrets-gradle-plugin") id("com.google.devtools.ksp") } @@ -14,12 +20,12 @@ secrets { android { namespace = "ru.sweetbread.unn" - compileSdk = 34 + compileSdk = 36 defaultConfig { applicationId = "ru.sweetbread.unn" minSdk = 26 - targetSdk = 34 + targetSdk = 36 versionCode = 1 versionName = "1.0" setProperty("archivesBaseName", "$applicationId-v$versionCode($versionName)") @@ -28,6 +34,12 @@ android { vectorDrawables { useSupportLibrary = true } + +// javaCompileOptions { +// annotationProcessorOptions { +// arguments += ["room.schemaLocation": "$projectDir/schemas".toString()] +// } +// } } buildTypes { @@ -72,6 +84,7 @@ android { } dependencies { + implementation(libs.androidx.material.icons.core.android) coreLibraryDesugaring(libs.desugar.jdk.libs) implementation(libs.androidx.core.ktx) diff --git a/app/src/main/java/ru/sweetbread/unn/ui/layout/MainActivity.kt b/app/src/main/java/ru/sweetbread/unn/ui/layout/MainActivity.kt index 992adc1..2d909ba 100644 --- a/app/src/main/java/ru/sweetbread/unn/ui/layout/MainActivity.kt +++ b/app/src/main/java/ru/sweetbread/unn/ui/layout/MainActivity.kt @@ -1,3 +1,8 @@ +/* + * Created by sweetbread + * Copyright (c) 2025. All rights reserved. + */ + package ru.sweetbread.unn.ui.layout import android.os.Bundle @@ -22,10 +27,10 @@ import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier +import androidx.core.view.WindowCompat import androidx.navigation.compose.NavHost import androidx.navigation.compose.composable import androidx.navigation.compose.rememberNavController -import androidx.room.Room import io.ktor.client.HttpClient import io.ktor.client.engine.android.Android import io.ktor.client.plugins.HttpRequestRetry @@ -70,6 +75,8 @@ class MainActivity : ComponentActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + WindowCompat.setDecorFitsSystemWindows(window, false) + setContent { UNNTheme { Surface(modifier = Modifier.fillMaxSize(), color = MaterialTheme.colorScheme.background) { diff --git a/build.gradle.kts b/build.gradle.kts index d565c5a..fd86d74 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,8 +1,14 @@ +/* + * Created by sweetbread + * Copyright (c) 2025. All rights reserved. + */ + // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { alias(libs.plugins.androidApplication) apply false alias(libs.plugins.jetbrainsKotlinAndroid) apply false - id("com.google.devtools.ksp") version "1.9.0-1.0.13" apply false + alias(libs.plugins.kotlin.compose) apply false + id("com.google.devtools.ksp") version "2.1.20-2.0.0" apply false } buildscript { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 694d809..97521b8 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,27 +1,27 @@ [versions] acraHttp = "5.11.3" -agp = "8.7.0" -calendar = "2.5.4" +agp = "8.7.3" +calendar = "2.6.2" coilCompose = "2.7.0" -compose = "1.6.4" # Updating this will cause an error! +compose = "1.8.0" coreSplashscreen = "1.0.1" -datastorePreferences = "1.1.1" -desugar_jdk_libs = "2.1.2" -kotlin = "1.9.0" -coreKtx = "1.13.1" +datastorePreferences = "1.1.5" +desugar_jdk_libs = "2.1.5" +kotlin = "2.1.20" +coreKtx = "1.16.0" junitVersion = "1.2.1" espressoCore = "3.6.1" ktor = "2.3.12" -lifecycle = "2.8.5" -activityCompose = "1.9.2" -composeBom = "2024.03.00" # Updating this will cause an error! +lifecycle = "2.8.7" +activityCompose = "1.10.1" +composeBom = "2025.04.01" appcompat = "1.7.0" material = "1.12.0" -annotation = "1.8.2" -constraintlayout = "2.1.4" -activity = "1.9.2" -navigationCompose = "2.7.7" # Updating this will cause an error! -roomRuntime = "2.6.1" +annotation = "1.9.1" +constraintlayout = "2.2.1" +activity = "1.10.1" +navigationCompose = "2.8.9" +roomRuntime = "2.7.1" secretsGradlePlugin = "2.0.1" splitties = "3.0.0" materialIconsCoreAndroid = "1.7.8" @@ -69,4 +69,5 @@ androidx-material-icons-core-android = { group = "androidx.compose.material", na [plugins] androidApplication = { id = "com.android.application", version.ref = "agp" } jetbrainsKotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } +kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }