diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 25ce022..51e1c8d 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -55,7 +55,7 @@ dependencies { implementation("com.google.android.material:material:1.3.0") implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.4.0-alpha01") implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.0-alpha01") - implementation("androidx.activity:activity-compose:1.3.0-alpha05") + implementation("androidx.activity:activity-compose:1.3.0-alpha07") implementation(Compose.ui) diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt index c805d13..c39fa0b 100644 --- a/buildSrc/src/main/java/Dependencies.kt +++ b/buildSrc/src/main/java/Dependencies.kt @@ -1,9 +1,9 @@ object Versions { - const val kotlin = "1.4.32" - const val kotlinCoroutines = "1.4.3-native-mt" - const val ktor = "1.5.3" - const val kotlinxSerialization = "1.1.0" + const val kotlin = "1.5.0" + const val kotlinCoroutines = "1.5.0-native-mt" + const val ktor = "1.6.0" + const val kotlinxSerialization = "1.2.1" const val koin = "3.0.2" const val sqlDelight = "1.5.0" const val kermit = "0.1.9" diff --git a/compose-desktop/build.gradle.kts b/compose-desktop/build.gradle.kts index 16a4b27..31485bf 100644 --- a/compose-desktop/build.gradle.kts +++ b/compose-desktop/build.gradle.kts @@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { kotlin("jvm") - id("org.jetbrains.compose") version "0.4.0-build179" + id("org.jetbrains.compose") version "0.4.0-build189" application } diff --git a/ios/PeopleInSpaceSwiftUI/PeopleInSpaceSwiftUI.xcodeproj/project.pbxproj b/ios/PeopleInSpaceSwiftUI/PeopleInSpaceSwiftUI.xcodeproj/project.pbxproj index f05c804..b31db3a 100644 --- a/ios/PeopleInSpaceSwiftUI/PeopleInSpaceSwiftUI.xcodeproj/project.pbxproj +++ b/ios/PeopleInSpaceSwiftUI/PeopleInSpaceSwiftUI.xcodeproj/project.pbxproj @@ -9,7 +9,6 @@ /* Begin PBXBuildFile section */ 1A40FE1923DB5C35008428A6 /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A40FE1823DB5C35008428A6 /* libsqlite3.tbd */; }; 1AA82EED25052E1E00193051 /* ImageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1AA82EEC25052E1E00193051 /* ImageView.swift */; }; - 1ABA38FF258B6705000F7CBD /* src in Resources */ = {isa = PBXBuildFile; fileRef = 1ABA38FE258B6705000F7CBD /* src */; }; 1ABD44FA23B00008008387E3 /* ViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1ABD44F923B00008008387E3 /* ViewModel.swift */; }; 1ABFB8BE23AFF5CC003D807E /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1ABFB8BD23AFF5CC003D807E /* AppDelegate.swift */; }; 1ABFB8C023AFF5CC003D807E /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1ABFB8BF23AFF5CC003D807E /* SceneDelegate.swift */; }; @@ -25,7 +24,6 @@ /* Begin PBXFileReference section */ 1A40FE1823DB5C35008428A6 /* libsqlite3.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.tbd; path = usr/lib/libsqlite3.tbd; sourceTree = SDKROOT; }; 1AA82EEC25052E1E00193051 /* ImageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageView.swift; sourceTree = ""; }; - 1ABA38FE258B6705000F7CBD /* src */ = {isa = PBXFileReference; lastKnownFileType = folder; name = src; path = ../../../common/src; sourceTree = ""; }; 1ABD44F923B00008008387E3 /* ViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewModel.swift; sourceTree = ""; }; 1ABFB8BA23AFF5CC003D807E /* PeopleInSpaceSwiftUI.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = PeopleInSpaceSwiftUI.app; sourceTree = BUILT_PRODUCTS_DIR; }; 1ABFB8BD23AFF5CC003D807E /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; @@ -64,18 +62,9 @@ path = Pods; sourceTree = ""; }; - 1ABA38FD258B66E3000F7CBD /* SharedCode */ = { - isa = PBXGroup; - children = ( - 1ABA38FE258B6705000F7CBD /* src */, - ); - path = SharedCode; - sourceTree = ""; - }; 1ABFB8B123AFF5CC003D807E = { isa = PBXGroup; children = ( - 1ABA38FD258B66E3000F7CBD /* SharedCode */, 1ABFB8BC23AFF5CC003D807E /* PeopleInSpaceSwiftUI */, 1ABFB8BB23AFF5CC003D807E /* Products */, 0682AAA6A83414CA1CC104C4 /* Pods */, @@ -188,7 +177,6 @@ 1ABFB8CA23AFF5CE003D807E /* LaunchScreen.storyboard in Resources */, 1ABFB8C723AFF5CE003D807E /* Preview Assets.xcassets in Resources */, 1ABFB8C423AFF5CE003D807E /* Assets.xcassets in Resources */, - 1ABA38FF258B6705000F7CBD /* src in Resources */, ); runOnlyForDeploymentPostprocessing = 0; };