Skip to content

Commit d606437

Browse files
softartdevsoftartdev
committed
update libs
1 parent 6905593 commit d606437

10 files changed

Lines changed: 53 additions & 23 deletions

File tree

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,4 @@ xcuserdata/
1313
Pods/
1414
*.jks
1515
*yarn.lock
16+
/.kotlin

‎build.gradle.kts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
plugins {
22
alias(libs.plugins.multiplatform).apply(false)
3+
alias(libs.plugins.compose.compiler).apply(false)
34
alias(libs.plugins.compose).apply(false)
45
alias(libs.plugins.cocoapods).apply(false)
56
alias(libs.plugins.android.application).apply(false)

‎gradle/libs.versions.toml‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
[versions]
22
kronos = "0.0.1"
33
lyft-kronos = "0.0.1-alpha11"
4-
kotlin = "1.9.0"
5-
agp = "8.1.0"
6-
compose = "1.5.0-rc01"
7-
androidx-appcompat = "1.6.1"
8-
androidx-activityCompose = "1.7.2"
9-
androidx-test = "1.5.0"
10-
compose-uitooling = "1.5.0"
11-
napier = "2.6.1"
12-
kotlinx-coroutines = "1.7.3"
13-
kotlinx-datetime = "0.4.0"
14-
swift-klib = "0.2.1"
4+
kotlin = "2.0.21"
5+
agp = "8.7.2"
6+
compose = "1.7.1"
7+
androidx-appcompat = "1.7.0"
8+
androidx-activityCompose = "1.9.3"
9+
androidx-test = "1.6.1"
10+
compose-uitooling = "1.7.5"
11+
napier = "2.7.1"
12+
kotlinx-coroutines = "1.9.0"
13+
kotlinx-datetime = "0.6.1"
14+
swift-klib = "0.6.4"
1515

1616
[libraries]
1717
kronos = { module = "io.github.softartdev:kronos", version.ref = "kronos" }
@@ -30,6 +30,7 @@ kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.
3030
[plugins]
3131
multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
3232
cocoapods = { id = "org.jetbrains.kotlin.native.cocoapods", version.ref = "kotlin" }
33+
compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
3334
compose = { id = "org.jetbrains.compose", version.ref = "compose" }
3435
android-application = { id = "com.android.application", version.ref = "agp" }
3536
android-library = { id = "com.android.library", version.ref = "agp" }

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
#Sun Aug 20 02:04:34 GET 2023
1+
#Sun Nov 24 21:32:10 GET 2024
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
5+
networkTimeout=10000
6+
validateDistributionUrl=true
57
zipStoreBase=GRADLE_USER_HOME
68
zipStorePath=wrapper/dists

‎iosApp/Podfile.lock‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ EXTERNAL SOURCES:
99
:path: "../sampleApp"
1010

1111
SPEC CHECKSUMS:
12-
sampleApp: f9d38db31c891574361846981da83fb394e5f331
12+
sampleApp: 74ffcffb09857e525c843f48fcd5511e65e94800
1313

1414
PODFILE CHECKSUM: 31aecb1c889393f7cb5f9aac6f63f896eb049a8e
1515

‎iosApp/iosApp.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
/* Begin PBXFileReference section */
1717
05E67C72B2BDBC81379103CB /* Pods-iosApp.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-iosApp.release.xcconfig"; path = "Target Support Files/Pods-iosApp/Pods-iosApp.release.xcconfig"; sourceTree = "<group>"; };
1818
73FFDDCA9C728FEE3DFEF2F4 /* Pods-iosApp.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-iosApp.debug.xcconfig"; path = "Target Support Files/Pods-iosApp/Pods-iosApp.debug.xcconfig"; sourceTree = "<group>"; };
19+
751C49B92CF2A16F00D81888 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
1920
A93A953729CC810C00F8E227 /* Kronos Multiplatform.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Kronos Multiplatform.app"; sourceTree = BUILT_PRODUCTS_DIR; };
2021
A93A953A29CC810C00F8E227 /* iosApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iosApp.swift; sourceTree = "<group>"; };
2122
A93A953E29CC810D00F8E227 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
@@ -65,6 +66,7 @@
6566
A93A953929CC810C00F8E227 /* iosApp */ = {
6667
isa = PBXGroup;
6768
children = (
69+
751C49B92CF2A16F00D81888 /* Info.plist */,
6870
A93A953A29CC810C00F8E227 /* iosApp.swift */,
6971
A93A953E29CC810D00F8E227 /* Assets.xcassets */,
7072
A93A954029CC810D00F8E227 /* Preview Content */,
@@ -334,6 +336,7 @@
334336
DEVELOPMENT_ASSET_PATHS = "\"iosApp/Preview Content\"";
335337
ENABLE_PREVIEWS = YES;
336338
GENERATE_INFOPLIST_FILE = YES;
339+
INFOPLIST_FILE = iosApp/Info.plist;
337340
INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
338341
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
339342
INFOPLIST_KEY_UILaunchScreen_Generation = YES;
@@ -363,6 +366,7 @@
363366
DEVELOPMENT_ASSET_PATHS = "\"iosApp/Preview Content\"";
364367
ENABLE_PREVIEWS = YES;
365368
GENERATE_INFOPLIST_FILE = YES;
369+
INFOPLIST_FILE = iosApp/Info.plist;
366370
INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
367371
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
368372
INFOPLIST_KEY_UILaunchScreen_Generation = YES;

‎iosApp/iosApp/Info.plist‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>CADisableMinimumFrameDurationOnPhone</key>
6+
<true/>
7+
</dict>
8+
</plist>

‎kronos/src/iosMain/kotlin/com/softartdev/kronos/IosNetworkClock.kt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1+
@file:OptIn(ExperimentalForeignApi::class)
2+
13
package com.softartdev.kronos
24

5+
import kotlinx.cinterop.ExperimentalForeignApi
36
import platform.Foundation.NSDate
47
import platform.Foundation.NSNumber
58
import platform.Foundation.timeIntervalSince1970

‎sampleApp/build.gradle.kts‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import org.jetbrains.compose.desktop.application.dsl.TargetFormat
55

66
plugins {
77
alias(libs.plugins.multiplatform)
8+
alias(libs.plugins.compose.compiler)
89
alias(libs.plugins.compose)
910
alias(libs.plugins.cocoapods)
1011
alias(libs.plugins.android.application)
@@ -14,13 +15,7 @@ group = "com.softartdev.kronos.sample"
1415
kotlin {
1516
jvmToolchain(11)
1617
jvm("desktop")
17-
android {
18-
compilations.all {
19-
kotlinOptions {
20-
jvmTarget = "11"
21-
}
22-
}
23-
}
18+
androidTarget()
2419
iosX64()
2520
iosArm64()
2621
iosSimulatorArm64()

‎sampleApp/sampleApp.podspec‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,24 @@ Pod::Spec.new do |spec|
88
spec.summary = 'Compose application framework'
99
spec.vendored_frameworks = 'build/cocoapods/framework/ComposeApp.framework'
1010
spec.libraries = 'c++'
11-
spec.ios.deployment_target = '14.1'
11+
spec.ios.deployment_target = '14.1'
1212

1313

14+
if !Dir.exist?('build/cocoapods/framework/ComposeApp.framework') || Dir.empty?('build/cocoapods/framework/ComposeApp.framework')
15+
raise "
16+
17+
Kotlin framework 'ComposeApp' doesn't exist yet, so a proper Xcode project can't be generated.
18+
'pod install' should be executed after running ':generateDummyFramework' Gradle task:
19+
20+
./gradlew :sampleApp:generateDummyFramework
21+
22+
Alternatively, proper pod installation is performed during Gradle sync in the IDE (if Podfile location is set)"
23+
end
24+
25+
spec.xcconfig = {
26+
'ENABLE_USER_SCRIPT_SANDBOXING' => 'NO',
27+
}
28+
1429
spec.pod_target_xcconfig = {
1530
'KOTLIN_PROJECT_PATH' => ':sampleApp',
1631
'PRODUCT_MODULE_NAME' => 'ComposeApp',
@@ -35,5 +50,5 @@ Pod::Spec.new do |spec|
3550
SCRIPT
3651
}
3752
]
38-
spec.resources = ['build/compose/ios/ComposeApp/compose-resources']
53+
spec.resources = ['build/compose/cocoapods/compose-resources']
3954
end

0 commit comments

Comments
 (0)