Skip to content

Commit 806b8d6

Browse files
committed
kotlin 2 + update libs
1 parent 0dcd4fa commit 806b8d6

6 files changed

Lines changed: 120 additions & 140 deletions

File tree

android-compose-app/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ android {
2323
applicationId = "com.softartdev.noteroom"
2424
minSdk = libs.versions.minSdk.get().toInt()
2525
targetSdk = libs.versions.targetSdk.get().toInt()
26-
versionCode = 834
27-
versionName = "8.3.4"
26+
versionCode = 835
27+
versionName = "8.3.5"
2828
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
2929
testInstrumentationRunnerArguments["clearPackageData"] = "true"
3030
vectorDrawables.useSupportLibrary = true

desktop-compose-app/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ compose {
4545
nativeDistributions {
4646
targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb)
4747
packageName = "Note Delight"
48-
packageVersion = "1.1.4"
48+
packageVersion = "1.1.5"
4949
description = "Note app with encryption"
5050
copyright = "© 2023 SoftArtDev"
5151
macOS.iconFile.set(project.file("src/jvmMain/resources/app_icon.icns"))

gradle.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ kotlin.code.style=official
1212
kotlin.mpp.enableCInteropCommonization=true
1313
kotlin.mpp.androidSourceSetLayoutVersion=2
1414
kotlin.mpp.androidGradlePluginCompatibility.nowarn=true
15+
#kotlin.native.cacheKind=none
16+
#compose.kotlin.native.manageCacheKind=false
1517

1618
org.jetbrains.compose.experimental.uikit.enabled=true
1719

gradle/libs.versions.toml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ compileSdk = "34"
33
targetSdk = "34"
44
minSdk = "21"
55
jdk = "17"
6-
kotlin = "2.0.0"
7-
agp = "8.4.2"
6+
kotlin = "2.0.20-Beta1"
7+
agp = "8.5.0"
88
gms = "4.4.2"
9-
crashlytics = "3.0.1"
9+
crashlytics = "3.0.2"
1010
compose = "1.6.11"
1111
composeCompiler = "1.5.14"
1212
coroutines = "1.8.1"
@@ -17,31 +17,31 @@ androidSqlCipher = "4.5.4"
1717
iosSqlCipher = "4.5.4"
1818
sqlcipherKtnPod = "1.4.2"
1919
decompose = "2.2.2-compose-experimental"
20-
koin = "3.5.3"
21-
kotlinx-serialization = "1.6.3"
20+
koin = "3.5.6"
21+
kotlinx-serialization = "1.7.1"
2222
kotlinx-datetime = "0.6.0"
2323
napier = "2.7.1"
24-
mokoResources = "0.24.0"
25-
materialThemePrefs = "0.8.3"
24+
mokoResources = "0.24.1"
25+
materialThemePrefs = "0.8.5"
2626
androidxActivityCompose = "1.9.0"
27-
androidxComposeTest = "1.6.7"
27+
androidxComposeTest = "1.6.8"
2828
androidxCoreSplashscreen = "1.0.1"
2929
androidxLegacySupport = "1.0.0"
3030
androidxPreference = "1.2.1"
3131
androidxMultidex = "2.0.1"
3232
androidxTracing = "1.2.0"
33-
androidxLifecycle = "2.8.1"
33+
androidxLifecycle = "2.8.2"
3434
androidxArch = "2.2.0"
35-
androidxTestExt = "1.1.5"
36-
androidxTest = "1.5.2"
37-
androidxTestOrchestrator = "1.4.2"
35+
androidxTestExt = "1.2.1"
36+
androidxTest = "1.6.1"
37+
androidxTestOrchestrator = "1.5.0"
3838
googleAndroidMaterial = "1.12.0"
39-
firebase = "33.1.0"
39+
firebase = "33.1.1"
4040
leakCanary = "2.14"
4141
junit = "4.13.2"
42-
mockito = "5.11.0"
42+
mockito = "5.12.0"
4343
turbine = "1.1.0"
44-
espresso = "3.5.1"
44+
espresso = "3.6.1"
4545
desugar = "2.0.4"
4646
appdirs = "1.2.2"
4747

@@ -134,7 +134,7 @@ appdirs = { module = "net.harawata:appdirs", version.ref = "appdirs" }
134134

135135
espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "espresso" }
136136
espresso-contrib = { module = "androidx.test.espresso:espresso-contrib", version.ref = "espresso" }
137-
espresso-device = { module = "androidx.test.espresso:espresso-device", version = "1.0.0-rc01" }
137+
espresso-device = { module = "androidx.test.espresso:espresso-device", version = "1.0.1" }
138138
espresso-idling-resource = { module = "androidx.test.espresso:espresso-idling-resource", version.ref = "espresso" }
139139

140140
desugar = { module = "com.android.tools:desugar_jdk_libs", version.ref = "desugar" }

0 commit comments

Comments
 (0)