Skip to content

Commit 14dbf90

Browse files
committed
Upgrade Kotlin, AGP
1 parent 280a5dd commit 14dbf90

File tree

5 files changed

+7
-6
lines changed

5 files changed

+7
-6
lines changed

build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
2-
val kotlinVersion = "1.9.22"
3-
id("com.android.application") version "8.4.0" apply (false)
2+
val kotlinVersion = "2.1.10"
3+
id("com.android.application") version "8.8.0" apply (false)
44
id("org.jetbrains.kotlin.android") version kotlinVersion apply (false)
55
id("org.jetbrains.kotlin.kapt") version kotlinVersion apply (false)
66
id("org.jetbrains.kotlin.multiplatform") version kotlinVersion apply (false)
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

uhabits-android/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
plugins {
2121
id("com.github.triplet.play") version "3.8.6"
22-
id("com.android.application") version "8.4.0"
22+
id("com.android.application") version "8.8.0"
2323
id("org.jetbrains.kotlin.android")
2424
id("org.jetbrains.kotlin.kapt")
2525
id("org.jlleitschuh.gradle.ktlint")

uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ColorPickerDialogFactory.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
package org.isoron.uhabits.activities.common.dialogs
2020

2121
import android.content.Context
22+
import com.android.colorpicker.ColorPickerDialog.SIZE_SMALL
2223
import org.isoron.platform.gui.toInt
2324
import org.isoron.uhabits.R
2425
import org.isoron.uhabits.core.models.PaletteColor
@@ -39,7 +40,7 @@ class ColorPickerDialogFactory @Inject constructor(@param:ActivityContext privat
3940
res.getPalette(),
4041
androidColor,
4142
4,
42-
com.android.colorpicker.ColorPickerDialog.SIZE_SMALL
43+
SIZE_SMALL
4344
)
4445
return dialog
4546
}

uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HeaderView.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ class HeaderView(
141141

142142
val y1 = rect.centerY() - 0.25 * em
143143
val y2 = rect.centerY() + 1.25 * em
144-
val lines = DateUtils.formatHeaderDate(day).toUpperCase().split("\n")
144+
val lines = DateUtils.formatHeaderDate(day).uppercase().split("\n")
145145
canvas.drawText(lines[0], rect.centerX(), y1.toFloat(), paint)
146146
canvas.drawText(lines[1], rect.centerX(), y2.toFloat(), paint)
147147
day.add(GregorianCalendar.DAY_OF_MONTH, -1)

0 commit comments

Comments
 (0)