Skip to content

Commit 0dcd4fa

Browse files
committed
updates: kotlin 2.0.0, etc
1 parent 9fc52de commit 0dcd4fa

19 files changed

Lines changed: 65 additions & 43 deletions

File tree

android-compose-app/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ plugins {
88
alias(libs.plugins.android.application)
99
alias(libs.plugins.kotlin.android)
1010
alias(libs.plugins.compose)
11+
alias(libs.plugins.compose.compiler)
1112
alias(libs.plugins.gms)
1213
alias(libs.plugins.crashlytics)
1314
}

build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ plugins {
66
alias(libs.plugins.kotlin.serialization) apply false
77
alias(libs.plugins.kotlin.cocoapods) apply false
88
alias(libs.plugins.compose) apply false
9+
alias(libs.plugins.compose.compiler) apply false
910
alias(libs.plugins.android.application) apply false
1011
alias(libs.plugins.android.library) apply false
1112
alias(libs.plugins.sqlDelight) apply false

desktop-compose-app/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import org.jetbrains.compose.desktop.application.dsl.TargetFormat
33
plugins {
44
alias(libs.plugins.kotlin.multiplatform)
55
alias(libs.plugins.compose)
6+
alias(libs.plugins.compose.compiler)
67
}
78
group = "com.softartdev"
89

gradle/libs.versions.toml

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ compileSdk = "34"
33
targetSdk = "34"
44
minSdk = "21"
55
jdk = "17"
6-
kotlin = "1.9.24"
7-
agp = "8.4.1"
8-
gms = "4.4.1"
6+
kotlin = "2.0.0"
7+
agp = "8.4.2"
8+
gms = "4.4.2"
99
crashlytics = "3.0.1"
10-
compose = "1.6.10"
10+
compose = "1.6.11"
1111
composeCompiler = "1.5.14"
12-
coroutines = "1.8.0"
12+
coroutines = "1.8.1"
1313
sqlDelight = "2.0.2"
1414
androidxSqlite = "2.4.0"
1515
saferoom = "1.3.0"
@@ -19,24 +19,24 @@ sqlcipherKtnPod = "1.4.2"
1919
decompose = "2.2.2-compose-experimental"
2020
koin = "3.5.3"
2121
kotlinx-serialization = "1.6.3"
22-
kotlinx-datetime = "0.5.0"
22+
kotlinx-datetime = "0.6.0"
2323
napier = "2.7.1"
24-
mokoResources = "0.24.0-beta-5"
25-
materialThemePrefs = "0.8.1"
24+
mokoResources = "0.24.0"
25+
materialThemePrefs = "0.8.3"
2626
androidxActivityCompose = "1.9.0"
2727
androidxComposeTest = "1.6.7"
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.0"
33+
androidxLifecycle = "2.8.1"
3434
androidxArch = "2.2.0"
3535
androidxTestExt = "1.1.5"
3636
androidxTest = "1.5.2"
3737
androidxTestOrchestrator = "1.4.2"
3838
googleAndroidMaterial = "1.12.0"
39-
firebase = "33.0.0"
39+
firebase = "33.1.0"
4040
leakCanary = "2.14"
4141
junit = "4.13.2"
4242
mockito = "5.11.0"
@@ -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-alpha08" }
137+
espresso-device = { module = "androidx.test.espresso:espresso-device", version = "1.0.0-rc01" }
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" }
@@ -147,6 +147,7 @@ kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
147147
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
148148
kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
149149
kotlin-cocoapods = { id = "org.jetbrains.kotlin.native.cocoapods", version.ref = "kotlin" }
150+
compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
150151
compose = { id = "org.jetbrains.compose", version.ref = "compose" }
151152
android-application = { id = "com.android.application", version.ref = "agp" }
152153
android-library = { id = "com.android.library", version.ref = "agp" }
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Fri Apr 05 16:36:26 GET 2024
1+
#Wed Jun 12 03:28:45 GET 2024
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

ios-compose-kit/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ plugins {
44
alias(libs.plugins.kotlin.multiplatform)
55
alias(libs.plugins.kotlin.cocoapods)
66
alias(libs.plugins.compose)
7+
alias(libs.plugins.compose.compiler)
78
}
89
compose {
910
kotlinCompilerPlugin.set(libs.versions.composeCompiler.get())

ios-compose-kit/iosComposePod.podspec

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Pod::Spec.new do |spec|
88
spec.summary = 'Common UI-kit for the NoteDelight app'
99
spec.vendored_frameworks = 'build/cocoapods/framework/iosComposeKit.framework'
1010
spec.libraries = 'c++'
11-
spec.ios.deployment_target = '14.1'
11+
spec.ios.deployment_target = '14.1'
1212
spec.dependency 'SQLCipher', '4.5.4'
1313

1414
if !Dir.exist?('build/cocoapods/framework/iosComposeKit.framework') || Dir.empty?('build/cocoapods/framework/iosComposeKit.framework')
@@ -22,6 +22,10 @@ Pod::Spec.new do |spec|
2222
Alternatively, proper pod installation is performed during Gradle sync in the IDE (if Podfile location is set)"
2323
end
2424

25+
spec.xcconfig = {
26+
'ENABLE_USER_SCRIPT_SANDBOXING' => 'NO',
27+
}
28+
2529
spec.pod_target_xcconfig = {
2630
'KOTLIN_PROJECT_PATH' => ':ios-compose-kit',
2731
'PRODUCT_MODULE_NAME' => 'iosComposeKit',

iosApp/Podfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ EXTERNAL SOURCES:
1919
:path: "../ios-compose-kit"
2020

2121
SPEC CHECKSUMS:
22-
iosComposePod: 990ac956967f04395c98fc0610af2a907d3a90e4
22+
iosComposePod: 6b1a3839625a6f599db79573723c6c16d038f9d4
2323
SQLCipher: 905b145f65f349f26da9e60a19901ad24adcd381
2424

2525
PODFILE CHECKSUM: 0dc93a6f6109335ea8cd3f91d2c87cc8c99f04a3

iosApp/Pods/Local Podspecs/iosComposePod.podspec.json

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

iosApp/Pods/Manifest.lock

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

0 commit comments

Comments
 (0)