Skip to content

Commit 5e879c5

Browse files
committed
update libs
1 parent 33a7428 commit 5e879c5

7 files changed

Lines changed: 33 additions & 16 deletions

File tree

gradle/libs.versions.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
[versions]
22
kronos = "0.0.1"
33
lyft-kronos = "0.0.1-alpha11"
4-
kotlin = "1.8.20"
5-
agp = "8.0.1"
6-
compose = "1.4.0"
4+
kotlin = "1.9.0"
5+
agp = "8.1.0"
6+
compose = "1.5.0-rc01"
77
androidx-appcompat = "1.6.1"
8-
androidx-activityCompose = "1.7.0"
8+
androidx-activityCompose = "1.7.2"
99
androidx-test = "1.5.0"
10-
compose-uitooling = "1.4.0"
10+
compose-uitooling = "1.5.0"
1111
napier = "2.6.1"
12-
kotlinx-coroutines = "1.6.4"
12+
kotlinx-coroutines = "1.7.3"
1313
kotlinx-datetime = "0.4.0"
1414
swift-klib = "0.2.1"
1515

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Wed May 03 21:26:25 GET 2023
1+
#Sun Aug 20 02:04:34 GET 2023
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-all.zip
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

iosApp/Podfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ EXTERNAL SOURCES:
99
:path: "../sampleApp"
1010

1111
SPEC CHECKSUMS:
12-
sampleApp: edaddecea9407fd3435157244bdbed90f2dffe7b
12+
sampleApp: f9d38db31c891574361846981da83fb394e5f331
1313

1414
PODFILE CHECKSUM: 31aecb1c889393f7cb5f9aac6f63f896eb049a8e
1515

16-
COCOAPODS: 1.11.3
16+
COCOAPODS: 1.12.1

iosApp/iosApp.xcodeproj/project.pbxproj

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +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-
A93A953729CC810C00F8E227 /* Kronos Multiplatform.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Kronos Multiplatform.app"; sourceTree = BUILT_PRODUCTS_DIR; };
19+
A93A953729CC810C00F8E227 /* Kronos Multiplatform.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Kronos Multiplatform.app"; sourceTree = BUILT_PRODUCTS_DIR; };
2020
A93A953A29CC810C00F8E227 /* iosApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iosApp.swift; sourceTree = "<group>"; };
2121
A93A953E29CC810D00F8E227 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
2222
A93A954129CC810D00F8E227 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; };
@@ -99,6 +99,7 @@
9999
A93A953329CC810C00F8E227 /* Sources */,
100100
A93A953429CC810C00F8E227 /* Frameworks */,
101101
A93A953529CC810C00F8E227 /* Resources */,
102+
FC29032C0717E1CCFA494848 /* [CP] Copy Pods Resources */,
102103
);
103104
buildRules = (
104105
);
@@ -177,6 +178,23 @@
177178
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
178179
showEnvVarsInLog = 0;
179180
};
181+
FC29032C0717E1CCFA494848 /* [CP] Copy Pods Resources */ = {
182+
isa = PBXShellScriptBuildPhase;
183+
buildActionMask = 2147483647;
184+
files = (
185+
);
186+
inputFileListPaths = (
187+
"${PODS_ROOT}/Target Support Files/Pods-iosApp/Pods-iosApp-resources-${CONFIGURATION}-input-files.xcfilelist",
188+
);
189+
name = "[CP] Copy Pods Resources";
190+
outputFileListPaths = (
191+
"${PODS_ROOT}/Target Support Files/Pods-iosApp/Pods-iosApp-resources-${CONFIGURATION}-output-files.xcfilelist",
192+
);
193+
runOnlyForDeploymentPostprocessing = 0;
194+
shellPath = /bin/sh;
195+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-iosApp/Pods-iosApp-resources.sh\"\n";
196+
showEnvVarsInLog = 0;
197+
};
180198
/* End PBXShellScriptBuildPhase section */
181199

182200
/* Begin PBXSourcesBuildPhase section */

kronos/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ kotlin {
7777

7878
android {
7979
namespace = "com.softartdev.kronos"
80-
compileSdk = 33
80+
compileSdk = 34
8181
defaultConfig {
8282
minSdk = 21
8383
}

sampleApp/build.gradle.kts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ kotlin {
3535
baseName = "ComposeApp"
3636
isStatic = true
3737
}
38-
extraSpecAttributes["resources"] = "['src/commonMain/resources/**']"
3938
}
4039

4140
sourceSets {
@@ -84,11 +83,11 @@ kotlin {
8483

8584
android {
8685
namespace = "com.softartdev.kronos.sample"
87-
compileSdk = 33
86+
compileSdk = 34
8887

8988
defaultConfig {
9089
minSdk = 21
91-
targetSdk = 33
90+
targetSdk = 34
9291

9392
applicationId = "com.softartdev.kronos.sample"
9493
versionCode = 1

sampleApp/sampleApp.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,5 @@ Pod::Spec.new do |spec|
3535
SCRIPT
3636
}
3737
]
38-
spec.resources = ['src/commonMain/resources/**']
38+
spec.resources = ['build/compose/ios/ComposeApp/compose-resources']
3939
end

0 commit comments

Comments
 (0)