Skip to content

Commit d3432e1

Browse files
manuelvicntmanuelvicnt
authored
[All] Update to Compose 1.0.3 (#671)
1 parent 8eabbd6 commit d3432e1

23 files changed

Lines changed: 86 additions & 74 deletions

File tree

‎Crane/app/src/main/java/androidx/compose/samples/crane/CraneApplication.kt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import android.app.Application
2020
import androidx.compose.samples.crane.util.UnsplashSizingInterceptor
2121
import coil.ImageLoader
2222
import coil.ImageLoaderFactory
23+
import coil.annotation.ExperimentalCoilApi
2324
import coil.compose.rememberImagePainter
2425
import dagger.hilt.android.HiltAndroidApp
2526

@@ -30,6 +31,7 @@ class CraneApplication : Application(), ImageLoaderFactory {
3031
* Create the singleton [ImageLoader].
3132
* This is used by [rememberImagePainter] to load images in the app.
3233
*/
34+
@OptIn(ExperimentalCoilApi::class)
3335
override fun newImageLoader(): ImageLoader {
3436
return ImageLoader.Builder(this)
3537
.componentRegistry {

‎Crane/buildSrc/src/main/java/com/example/crane/buildsrc/Dependencies.kt‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
package com.example.crane.buildsrc
1818

1919
object Versions {
20-
const val ktLint = "0.41.0"
20+
const val ktLint = "0.42.1"
2121
}
2222

2323
object Libs {
24-
const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0"
24+
const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.2"
2525
const val ktLint = "com.pinterest:ktlint:${Versions.ktLint}"
2626

2727
object GoogleMaps {
@@ -34,18 +34,18 @@ object Libs {
3434
}
3535

3636
object Accompanist {
37-
const val version = "0.18.0"
37+
const val version = "0.19.0"
3838
const val insets = "com.google.accompanist:accompanist-insets:$version"
3939
}
4040

4141
object Kotlin {
42-
private const val version = "1.5.21"
42+
private const val version = "1.5.30"
4343
const val stdlib = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$version"
4444
const val gradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$version"
4545
const val extensions = "org.jetbrains.kotlin:kotlin-android-extensions:$version"
4646

4747
object Coroutines {
48-
private const val version = "1.5.0"
48+
private const val version = "1.5.2"
4949
const val android = "org.jetbrains.kotlinx:kotlinx-coroutines-android:$version"
5050
const val test = "org.jetbrains.kotlinx:kotlinx-coroutines-test:$version"
5151
}
@@ -60,7 +60,7 @@ object Libs {
6060

6161
object Compose {
6262
const val snapshot = ""
63-
const val version = "1.0.2"
63+
const val version = "1.0.3"
6464

6565
const val runtime = "androidx.compose.runtime:runtime:$version"
6666
const val runtimeLivedata = "androidx.compose.runtime:runtime-livedata:$version"
@@ -74,8 +74,8 @@ object Libs {
7474
}
7575

7676
object Lifecycle {
77-
private const val version = "2.3.1"
78-
const val viewModelCompose = "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha07"
77+
private const val version = "2.4.0-rc01"
78+
const val viewModelCompose = "androidx.lifecycle:lifecycle-viewmodel-compose:$version"
7979
const val viewModelKtx = "androidx.lifecycle:lifecycle-viewmodel-ktx:$version"
8080
}
8181

@@ -93,7 +93,7 @@ object Libs {
9393
}
9494

9595
object Hilt {
96-
private const val version = "2.38.1"
96+
private const val version = "2.39"
9797

9898
const val gradlePlugin = "com.google.dagger:hilt-android-gradle-plugin:$version"
9999
const val android = "com.google.dagger:hilt-android:$version"
@@ -107,7 +107,7 @@ object Libs {
107107
}
108108

109109
object Coil {
110-
const val coilCompose = "io.coil-kt:coil-compose:1.3.0"
110+
const val coilCompose = "io.coil-kt:coil-compose:1.3.2"
111111
}
112112
}
113113

‎JetNews/app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,9 +113,9 @@ dependencies {
113113

114114
implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.3.1"
115115
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.3.1"
116-
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha07"
116+
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.4.0-rc01"
117117

118-
implementation 'androidx.navigation:navigation-compose:2.4.0-alpha08'
118+
implementation 'androidx.navigation:navigation-compose:2.4.0-alpha10'
119119

120120
androidTestImplementation 'androidx.test:core:1.4.0'
121121
androidTestImplementation 'androidx.test:rules:1.4.0'

‎JetNews/app/src/main/java/com/example/jetnews/ui/JetnewsNavGraph.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ import androidx.navigation.NavHostController
2626
import androidx.navigation.NavType
2727
import androidx.navigation.compose.NavHost
2828
import androidx.navigation.compose.composable
29-
import androidx.navigation.compose.navArgument
3029
import androidx.navigation.compose.rememberNavController
30+
import androidx.navigation.navArgument
3131
import com.example.jetnews.data.AppContainer
3232
import com.example.jetnews.ui.article.ArticleScreen
3333
import com.example.jetnews.ui.article.ArticleViewModel

‎JetNews/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
*/
1616

1717
buildscript {
18-
ext.kotlin_version = '1.5.21'
19-
ext.compose_version = '1.0.2'
18+
ext.kotlin_version = '1.5.30'
19+
ext.compose_version = '1.0.3'
2020
ext.coroutines_version = '1.5.2'
21-
ext.accompanist_version = '0.18.0'
21+
ext.accompanist_version = '0.19.0'
2222

2323
repositories {
2424
google()

‎Jetcaster/app/src/main/java/com/example/jetcaster/ui/home/Home.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ import androidx.compose.ui.text.style.TextOverflow
6262
import androidx.compose.ui.tooling.preview.Preview
6363
import androidx.compose.ui.unit.dp
6464
import androidx.lifecycle.viewmodel.compose.viewModel
65+
import coil.annotation.ExperimentalCoilApi
6566
import coil.compose.rememberImagePainter
6667
import com.example.jetcaster.R
6768
import com.example.jetcaster.data.PodcastWithExtraInfo
@@ -177,10 +178,7 @@ fun HomeContent(
177178
}
178179

179180
DynamicThemePrimaryColorsFromImage(dominantColorState) {
180-
val pagerState = rememberPagerState(
181-
pageCount = featuredPodcasts.size,
182-
initialOffscreenLimit = 2,
183-
)
181+
val pagerState = rememberPagerState()
184182

185183
val selectedImageUrl = featuredPodcasts.getOrNull(pagerState.currentPage)
186184
?.podcast?.imageUrl
@@ -322,6 +320,7 @@ fun FollowedPodcasts(
322320
onPodcastUnfollowed: (String) -> Unit,
323321
) {
324322
HorizontalPager(
323+
count = items.size,
325324
state = pagerState,
326325
modifier = modifier
327326
) { page ->
@@ -338,6 +337,7 @@ fun FollowedPodcasts(
338337
}
339338
}
340339

340+
@OptIn(ExperimentalCoilApi::class)
341341
@Composable
342342
private fun FollowedPodcastCarouselItem(
343343
modifier: Modifier = Modifier,

‎Jetcaster/app/src/main/java/com/example/jetcaster/ui/home/category/PodcastCategory.kt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ import androidx.constraintlayout.compose.ConstraintLayout
6868
import androidx.constraintlayout.compose.Dimension.Companion.fillToConstraints
6969
import androidx.constraintlayout.compose.Dimension.Companion.preferredWrapContent
7070
import androidx.lifecycle.viewmodel.compose.viewModel
71+
import coil.annotation.ExperimentalCoilApi
7172
import coil.compose.rememberImagePainter
7273
import com.example.jetcaster.R
7374
import com.example.jetcaster.data.Episode
@@ -138,6 +139,7 @@ private fun EpisodeList(episodes: List<EpisodeToPodcast>) {
138139
}
139140
}
140141

142+
@OptIn(ExperimentalCoilApi::class)
141143
@Composable
142144
fun EpisodeListItem(
143145
episode: Episode,
@@ -324,6 +326,7 @@ private fun CategoryPodcastRow(
324326
}
325327
}
326328

329+
@OptIn(ExperimentalCoilApi::class)
327330
@Composable
328331
private fun TopPodcastRowItem(
329332
podcastTitle: String,

‎Jetcaster/buildSrc/src/main/java/com/example/jetcaster/buildsrc/dependencies.kt‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,21 @@
1717
package com.example.jetcaster.buildsrc
1818

1919
object Versions {
20-
const val ktlint = "0.41.0"
20+
const val ktlint = "0.42.1"
2121
}
2222

2323
object Libs {
24-
const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0"
24+
const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.2"
2525
const val jdkDesugar = "com.android.tools:desugar_jdk_libs:1.1.5"
2626

2727
object Accompanist {
28-
const val version = "0.18.0"
28+
const val version = "0.19.0"
2929
const val insets = "com.google.accompanist:accompanist-insets:$version"
3030
const val pager = "com.google.accompanist:accompanist-pager:$version"
3131
}
3232

3333
object Kotlin {
34-
private const val version = "1.5.21"
34+
private const val version = "1.5.30"
3535
const val stdlib = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$version"
3636
const val gradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$version"
3737
const val extensions = "org.jetbrains.kotlin:kotlin-android-extensions:$version"
@@ -66,12 +66,12 @@ object Libs {
6666
}
6767

6868
object Constraint {
69-
const val constraintLayoutCompose = "androidx.constraintlayout:constraintlayout-compose:1.0.0-beta02"
69+
const val constraintLayoutCompose = "androidx.constraintlayout:constraintlayout-compose:1.0.0-rc01"
7070
}
7171

7272
object Compose {
7373
const val snapshot = ""
74-
const val version = "1.0.2"
74+
const val version = "1.0.3"
7575

7676
@get:JvmStatic
7777
val snapshotUrl: String
@@ -89,8 +89,8 @@ object Libs {
8989
}
9090

9191
object Lifecycle {
92-
private const val version = "2.3.1"
93-
const val viewModelCompose = "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha07"
92+
private const val version = "2.4.0-rc01"
93+
const val viewModelCompose = "androidx.lifecycle:lifecycle-viewmodel-compose:$version"
9494
const val viewmodel = "androidx.lifecycle:lifecycle-viewmodel-ktx:$version"
9595
}
9696

@@ -122,6 +122,6 @@ object Libs {
122122
}
123123

124124
object Coil {
125-
const val coilCompose = "io.coil-kt:coil-compose:1.3.0"
125+
const val coilCompose = "io.coil-kt:coil-compose:1.3.2"
126126
}
127127
}

‎Jetchat/buildSrc/src/main/java/com/example/compose/jetchat/buildsrc/dependencies.kt‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,24 +17,24 @@
1717
package com.example.compose.jetchat.buildsrc
1818

1919
object Versions {
20-
const val ktlint = "0.41.0"
20+
const val ktlint = "0.42.1"
2121
}
2222

2323
object Libs {
24-
const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0"
24+
const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.2"
2525
const val jdkDesugar = "com.android.tools:desugar_jdk_libs:1.1.5"
2626

2727
const val junit = "junit:junit:4.13"
2828

2929
const val material = "com.google.android.material:material:1.3.0"
3030

3131
object Accompanist {
32-
const val version = "0.18.0"
32+
const val version = "0.19.0"
3333
const val insets = "com.google.accompanist:accompanist-insets:$version"
3434
}
3535

3636
object Kotlin {
37-
private const val version = "1.5.21"
37+
private const val version = "1.5.30"
3838
const val stdlib = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$version"
3939
const val gradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$version"
4040
const val extensions = "org.jetbrains.kotlin:kotlin-android-extensions:$version"
@@ -57,7 +57,7 @@ object Libs {
5757

5858
object Compose {
5959
const val snapshot = ""
60-
const val version = "1.0.2"
60+
const val version = "1.0.3"
6161

6262
const val foundation = "androidx.compose.foundation:foundation:$version"
6363
const val layout = "androidx.compose.foundation:foundation-layout:$version"
@@ -74,7 +74,7 @@ object Libs {
7474
}
7575

7676
object Navigation {
77-
private const val version = "2.3.4"
77+
private const val version = "2.3.5"
7878
const val fragment = "androidx.navigation:navigation-fragment-ktx:$version"
7979
const val uiKtx = "androidx.navigation:navigation-ui-ktx:$version"
8080
}
@@ -93,11 +93,11 @@ object Libs {
9393
}
9494

9595
object Lifecycle {
96-
private const val version = "2.3.1"
96+
private const val version = "2.4.0-rc01"
9797
const val extensions = "androidx.lifecycle:lifecycle-extensions:$version"
9898
const val livedata = "androidx.lifecycle:lifecycle-livedata-ktx:$version"
9999
const val viewmodel = "androidx.lifecycle:lifecycle-viewmodel-ktx:$version"
100-
const val viewModelCompose = "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha07"
100+
const val viewModelCompose = "androidx.lifecycle:lifecycle-viewmodel-compose:$version"
101101
}
102102
}
103103
}

‎Jetsnack/app/src/main/java/com/example/jetsnack/ui/JetsnackApp.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import androidx.navigation.NavGraphBuilder
2525
import androidx.navigation.NavType
2626
import androidx.navigation.compose.NavHost
2727
import androidx.navigation.compose.composable
28-
import androidx.navigation.compose.navArgument
28+
import androidx.navigation.navArgument
2929
import androidx.navigation.navigation
3030
import com.example.jetsnack.ui.components.JetsnackScaffold
3131
import com.example.jetsnack.ui.components.JetsnackSnackbar

0 commit comments

Comments
 (0)