diff --git a/build.gradle.kts b/build.gradle.kts index c5279d865..6ead66e55 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,6 +1,6 @@ plugins { - val kotlinVersion = "1.9.22" - id("com.android.application") version "8.4.0" apply (false) + val kotlinVersion = "2.1.10" + id("com.android.application") version "8.8.0" apply (false) id("org.jetbrains.kotlin.android") version kotlinVersion apply (false) id("org.jetbrains.kotlin.kapt") version kotlinVersion apply (false) id("org.jetbrains.kotlin.multiplatform") version kotlinVersion apply (false) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 17655d0ef..1e2fbf0d4 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/uhabits-android/build.gradle.kts b/uhabits-android/build.gradle.kts index 289f0fe43..118c1b6bf 100644 --- a/uhabits-android/build.gradle.kts +++ b/uhabits-android/build.gradle.kts @@ -19,7 +19,7 @@ plugins { id("com.github.triplet.play") version "3.8.6" - id("com.android.application") version "8.4.0" + id("com.android.application") version "8.8.0" id("org.jetbrains.kotlin.android") id("org.jetbrains.kotlin.kapt") id("org.jlleitschuh.gradle.ktlint") diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ColorPickerDialogFactory.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ColorPickerDialogFactory.kt index e4cfa015b..700af3438 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ColorPickerDialogFactory.kt +++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ColorPickerDialogFactory.kt @@ -19,6 +19,7 @@ package org.isoron.uhabits.activities.common.dialogs import android.content.Context +import com.android.colorpicker.ColorPickerDialog.SIZE_SMALL import org.isoron.platform.gui.toInt import org.isoron.uhabits.R import org.isoron.uhabits.core.models.PaletteColor @@ -39,7 +40,7 @@ class ColorPickerDialogFactory @Inject constructor(@param:ActivityContext privat res.getPalette(), androidColor, 4, - com.android.colorpicker.ColorPickerDialog.SIZE_SMALL + SIZE_SMALL ) return dialog } diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HeaderView.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HeaderView.kt index c11c1bbba..30583ad4c 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HeaderView.kt +++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HeaderView.kt @@ -141,7 +141,7 @@ class HeaderView( val y1 = rect.centerY() - 0.25 * em val y2 = rect.centerY() + 1.25 * em - val lines = DateUtils.formatHeaderDate(day).toUpperCase().split("\n") + val lines = DateUtils.formatHeaderDate(day).uppercase().split("\n") canvas.drawText(lines[0], rect.centerX(), y1.toFloat(), paint) canvas.drawText(lines[1], rect.centerX(), y2.toFloat(), paint) day.add(GregorianCalendar.DAY_OF_MONTH, -1)