diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml index 0a5a0a5..420f84a 100644 --- a/.github/workflows/verify.yml +++ b/.github/workflows/verify.yml @@ -12,17 +12,17 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout codebase - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Set Up JDK - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: 'zulu' java-version: '17' cache: 'gradle' - name: Setup Gradle - uses: gradle/actions/setup-gradle@v4 + uses: gradle/actions/setup-gradle@v5 - name: Make gradlew executable run: chmod +x ./gradlew @@ -33,7 +33,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout codebase - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Enable KVM run: | diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 5a8be7c..5136918 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -18,7 +18,7 @@ plugins { alias(libs.plugins.jetbrainsKotlinAndroid) alias(libs.plugins.ksp) alias(libs.plugins.roborazzi) - id("org.jetbrains.kotlin.plugin.compose") version "2.2.20" + id("org.jetbrains.kotlin.plugin.compose") version "2.3.0" id("kotlin-parcelize") kotlin("plugin.serialization") id("com.google.dagger.hilt.android") diff --git a/app/src/main/java/com/example/cahier/ui/CahierHomeScreen.kt b/app/src/main/java/com/example/cahier/ui/CahierHomeScreen.kt index 488bc1d..83bfdcc 100644 --- a/app/src/main/java/com/example/cahier/ui/CahierHomeScreen.kt +++ b/app/src/main/java/com/example/cahier/ui/CahierHomeScreen.kt @@ -78,9 +78,9 @@ object HomeDestination : NavigationDestination { } enum class AppDestinations( - @StringRes val label: Int, - @DrawableRes val icon: Int, - @StringRes val contentDescription: Int + @param:StringRes val label: Int, + @param:DrawableRes val icon: Int, + @param:StringRes val contentDescription: Int ) { Home( label = R.string.home, @@ -242,7 +242,6 @@ private fun CahierNavigationSuite( LocalMinimumInteractiveComponentSize .current, interactionSource, - state.defaultDragHandleSemantics() ), ) }, diff --git a/app/src/main/java/com/example/cahier/ui/viewmodels/DrawingCanvasViewModel.kt b/app/src/main/java/com/example/cahier/ui/viewmodels/DrawingCanvasViewModel.kt index 3dd24ad..08e36c0 100644 --- a/app/src/main/java/com/example/cahier/ui/viewmodels/DrawingCanvasViewModel.kt +++ b/app/src/main/java/com/example/cahier/ui/viewmodels/DrawingCanvasViewModel.kt @@ -65,7 +65,7 @@ import javax.inject.Inject @HiltViewModel class DrawingCanvasViewModel @Inject constructor( - @ApplicationContext private val context: Context, + @param: ApplicationContext private val context: Context, savedStateHandle: SavedStateHandle, private val noteRepository: NotesRepository, val fileHelper: FileHelper, diff --git a/app/src/main/java/com/example/cahier/ui/viewmodels/SettingsViewModel.kt b/app/src/main/java/com/example/cahier/ui/viewmodels/SettingsViewModel.kt index e3f99b4..cf49d93 100644 --- a/app/src/main/java/com/example/cahier/ui/viewmodels/SettingsViewModel.kt +++ b/app/src/main/java/com/example/cahier/ui/viewmodels/SettingsViewModel.kt @@ -39,7 +39,7 @@ import javax.inject.Inject @RequiresApi(Build.VERSION_CODES.UPSIDE_DOWN_CAKE) @HiltViewModel class SettingsViewModel @Inject constructor( - @ApplicationContext private val context: Context + @param: ApplicationContext private val context: Context ) : ViewModel() { private val _isRoleAvailable = MutableStateFlow(false) diff --git a/build.gradle.kts b/build.gradle.kts index c28499c..3dc59a5 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,10 +5,10 @@ buildscript { } plugins { - alias(libs.plugins.androidApplication) version "8.13.0" apply false - alias(libs.plugins.androidLibrary) version "8.13.0" apply false - alias(libs.plugins.jetbrainsKotlinAndroid) version "2.2.20" apply false - alias(libs.plugins.ksp) version "2.2.20-2.0.3" apply false - kotlin("plugin.serialization") version "2.2.20" + alias(libs.plugins.androidApplication) version "8.13.2" apply false + alias(libs.plugins.androidLibrary) version "8.13.2" apply false + alias(libs.plugins.jetbrainsKotlinAndroid) version "2.3.0" apply false + alias(libs.plugins.ksp) version "2.3.4" apply false + kotlin("plugin.serialization") version "2.3.0" id("com.google.dagger.hilt.android") version "2.57.2" apply false } \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 2cde4ba..b7ed281 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,42 +1,42 @@ [versions] -agp = "8.13.0" +agp = "8.13.2" appcompatV7 = "1.7.1" coilCompose = "3.3.0" -foundation = "1.9.2" -hiltAndroid = "2.57.1" +foundation = "1.10.0" +hiltAndroid = "2.57.2" hiltNavigationCompose = "1.3.0" -ink = "1.0.0-beta01" -kotlin = "2.2.20" +ink = "1.0.0" +kotlin = "2.3.0" coreKtx = "1.17.0" junit = "4.13.2" junitVersion = "1.3.0" espressoCore = "3.7.0" kotlinxSerializationJson = "1.9.0" -lifecycleRuntimeKtx = "2.9.4" -activityCompose = "1.11.0" -composeBom = "2025.09.01" -lifecycleViewmodelCompose = "2.9.4" -lifecycleRuntimeCompose = "2.9.4" -adaptiveNavigationAndroid = "1.1.0" -navigationRuntimeKtx = "2.9.5" -navigationCompose = "2.9.5" -roomKtx = "2.8.1" -roomRuntime = "2.8.1" -windowCore = "1.5.0" -ksp = "2.2.20-2.0.3" -roomCompiler = "2.8.1" +lifecycleRuntimeKtx = "2.10.0" +activityCompose = "1.12.2" +composeBom = "2025.12.01" +lifecycleViewmodelCompose = "2.10.0" +lifecycleRuntimeCompose = "2.10.0" +adaptiveNavigationAndroid = "1.2.0" +navigationRuntimeKtx = "2.9.6" +navigationCompose = "2.9.6" +roomKtx = "2.8.4" +roomRuntime = "2.8.4" +windowCore = "1.5.1" +ksp = "2.3.4" +roomCompiler = "2.8.4" material3AdaptiveNavigationSuiteAndroidVersion = "1.4.0" -inputMotionprediction = "1.0.0-beta06" +inputMotionprediction = "1.0.0" #Tests -mockito = "5.20.0" -mockitoKotlin = "6.0.0" +mockito = "5.21.0" +mockitoKotlin = "6.1.0" coreTesting = "2.2.0" kotlinxCoroutinesTest = "1.10.2" turbine = "1.2.1" material3WindowSizeClass = "1.4.0" -robolectric = "4.11.1" -roborazzi = "1.51.0" +robolectric = "4.16" +roborazzi = "1.56.0" [libraries] androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2e261d1..5bbfc9b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Tue Sep 30 16:57:05 EDT 2025 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/screenshots/reference_screenshot_bottomnavbar.png b/screenshots/reference_screenshot_bottomnavbar.png index 68a61c8..587e0ee 100644 Binary files a/screenshots/reference_screenshot_bottomnavbar.png and b/screenshots/reference_screenshot_bottomnavbar.png differ diff --git a/screenshots/reference_screenshot_navrail.png b/screenshots/reference_screenshot_navrail.png index 811a6c3..a6c3d5a 100644 Binary files a/screenshots/reference_screenshot_navrail.png and b/screenshots/reference_screenshot_navrail.png differ