Skip to content

Commit 3a39c78

Browse files
Merge pull request #70 from raheemadamboev/1.2.6
1.2.6
2 parents fa001e8 + ef94c6f commit 3a39c78

File tree

8 files changed

+30
-29
lines changed

8 files changed

+30
-29
lines changed

.idea/misc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/build.gradle.kts

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
2+
13
plugins {
24
alias(libs.plugins.android)
35
alias(libs.plugins.kotlin)
@@ -60,11 +62,15 @@ android {
6062
targetCompatibility = JavaVersion.VERSION_17
6163
}
6264

63-
kotlinOptions {
64-
jvmTarget = libs.versions.jvm.target.get()
65-
freeCompilerArgs += listOf(
66-
"-opt-in=androidx.compose.material3.ExperimentalMaterial3Api"
67-
)
65+
kotlin {
66+
target {
67+
compilerOptions {
68+
jvmTarget.set(JvmTarget.JVM_17)
69+
freeCompilerArgs.addAll(
70+
"-opt-in=androidx.compose.material3.ExperimentalMaterial3Api"
71+
)
72+
}
73+
}
6874
}
6975

7076
buildFeatures {

app/src/main/res/values-en/strings.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@
7575
<string name="cd_add_note">Add note</string>
7676
<string name="cd_back_button">Go back</string>
7777
<string name="cd_done_button">Save note</string>
78-
<string name="cd_delete_button">Delete note</string>
7978
<string name="cd_app_icon">App icon</string>
8079
<string name="cd_company_logo">Company logo</string>
8180
<string name="cd_user_support">User support</string>

app/src/main/res/values-ru/strings.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@
7676
<string name="cd_add_note">Добавить заметку</string>
7777
<string name="cd_back_button">Назад</string>
7878
<string name="cd_done_button">Сохранить заметку</string>
79-
<string name="cd_delete_button">Удалить заметку</string>
8079
<string name="cd_app_icon">Иконка приложения</string>
8180
<string name="cd_company_logo">Логотип компании</string>
8281
<string name="cd_user_support">Поддержка пользователей</string>

app/src/main/res/values-uz/strings.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@
7676
<string name="cd_add_note">Eslatma qo\'shish</string>
7777
<string name="cd_back_button">Orqaga qaytish</string>
7878
<string name="cd_done_button">Eslatmani saqlash</string>
79-
<string name="cd_delete_button">Eslatmani o\'chirish</string>
8079
<string name="cd_app_icon">Dastur belgisi</string>
8180
<string name="cd_company_logo">Kompaniya emblemasi</string>
8281
<string name="cd_user_support">Foydalanuvchilarga yordam berish</string>

app/src/main/res/values/strings.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@
7676
<string name="cd_add_note">Add note</string>
7777
<string name="cd_back_button">Go back</string>
7878
<string name="cd_done_button">Save note</string>
79-
<string name="cd_delete_button">Delete note</string>
8079
<string name="cd_app_icon">App icon</string>
8180
<string name="cd_company_logo">Company logo</string>
8281
<string name="cd_user_support">User support</string>

gradle/libs.versions.toml

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,36 @@
11
[versions]
22

3-
compose = "2025.06.01"
3+
compose = "2025.07.00"
44
compose-activity = "1.10.1"
5-
compose-lifecycle = "2.9.1"
6-
compose-viewmodel = "2.9.1"
5+
compose-lifecycle = "2.9.2"
6+
compose-viewmodel = "2.9.2"
77
compose-hilt = "1.2.0"
88
compose-paging = "3.3.6"
99
core = "1.16.0"
1010
splash = "1.0.1"
1111
shortcut = "1.1.0"
12-
firebase = "33.15.0"
13-
hilt = "2.56.2"
12+
firebase = "33.16.0"
13+
hilt = "2.57"
1414
hilt-workmanager = "1.2.0"
1515
hilt-compiler = "1.2.0"
16-
workmanager = "2.10.2"
16+
workmanager = "2.10.3"
1717
coroutines = "1.10.2"
1818
room = "2.7.2"
1919
destinations = "2.2.0"
2020
timber = "5.0.1"
21-
gravity-core = "1.0.25"
22-
gravity-core-compose = "1.0.26"
23-
gravity-pinlock = "1.0.6"
21+
gravity-core = "1.0.33"
22+
gravity-core-compose = "1.0.27"
23+
gravity-pinlock = "1.0.7"
2424

25-
android = "8.10.1"
26-
kotlin = "2.1.21"
27-
ksp = "2.1.21-2.0.2"
28-
gms = "4.4.2"
29-
crashlytics = "3.0.4"
25+
android = "8.12.0"
26+
kotlin = "2.2.0"
27+
ksp = "2.2.0-2.0.2"
28+
gms = "4.4.3"
29+
crashlytics = "3.0.5"
3030

3131
sdk-min = "26"
32-
sdk-compile = "35"
33-
sdk-target = "35"
34-
jvm-target = "17"
32+
sdk-compile = "36"
33+
sdk-target = "36"
3534

3635
[libraries]
3736

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Fri Jun 06 12:29:54 UZT 2025
1+
#Mon Aug 04 22:18:47 UZT 2025
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)