wbrawner/PeopleInSpace
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #106 from joreilly/update_versions

Browse source 
Ktor 2.0.0-beta-1, Coroutines 1.6 and KMP-NativeCoroutines 0.11.1-new-mm, accompanist 0.22.0-rc
This commit is contained in:
John O'Reilly 2021-12-23 11:36:02 +00:00 committed by GitHub
commit d2acc790f8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 71 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/src/main/java/com/surrus/peopleinspace/ui/MainActivity.kt
View file

@ -3,12 +3,8 @@ package com.surrus.peopleinspace.ui
import android.os.Bundle
import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent
import androidx.compose.animation.ExperimentalAnimationApi
import androidx.compose.animation.*
import androidx.compose.animation.core.tween
import androidx.compose.animation.fadeIn
import androidx.compose.animation.fadeOut
import androidx.compose.animation.slideInHorizontally
import androidx.compose.animation.slideOutHorizontally
import androidx.compose.material.BottomNavigation
import androidx.compose.material.BottomNavigationItem
import androidx.compose.material.Icon
@ -99,11 +95,11 @@ fun MainLayout() {
AnimatedNavHost(navController, startDestination = Screen.PersonList.title) {
composable(
route = Screen.PersonList.title,
exitTransition = { _, target ->
exitTransition = {
slideOutHorizontally() +
fadeOut(animationSpec = tween(1000))
},
popEnterTransition = { _, _ ->
popEnterTransition = {
slideInHorizontally()
}
) {
@ -116,11 +112,11 @@ fun MainLayout() {
}
composable(
route = Screen.PersonDetails.title + "/{person}",
enterTransition = { _, _ ->
enterTransition = {
slideInHorizontally() +
fadeIn(animationSpec = tween(1000))
},
popExitTransition = { _, _ ->
popExitTransition = {
slideOutHorizontally()
}
) { backStackEntry ->

3
build.gradle.kts
View file

@ -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}")
}
}
}

8
buildSrc/src/main/java/Dependencies.kt
View file

@ -3,17 +3,19 @@ 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"
const val navCompose = "2.4.0-rc01"
const val accompanist = "0.21.0-beta"
const val accompanist = "0.22.0-rc"
const val junit = "4.12"
const val androidXTestJUnit = "1.1.3"

4
ios/PeopleInSpaceSwiftUI/Podfile
View file

@ -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
ios/PeopleInSpaceSwiftUI/Podfile.lock
View file

@ -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:
@ -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
ios/PeopleInSpaceSwiftUI/Pods/KMPNativeCoroutinesAsync/README.md generated
View file

@ -22,14 +22,22 @@ This library solves both of these limitations 😄.
## Compatibility
> **NOTE:** at the moment the [new Kotlin Native memory model][new-mm] is still experimental.
> The regular versions of this library are therefore currently using the [`-native-mt`][native-mt] versions
> of the kotlinx.coroutines library.
> If you would like to try the new memory model, please use the `-new-mm` versions instead.
[new-mm]: https://github.com/JetBrains/kotlin/blob/0b871d7534a9c8e90fb9ad61cd5345716448d08c/kotlin-native/NEW_MM.md
[native-mt]: https://github.com/kotlin/kotlinx.coroutines/issues/462
As of version `0.10.0` the library uses Kotlin version `1.6.10`.
Compatibility versions for older and early access Kotlin versions are also available:
Compatibility versions for older Kotlin versions are also available:
| Version | Version suffix | Kotlin | Coroutines |
|--------------|-----------------|:----------:|:-------------------:|
| _latest_ | -new-mm | 1.6.10 | 1.6.0-RC3 |
| **_latest_** | **_no suffix_** | **1.6.10** | **1.5.2-native-mt** |
| _latest_ | -kotlin-1.6.0 | 1.6.0 | 1.5.2-native-mt |
| _latest_ | -new-mm | 1.6.10 | 1.6.0 |
| **_latest_** | **_no suffix_** | **1.6.10** | **1.6.0-native-mt** |
| _latest_ | -kotlin-1.6.0 | 1.6.0 | 1.6.0-native-mt |
| 0.9.0 | -new-mm-3 | 1.6.0 | 1.6.0-RC2 |
| 0.8.0 | _no suffix_ | 1.5.30 | 1.5.2-native-mt |
| 0.8.0 | -kotlin-1.5.20 | 1.5.20 | 1.5.0-native-mt |

16
ios/PeopleInSpaceSwiftUI/Pods/KMPNativeCoroutinesCombine/README.md generated
View file

@ -22,14 +22,22 @@ This library solves both of these limitations 😄.
## Compatibility
> **NOTE:** at the moment the [new Kotlin Native memory model][new-mm] is still experimental.
> The regular versions of this library are therefore currently using the [`-native-mt`][native-mt] versions
> of the kotlinx.coroutines library.
> If you would like to try the new memory model, please use the `-new-mm` versions instead.
[new-mm]: https://github.com/JetBrains/kotlin/blob/0b871d7534a9c8e90fb9ad61cd5345716448d08c/kotlin-native/NEW_MM.md
[native-mt]: https://github.com/kotlin/kotlinx.coroutines/issues/462
As of version `0.10.0` the library uses Kotlin version `1.6.10`.
Compatibility versions for older and early access Kotlin versions are also available:
Compatibility versions for older Kotlin versions are also available:
| Version | Version suffix | Kotlin | Coroutines |
|--------------|-----------------|:----------:|:-------------------:|
| _latest_ | -new-mm | 1.6.10 | 1.6.0-RC3 |
| **_latest_** | **_no suffix_** | **1.6.10** | **1.5.2-native-mt** |
| _latest_ | -kotlin-1.6.0 | 1.6.0 | 1.5.2-native-mt |
| _latest_ | -new-mm | 1.6.10 | 1.6.0 |
| **_latest_** | **_no suffix_** | **1.6.10** | **1.6.0-native-mt** |
| _latest_ | -kotlin-1.6.0 | 1.6.0 | 1.6.0-native-mt |
| 0.9.0 | -new-mm-3 | 1.6.0 | 1.6.0-RC2 |
| 0.8.0 | _no suffix_ | 1.5.30 | 1.5.2-native-mt |
| 0.8.0 | -kotlin-1.5.20 | 1.5.20 | 1.5.0-native-mt |

16
ios/PeopleInSpaceSwiftUI/Pods/KMPNativeCoroutinesCore/README.md generated
View file

@ -22,14 +22,22 @@ This library solves both of these limitations 😄.
## Compatibility
> **NOTE:** at the moment the [new Kotlin Native memory model][new-mm] is still experimental.
> The regular versions of this library are therefore currently using the [`-native-mt`][native-mt] versions
> of the kotlinx.coroutines library.
> If you would like to try the new memory model, please use the `-new-mm` versions instead.
[new-mm]: https://github.com/JetBrains/kotlin/blob/0b871d7534a9c8e90fb9ad61cd5345716448d08c/kotlin-native/NEW_MM.md
[native-mt]: https://github.com/kotlin/kotlinx.coroutines/issues/462
As of version `0.10.0` the library uses Kotlin version `1.6.10`.
Compatibility versions for older and early access Kotlin versions are also available:
Compatibility versions for older Kotlin versions are also available:
| Version | Version suffix | Kotlin | Coroutines |
|--------------|-----------------|:----------:|:-------------------:|
| _latest_ | -new-mm | 1.6.10 | 1.6.0-RC3 |
| **_latest_** | **_no suffix_** | **1.6.10** | **1.5.2-native-mt** |
| _latest_ | -kotlin-1.6.0 | 1.6.0 | 1.5.2-native-mt |
| _latest_ | -new-mm | 1.6.10 | 1.6.0 |
| **_latest_** | **_no suffix_** | **1.6.10** | **1.6.0-native-mt** |
| _latest_ | -kotlin-1.6.0 | 1.6.0 | 1.6.0-native-mt |
| 0.9.0 | -new-mm-3 | 1.6.0 | 1.6.0-RC2 |
| 0.8.0 | _no suffix_ | 1.5.30 | 1.5.2-native-mt |
| 0.8.0 | -kotlin-1.5.20 | 1.5.20 | 1.5.0-native-mt |

22
ios/PeopleInSpaceSwiftUI/Pods/Manifest.lock generated
View file

@ -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:
@ -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