Skip to content

Commit

Permalink
kotlin 2 + update libs
Browse files Browse the repository at this point in the history
  • Loading branch information
softartdev committed Jul 5, 2024
1 parent 0dcd4fa commit 806b8d6
Show file tree
Hide file tree
Showing 6 changed files with 120 additions and 140 deletions.
4 changes: 2 additions & 2 deletions android-compose-app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ android {
applicationId = "com.softartdev.noteroom"
minSdk = libs.versions.minSdk.get().toInt()
targetSdk = libs.versions.targetSdk.get().toInt()
versionCode = 834
versionName = "8.3.4"
versionCode = 835
versionName = "8.3.5"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
testInstrumentationRunnerArguments["clearPackageData"] = "true"
vectorDrawables.useSupportLibrary = true
Expand Down
2 changes: 1 addition & 1 deletion desktop-compose-app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ compose {
nativeDistributions {
targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb)
packageName = "Note Delight"
packageVersion = "1.1.4"
packageVersion = "1.1.5"
description = "Note app with encryption"
copyright = "© 2023 SoftArtDev"
macOS.iconFile.set(project.file("src/jvmMain/resources/app_icon.icns"))
Expand Down
2 changes: 2 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ kotlin.code.style=official
kotlin.mpp.enableCInteropCommonization=true
kotlin.mpp.androidSourceSetLayoutVersion=2
kotlin.mpp.androidGradlePluginCompatibility.nowarn=true
#kotlin.native.cacheKind=none
#compose.kotlin.native.manageCacheKind=false

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

Expand Down
32 changes: 16 additions & 16 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ compileSdk = "34"
targetSdk = "34"
minSdk = "21"
jdk = "17"
kotlin = "2.0.0"
agp = "8.4.2"
kotlin = "2.0.20-Beta1"
agp = "8.5.0"
gms = "4.4.2"
crashlytics = "3.0.1"
crashlytics = "3.0.2"
compose = "1.6.11"
composeCompiler = "1.5.14"
coroutines = "1.8.1"
Expand All @@ -17,31 +17,31 @@ androidSqlCipher = "4.5.4"
iosSqlCipher = "4.5.4"
sqlcipherKtnPod = "1.4.2"
decompose = "2.2.2-compose-experimental"
koin = "3.5.3"
kotlinx-serialization = "1.6.3"
koin = "3.5.6"
kotlinx-serialization = "1.7.1"
kotlinx-datetime = "0.6.0"
napier = "2.7.1"
mokoResources = "0.24.0"
materialThemePrefs = "0.8.3"
mokoResources = "0.24.1"
materialThemePrefs = "0.8.5"
androidxActivityCompose = "1.9.0"
androidxComposeTest = "1.6.7"
androidxComposeTest = "1.6.8"
androidxCoreSplashscreen = "1.0.1"
androidxLegacySupport = "1.0.0"
androidxPreference = "1.2.1"
androidxMultidex = "2.0.1"
androidxTracing = "1.2.0"
androidxLifecycle = "2.8.1"
androidxLifecycle = "2.8.2"
androidxArch = "2.2.0"
androidxTestExt = "1.1.5"
androidxTest = "1.5.2"
androidxTestOrchestrator = "1.4.2"
androidxTestExt = "1.2.1"
androidxTest = "1.6.1"
androidxTestOrchestrator = "1.5.0"
googleAndroidMaterial = "1.12.0"
firebase = "33.1.0"
firebase = "33.1.1"
leakCanary = "2.14"
junit = "4.13.2"
mockito = "5.11.0"
mockito = "5.12.0"
turbine = "1.1.0"
espresso = "3.5.1"
espresso = "3.6.1"
desugar = "2.0.4"
appdirs = "1.2.2"

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

espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "espresso" }
espresso-contrib = { module = "androidx.test.espresso:espresso-contrib", version.ref = "espresso" }
espresso-device = { module = "androidx.test.espresso:espresso-device", version = "1.0.0-rc01" }
espresso-device = { module = "androidx.test.espresso:espresso-device", version = "1.0.1" }
espresso-idling-resource = { module = "androidx.test.espresso:espresso-idling-resource", version.ref = "espresso" }

desugar = { module = "com.android.tools:desugar_jdk_libs", version.ref = "desugar" }
Expand Down
Loading

0 comments on commit 806b8d6

Please sign in to comment.