Skip to content

Commit

Permalink
Ktor 2.0.0-beta-1, Coroutines 1.6 and KMP-NativeCoroutines 0.11.1-new-mm
Browse files Browse the repository at this point in the history
  • Loading branch information
joreilly committed Dec 23, 2021
1 parent 6017e28 commit e034957
Show file tree
Hide file tree
Showing 8 changed files with 65 additions and 40 deletions.
3 changes: 1 addition & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@ buildscript {
classpath(shadow)
classpath(kotlinter)
classpath(gradleVersionsPlugin)
val kmpNativeCoroutinesVersion = if (kotlinVersion == "1.6.10") "0.10.0-new-mm" else "0.8.0"
classpath("com.rickclephas.kmp:kmp-nativecoroutines-gradle-plugin:$kmpNativeCoroutinesVersion")
classpath("com.rickclephas.kmp:kmp-nativecoroutines-gradle-plugin:${Versions.kmpNativeCoroutinesVersion}")
}
}
}
Expand Down
6 changes: 4 additions & 2 deletions buildSrc/src/main/java/Dependencies.kt
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,14 @@ object Versions {
const val androidCompileSdk = 31
const val androidTargetSdk = androidCompileSdk

const val kotlinCoroutines = "1.6.0-RC3"
const val kotlinCoroutines = "1.6.0"
const val koin = "3.1.4"
const val ktor = "2.0.0-eap-278"
const val ktor = "2.0.0-beta-1"
const val kotlinxSerialization = "1.3.1"
const val kotlinxHtmlJs = "0.7.3"

const val kmpNativeCoroutinesVersion = "0.11.1-new-mm"

const val compose = "1.1.0-rc01"
const val composeCompiler = "1.1.0-rc02"
const val wearCompose = "1.0.0-alpha13"
Expand Down
4 changes: 2 additions & 2 deletions ios/PeopleInSpaceSwiftUI/Podfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@

target 'PeopleInSpaceSwiftUI' do
pod 'common', :path => '../../common'
pod 'KMPNativeCoroutinesAsync', '0.10.0'
pod 'KMPNativeCoroutinesAsync', '0.11.1'
end

target 'PeopleInSpaceWidgetExtension' do
pod 'common', :path => '../../common'
pod 'KMPNativeCoroutinesCombine', '0.10.0'
pod 'KMPNativeCoroutinesCombine', '0.11.1'
end
22 changes: 11 additions & 11 deletions ios/PeopleInSpaceSwiftUI/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
PODS:
- common (1.0)
- KMPNativeCoroutinesAsync (0.10.0):
- KMPNativeCoroutinesCore (= 0.10.0)
- KMPNativeCoroutinesCombine (0.10.0):
- KMPNativeCoroutinesCore (= 0.10.0)
- KMPNativeCoroutinesCore (0.10.0)
- KMPNativeCoroutinesAsync (0.11.1):
- KMPNativeCoroutinesCore (= 0.11.1)
- KMPNativeCoroutinesCombine (0.11.1):
- KMPNativeCoroutinesCore (= 0.11.1)
- KMPNativeCoroutinesCore (0.11.1)

DEPENDENCIES:
- common (from `../../common`)
- KMPNativeCoroutinesAsync (= 0.10.0)
- KMPNativeCoroutinesCombine (= 0.10.0)
- KMPNativeCoroutinesAsync (= 0.11.1)
- KMPNativeCoroutinesCombine (= 0.11.1)

SPEC REPOS:
trunk:
Expand All @@ -23,10 +23,10 @@ EXTERNAL SOURCES:

SPEC CHECKSUMS:
common: 5def32d6e7131f79a49997cca9bbcc9cbd11e08a
KMPNativeCoroutinesAsync: 66512d0bf4933d0b160416795284beb8ecf089b8
KMPNativeCoroutinesCombine: 04db768364187c30210303b3bdf0731e89ccfeb5
KMPNativeCoroutinesCore: 2e2573a75f27178d4cbd7be385f0f0a54416a47a
KMPNativeCoroutinesAsync: 1e6e09efe1fb04a9412483680829dbd35b55ef18
KMPNativeCoroutinesCombine: 43a442a5e50ee8fcbb8633a361d12907fe933920
KMPNativeCoroutinesCore: ed98a12d8337f861088f6b79636ffb29ff9bb2ad

PODFILE CHECKSUM: d3402fa215303d8817450a84072c6d7e3d30d094
PODFILE CHECKSUM: d51c9a2ba0fb9109f719acf8878fb54882154ace

COCOAPODS: 1.11.2
16 changes: 12 additions & 4 deletions ios/PeopleInSpaceSwiftUI/Pods/KMPNativeCoroutinesAsync/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 12 additions & 4 deletions ios/PeopleInSpaceSwiftUI/Pods/KMPNativeCoroutinesCombine/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 12 additions & 4 deletions ios/PeopleInSpaceSwiftUI/Pods/KMPNativeCoroutinesCore/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 11 additions & 11 deletions ios/PeopleInSpaceSwiftUI/Pods/Manifest.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit e034957

Please sign in to comment.