Skip to content
This repository was archived by the owner on Dec 27, 2024. It is now read-only.

Commit 2291314

Browse files
committed
Update ComposeMail dependencies
Updated dependencies, import statements, cleared up 'requires opt-in' warnings.
1 parent 8bc84e4 commit 2291314

File tree

11 files changed

+134
-106
lines changed

11 files changed

+134
-106
lines changed

demoProjects/ComposeMail/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
.gradle
33
/local.properties
44
/.idea/caches
5+
/.idea/.name
56
/.idea/libraries
67
/.idea/modules.xml
78
/.idea/workspace.xml

demoProjects/ComposeMail/.idea/codeStyles/Project.xml

Lines changed: 117 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demoProjects/ComposeMail/.idea/codeStyles/codeStyleConfig.xml

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demoProjects/ComposeMail/app/build.gradle

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ plugins {
2020
}
2121

2222
android {
23-
compileSdk 31
23+
compileSdk 32
2424

2525
defaultConfig {
2626
applicationId "com.example.composemail"
2727
minSdk 29
28-
targetSdk 31
28+
targetSdk 32
2929
versionCode 1
3030
versionName "1.0"
3131

@@ -76,12 +76,12 @@ android {
7676
}
7777

7878
dependencies {
79-
implementation 'androidx.core:core-ktx:1.7.0'
79+
implementation 'androidx.core:core-ktx:1.8.0'
8080

8181
implementation "androidx.paging:paging-common:$paging_version"
8282
implementation "androidx.paging:paging-common-ktx:$paging_version"
8383

84-
implementation 'androidx.compose.material3:material3-window-size-class:1.0.0-alpha12'
84+
implementation 'androidx.compose.material3:material3-window-size-class:1.0.0-alpha13'
8585

8686
implementation "androidx.compose.ui:ui:$compose_version"
8787
implementation "androidx.compose.material:material:$compose_version"
@@ -90,15 +90,13 @@ dependencies {
9090

9191
implementation "androidx.paging:paging-compose:$paging_compose_version"
9292

93-
implementation "androidx.constraintlayout:constraintlayout-compose:1.1.0-alpha01"
94-
// implementation project(':core')
95-
// implementation project(':compose')
93+
implementation "androidx.constraintlayout:constraintlayout-compose:1.1.0-alpha03"
9694

9795
implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:2.4.1'
9896

9997
implementation 'androidx.activity:activity-compose:1.4.0'
10098

101-
implementation("io.coil-kt:coil-compose:1.3.2")
99+
implementation("io.coil-kt:coil-compose:1.4.0")
102100

103101
testImplementation 'junit:junit:4.13.2'
104102

@@ -112,8 +110,10 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
112110
kotlinOptions {
113111
// For Kotlin 1.6.0+
114112
freeCompilerArgs += "-opt-in=androidx.constraintlayout.compose.ExperimentalMotionApi"
113+
freeCompilerArgs += "-opt-in=androidx.compose.material.ExperimentalMaterialApi"
115114
freeCompilerArgs += "-opt-in=androidx.compose.ui.ExperimentalComposeUiApi"
116115
freeCompilerArgs += "-opt-in=androidx.compose.material3.windowsizeclass.ExperimentalMaterial3WindowSizeClassApi"
116+
freeCompilerArgs += "-opt-in=androidx.compose.animation.ExperimentalAnimationApi"
117117

118118
// For older than Kotlin 1.6.0
119119
// freeCompilerArgs += "-Xopt-in=androidx.constraintlayout.compose.ExperimentalMotionApi"

demoProjects/ComposeMail/app/src/main/java/com/example/composemail/ui/home/toptoolbar/TopToolbar.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
package com.example.composemail.ui.home.toptoolbar
1818

1919
import androidx.compose.animation.AnimatedContent
20-
import androidx.compose.animation.ExperimentalAnimationApi
2120
import androidx.compose.foundation.background
2221
import androidx.compose.foundation.clickable
2322
import androidx.compose.foundation.layout.Arrangement
@@ -50,7 +49,6 @@ import androidx.constraintlayout.compose.Dimension
5049
import com.example.composemail.ui.theme.textBackgroundColor
5150
import com.example.composemail.ui.utils.rememberConstraintSet
5251

53-
@OptIn(ExperimentalAnimationApi::class)
5452
@Composable
5553
fun TopToolbar(
5654
modifier: Modifier = Modifier,

demoProjects/ComposeMail/app/src/main/java/com/example/composemail/ui/newmail/NewMail.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ import androidx.compose.foundation.layout.padding
2828
import androidx.compose.foundation.layout.width
2929
import androidx.compose.foundation.shape.RoundedCornerShape
3030
import androidx.compose.material.Button
31-
import androidx.compose.material.ExperimentalMaterialApi
3231
import androidx.compose.material.Icon
3332
import androidx.compose.material.MaterialTheme
3433
import androidx.compose.material.OutlinedTextField
@@ -335,7 +334,6 @@ fun NewMailButton(
335334
}
336335

337336
@Suppress("NOTHING_TO_INLINE")
338-
@OptIn(ExperimentalMaterialApi::class)
339337
@Composable
340338
internal inline fun ColorableIconButton(
341339
modifier: Modifier,

demoProjects/ComposeMail/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ task clean(type: Delete) {
2222

2323
buildscript {
2424
ext {
25-
compose_version = '1.1.1'
25+
compose_version = '1.2.0-rc02'
2626
paging_version = '3.1.1'
27-
paging_compose_version = '1.0.0-alpha14'
27+
paging_compose_version = '1.0.0-alpha15'
2828
}
2929
}

demoProjects/ComposeMail/compose/build.gradle

Lines changed: 0 additions & 71 deletions
This file was deleted.

demoProjects/ComposeMail/core/.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

demoProjects/ComposeMail/core/build.gradle

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)