Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id("convention.detekt")
id("com.autonomousapps.dependency-analysis") version "3.5.1"
id("com.autonomousapps.dependency-analysis") version "3.6.1"
}

buildscript {
Expand Down
14 changes: 3 additions & 11 deletions cmp-common/cmp_common.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -9,37 +9,29 @@ Pod::Spec.new do |spec|
spec.vendored_frameworks = 'build/cocoapods/framework/cmp_common.framework'
spec.libraries = 'c++'
spec.ios.deployment_target = '14.1'


if !Dir.exist?('build/cocoapods/framework/cmp_common.framework') || Dir.empty?('build/cocoapods/framework/cmp_common.framework')
raise "

Kotlin framework 'cmp_common' doesn't exist yet, so a proper Xcode project can't be generated.
'pod install' should be executed after running ':generateDummyFramework' Gradle task:

./gradlew :cmp-common:generateDummyFramework

Alternatively, proper pod installation is performed during Gradle sync in the IDE (if Podfile location is set)"
end

spec.xcconfig = {
'ENABLE_USER_SCRIPT_SANDBOXING' => 'NO',
}

spec.pod_target_xcconfig = {
'KOTLIN_PROJECT_PATH' => ':cmp-common',
'PRODUCT_MODULE_NAME' => 'cmp_common',
}

spec.script_phases = [
{
:name => 'Build cmp_common',
:execution_position => :before_compile,
:shell_path => '/bin/sh',
:script => <<-SCRIPT
if [ "YES" = "$OVERRIDE_KOTLIN_BUILD_IDE_SUPPORTED" ]; then
echo "Skipping Gradle build task invocation due to OVERRIDE_KOTLIN_BUILD_IDE_SUPPORTED environment variable set to \"YES\""
exit 0
echo "Skipping Gradle build task invocation due to OVERRIDE_KOTLIN_BUILD_IDE_SUPPORTED environment variable set to \"YES\""
exit 0
fi
set -ev
REPO_ROOT="$PODS_TARGET_SRCROOT"
Expand All @@ -51,4 +43,4 @@ Pod::Spec.new do |spec|
}
]
spec.resources = ['build/compose/cocoapods/compose-resources']
end
end
38 changes: 19 additions & 19 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,32 +3,32 @@ targetSdk = "36"
compileSdk = "36"
minSdk = "26"

kotlin = "2.2.21" # https://github.com/JetBrains/kotlin/releases
ksp = "2.3.3" # https://github.com/google/ksp/releases
kotlin = "2.3.10" # https://github.com/JetBrains/kotlin/releases
ksp = "2.3.6" # https://github.com/google/ksp/releases

compose = "1.10.0" # https://developer.android.com/jetpack/androidx/releases/compose-ui
jetbrainsCompose = "1.10.0-beta01" # https://github.com/JetBrains/compose-multiplatform/releases
hotReload = "1.0.0-rc03" # https://github.com/JetBrains/compose-hot-reload/releases
compose = "1.10.4" # https://developer.android.com/jetpack/androidx/releases/compose-ui
jetbrainsCompose = "1.10.2" # https://github.com/JetBrains/compose-multiplatform/releases
hotReload = "1.0.0" # https://github.com/JetBrains/compose-hot-reload/releases

agp = "8.13.1" # https://developer.android.com/studio/releases/gradle-plugin
ktor = "3.3.3" # https://github.com/ktorio/ktor
agp = "8.13.2" # https://developer.android.com/studio/releases/gradle-plugin
ktor = "3.4.0" # https://github.com/ktorio/ktor
androidxRoom = "2.8.4" # https://developer.android.com/jetpack/androidx/releases/room
sqlite = "2.6.2" # https://developer.android.com/jetpack/androidx/releases/sqlite
screenshot = "0.0.1-alpha12"
screenshot = "0.0.1-alpha13"

decompose = "3.4.0"
essenty = "2.5.0"
jetbrainsKotlinWrappers = "2025.12.1"
jetbrainsKotlinWrappers = "2026.2.24"


detekt = "1.23.8" # https://github.com/detekt/detekt
detektCompose = "0.5.0" # https://github.com/mrmans0n/compose-rules
detektCompose = "0.5.6" # https://github.com/mrmans0n/compose-rules
detektDecompose = "0.2.0" # https://github.com/AJIEKCX/decompose-detekt-rules
wearCompose = "1.5.6" # https://developer.android.com/jetpack/androidx/releases/wear-compose

cupertino = "2.3.1" # https://github.com/schott12521/compose-cupertino

coil = "3.3.0" # https://github.com/coil-kt/coil/releases
coil = "3.4.0" # https://github.com/coil-kt/coil/releases
coroutines = "1.10.2" # https://github.com/Kotlin/kotlinx.coroutines
datastore = "1.3.0-alpha02" # https://developer.android.com/jetpack/androidx/releases/datastore
koin = "4.1.1" # https://github.com/InsertKoinIO/koin#setup--current-version
Expand All @@ -39,8 +39,8 @@ sqldelight = "2.2.1" # https://github.com/cashapp/sqldelight/releases
sqljs = "1.8.0" # https://github.com/sqldelight/sqldelight/blob/master/gradle/libs.versions.toml

material = "1.13.0" # https://github.com/material-components/material-components-android
vico = "2.3.6"
protobuf = "4.33.1"
vico = "2.4.3"
protobuf = "4.34.0"

[libraries]
cmp-components-resources = { module = "org.jetbrains.compose.components:components-resources", version.ref = "jetbrainsCompose" }
Expand All @@ -57,7 +57,7 @@ androidGradle = { module = "com.android.tools.build:gradle", version.ref = "agp"
roomGradle = { module = "androidx.room:androidx.room.gradle.plugin", version.ref = "androidxRoom" }
detektGradle = { module = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin", version.ref = "detekt" }
composeKotlinGradle = { module = "org.jetbrains.kotlin:compose-compiler-gradle-plugin", version.ref = "kotlin" }
protobufGradle = { module = "com.google.protobuf:protobuf-gradle-plugin", version = "0.9.5" }
protobufGradle = { module = "com.google.protobuf:protobuf-gradle-plugin", version = "0.9.6" }
secretsGradle = "com.google.android.libraries.mapsplatform.secrets-gradle-plugin:secrets-gradle-plugin:2.0.1"
kspGradle = { module = "com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin", version.ref = "ksp" }
screenshotGradle = { module = "com.android.compose.screenshot:screenshot-test-gradle-plugin", version.ref = "screenshot"}
Expand All @@ -83,11 +83,11 @@ compose-preview = { module = "androidx.compose.ui:ui-tooling-preview", version.r
compose-icons-core = "androidx.compose.material:material-icons-core:1.7.8"
material-icons-core = "org.jetbrains.compose.material:material-icons-core:1.7.3"

compose-activity = "androidx.activity:activity-compose:1.12.1" # https://developer.android.com/jetpack/androidx/releases/activity # androidx-activity-compose
compose-activity = "androidx.activity:activity-compose:1.12.4" # https://developer.android.com/jetpack/androidx/releases/activity # androidx-activity-compose

compose-uiTestJunit4 = { module = "androidx.compose.ui:ui-test-junit4", version.ref = "compose" }
kakao-compose = { module = "io.github.kakaocup:compose", version = "1.0.0" }
robolectric = { module = "org.robolectric:robolectric", version = "4.16" }
kakao-compose = { module = "io.github.kakaocup:compose", version = "1.1.0" }
robolectric = { module = "org.robolectric:robolectric", version = "4.16.1" }

composeWear-material = { module = "androidx.wear.compose:compose-material", version.ref = "wearCompose" }
composeWear-foundation = { module = "androidx.wear.compose:compose-foundation", version.ref = "wearCompose" }
Expand Down Expand Up @@ -119,8 +119,8 @@ glance-appwidget = { module = "androidx.glance:glance-appwidget", version.ref =
glance-preview = { module = "androidx.glance:glance-preview", version.ref = "glance" }
glance-appwidget-preview = { module = "androidx.glance:glance-appwidget-preview", version.ref = "glance" }

google-maps-utils = "com.google.maps.android:maps-ktx:5.2.1"
google-maps-compose = "com.google.maps.android:maps-compose:6.12.2"
google-maps-utils = "com.google.maps.android:maps-ktx:6.0.0"
google-maps-compose = "com.google.maps.android:maps-compose:8.2.0"


material = { module = "com.google.android.material:material", version.ref = "material" }
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
networkTimeout=10000
Loading