Skip to content

Commit 80dfcae

Browse files
committed
feat: Upgrade Kotlin and dependencies
- Bumps the Kotlin version to `2.3.0`. - Updates `androidxActivityCompose` to `1.12.2` and `androidxPaging` to `3.4.0-beta01`. - Adjusts several `.podspec` files to improve formatting and remove extra newlines. - Updates iOS `Podfile.lock`, `Manifest.lock` and `project.pbxproj` to reflect pod dependency changes.
1 parent fc7a70e commit 80dfcae

File tree

9 files changed

+82
-111
lines changed

9 files changed

+82
-111
lines changed

app/ios-kit/iosComposePod.podspec

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,36 +10,29 @@ Pod::Spec.new do |spec|
1010
spec.libraries = 'c++'
1111
spec.ios.deployment_target = '14.0'
1212
spec.dependency 'SQLCipher', '4.9.0'
13-
1413
if !Dir.exist?('build/cocoapods/framework/iosComposeKit.framework') || Dir.empty?('build/cocoapods/framework/iosComposeKit.framework')
1514
raise "
16-
1715
Kotlin framework 'iosComposeKit' doesn't exist yet, so a proper Xcode project can't be generated.
1816
'pod install' should be executed after running ':generateDummyFramework' Gradle task:
19-
2017
./gradlew :app:ios-kit:generateDummyFramework
21-
2218
Alternatively, proper pod installation is performed during Gradle sync in the IDE (if Podfile location is set)"
2319
end
24-
2520
spec.xcconfig = {
2621
'ENABLE_USER_SCRIPT_SANDBOXING' => 'NO',
2722
}
28-
2923
spec.pod_target_xcconfig = {
3024
'KOTLIN_PROJECT_PATH' => ':app:ios-kit',
3125
'PRODUCT_MODULE_NAME' => 'iosComposeKit',
3226
}
33-
3427
spec.script_phases = [
3528
{
3629
:name => 'Build iosComposePod',
3730
:execution_position => :before_compile,
3831
:shell_path => '/bin/sh',
3932
:script => <<-SCRIPT
4033
if [ "YES" = "$OVERRIDE_KOTLIN_BUILD_IDE_SUPPORTED" ]; then
41-
echo "Skipping Gradle build task invocation due to OVERRIDE_KOTLIN_BUILD_IDE_SUPPORTED environment variable set to \"YES\""
42-
exit 0
34+
echo "Skipping Gradle build task invocation due to OVERRIDE_KOTLIN_BUILD_IDE_SUPPORTED environment variable set to \"YES\""
35+
exit 0
4336
fi
4437
set -ev
4538
REPO_ROOT="$PODS_TARGET_SRCROOT"
@@ -51,4 +44,4 @@ Pod::Spec.new do |spec|
5144
}
5245
]
5346
spec.resources = ['build/compose/cocoapods/compose-resources']
54-
end
47+
end

app/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-kit"
2020

2121
SPEC CHECKSUMS:
22-
iosComposePod: 9106444f9d018732fcf752a393207ad26d3e0ecd
22+
iosComposePod: e02a81b83b7dfe14e51eb5f279798c6b3a0dcf30
2323
SQLCipher: 31878d8ebd27e5c96db0b7cb695c96e9f8ad77da
2424

2525
PODFILE CHECKSUM: e4bf9c79e44bb9be33331fce5a8a08847642ac70

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

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/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.

app/iosApp/Pods/Pods.xcodeproj/project.pbxproj

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

core/data/db-sqldelight/db_sqldelight.podspec

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,36 +10,29 @@ Pod::Spec.new do |spec|
1010
spec.libraries = 'c++'
1111
spec.ios.deployment_target = '14.0'
1212
spec.dependency 'SQLCipher', '4.9.0'
13-
1413
if !Dir.exist?('build/cocoapods/framework/db_sqldelight.framework') || Dir.empty?('build/cocoapods/framework/db_sqldelight.framework')
1514
raise "
16-
1715
Kotlin framework 'db_sqldelight' doesn't exist yet, so a proper Xcode project can't be generated.
1816
'pod install' should be executed after running ':generateDummyFramework' Gradle task:
19-
2017
./gradlew :core:data:db-sqldelight:generateDummyFramework
21-
2218
Alternatively, proper pod installation is performed during Gradle sync in the IDE (if Podfile location is set)"
2319
end
24-
2520
spec.xcconfig = {
2621
'ENABLE_USER_SCRIPT_SANDBOXING' => 'NO',
2722
}
28-
2923
spec.pod_target_xcconfig = {
3024
'KOTLIN_PROJECT_PATH' => ':core:data:db-sqldelight',
3125
'PRODUCT_MODULE_NAME' => 'db_sqldelight',
3226
}
33-
3427
spec.script_phases = [
3528
{
3629
:name => 'Build db_sqldelight',
3730
:execution_position => :before_compile,
3831
:shell_path => '/bin/sh',
3932
:script => <<-SCRIPT
4033
if [ "YES" = "$OVERRIDE_KOTLIN_BUILD_IDE_SUPPORTED" ]; then
41-
echo "Skipping Gradle build task invocation due to OVERRIDE_KOTLIN_BUILD_IDE_SUPPORTED environment variable set to \"YES\""
42-
exit 0
34+
echo "Skipping Gradle build task invocation due to OVERRIDE_KOTLIN_BUILD_IDE_SUPPORTED environment variable set to \"YES\""
35+
exit 0
4336
fi
4437
set -ev
4538
REPO_ROOT="$PODS_TARGET_SRCROOT"
@@ -50,5 +43,4 @@ Pod::Spec.new do |spec|
5043
SCRIPT
5144
}
5245
]
53-
54-
end
46+
end

gradle/libs.versions.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ compileSdk = "36"
33
targetSdk = "36"
44
minSdk = "23"
55
jdk = "17"
6-
kotlin = "2.2.21"
6+
kotlin = "2.3.0"
77
ksp = "2.3.2"
88
agp = "8.13.2"
99
gms = "4.4.4"
@@ -27,13 +27,13 @@ adaptive = "1.2.0"
2727
androidxAppcompat = "1.7.1"
2828
androidxViewModel = "2.9.6"
2929
androidxNavigation = "2.9.1"
30-
androidxActivityCompose = "1.12.1"
30+
androidxActivityCompose = "1.12.2"
3131
androidxComposeTest = "1.10.0"
3232
androidxCoreSplashscreen = "1.2.0"
3333
androidxTracing = "1.3.0"
3434
androidxLifecycle = "2.10.0"
3535
androidxArch = "2.2.0"
36-
androidxPaging = "3.4.0-alpha04"
36+
androidxPaging = "3.4.0-beta01"
3737
androidxTestExt = "1.3.0"
3838
androidxTest = "1.7.0"
3939
androidxTestOrchestrator = "1.6.1"

ui/shared/shared.podspec

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,36 +10,29 @@ Pod::Spec.new do |spec|
1010
spec.libraries = 'c++'
1111
spec.ios.deployment_target = '14.0'
1212
spec.dependency 'SQLCipher', '4.9.0'
13-
1413
if !Dir.exist?('build/cocoapods/framework/shared.framework') || Dir.empty?('build/cocoapods/framework/shared.framework')
1514
raise "
16-
1715
Kotlin framework 'shared' doesn't exist yet, so a proper Xcode project can't be generated.
1816
'pod install' should be executed after running ':generateDummyFramework' Gradle task:
19-
2017
./gradlew :ui:shared:generateDummyFramework
21-
2218
Alternatively, proper pod installation is performed during Gradle sync in the IDE (if Podfile location is set)"
2319
end
24-
2520
spec.xcconfig = {
2621
'ENABLE_USER_SCRIPT_SANDBOXING' => 'NO',
2722
}
28-
2923
spec.pod_target_xcconfig = {
3024
'KOTLIN_PROJECT_PATH' => ':ui:shared',
3125
'PRODUCT_MODULE_NAME' => 'shared',
3226
}
33-
3427
spec.script_phases = [
3528
{
3629
:name => 'Build shared',
3730
:execution_position => :before_compile,
3831
:shell_path => '/bin/sh',
3932
:script => <<-SCRIPT
4033
if [ "YES" = "$OVERRIDE_KOTLIN_BUILD_IDE_SUPPORTED" ]; then
41-
echo "Skipping Gradle build task invocation due to OVERRIDE_KOTLIN_BUILD_IDE_SUPPORTED environment variable set to \"YES\""
42-
exit 0
34+
echo "Skipping Gradle build task invocation due to OVERRIDE_KOTLIN_BUILD_IDE_SUPPORTED environment variable set to \"YES\""
35+
exit 0
4336
fi
4437
set -ev
4538
REPO_ROOT="$PODS_TARGET_SRCROOT"
@@ -51,4 +44,4 @@ Pod::Spec.new do |spec|
5144
}
5245
]
5346
spec.resources = ['build/compose/cocoapods/compose-resources']
54-
end
47+
end

0 commit comments

Comments
 (0)