Skip to content

Commit 2d253be

Browse files
Merge pull request #113 from vanpra/0.6.1
Library Version 0.6.1
2 parents d785e4b + 1efc793 commit 2d253be

File tree

32 files changed

+74
-56
lines changed

32 files changed

+74
-56
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Changelog
22

3+
### 0.6.1 - 2021-10-07
4+
5+
- Update compose to 1.1.0-alpha05 ([#112](https://github.com/vanpra/compose-material-dialogs/issues/112) and [#110](https://github.com/vanpra/compose-material-dialogs/issues/110))
6+
- Update kotlin to 1.5.31
7+
- Make compose animation dependency explicit to ensure an old version is not used (thanks **[skolson](https://github.com/skolson)**)
8+
39
### 0.6.0 - 2021-09-10
410

511
- [BREAKING CHANGE] Replace MaterialDialog class structure with composable function with state. See [docs](https://vanpra.github.io/compose-material-dialogs) and the [sample app](https://github.com/vanpra/compose-material-dialogs/tree/main/app/src/main/java/com/vanpra/composematerialdialogdemos/demos) for examples

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
[![Codacy Badge](https://app.codacy.com/project/badge/Grade/ae8d455118164f43a24732761a970cc8)](https://www.codacy.com/gh/vanpra/compose-material-dialogs/dashboard?utm_source=github.com&utm_medium=referral&utm_content=vanpra/compose-material-dialogs&utm_campaign=Badge_Grade)![Build & Test](https://github.com/vanpra/compose-material-dialogs/actions/workflows/main.yml/badge.svg)
66

7-
**Current Library Compose Version: 1.1.0-alpha03**
7+
**Current Library Compose Version: 1.1.0-alpha05**
88

99
### [See Releases and Changelog](https://github.com/vanpra/compose-material-dialogs/blob/main/CHANGELOG.md)
1010

@@ -19,7 +19,7 @@
1919
```gradle
2020
dependencies {
2121
...
22-
implementation "io.github.vanpra.compose-material-dialogs:core:0.6.0"
22+
implementation "io.github.vanpra.compose-material-dialogs:core:0.6.1"
2323
...
2424
}
2525
```
@@ -35,7 +35,7 @@ dependencies {
3535
```gradle
3636
dependencies {
3737
...
38-
implementation "io.github.vanpra.compose-material-dialogs:datetime:0.6.0"
38+
implementation "io.github.vanpra.compose-material-dialogs:datetime:0.6.1"
3939
...
4040
}
4141
```
@@ -51,7 +51,7 @@ dependencies {
5151
```gradle
5252
dependencies {
5353
...
54-
implementation "io.github.vanpra.compose-material-dialogs:color:0.6.0"
54+
implementation "io.github.vanpra.compose-material-dialogs:color:0.6.1"
5555
...
5656
}
5757
```

app/build.gradle.kts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,14 @@ dependencies {
5353

5454
implementation(Dependencies.Kotlin.stdlib)
5555
implementation(Dependencies.Google.material)
56+
implementation(Dependencies.AndroidX.coreKtx)
5657

5758
implementation(Dependencies.AndroidX.Compose.ui)
5859
implementation(Dependencies.AndroidX.Compose.material)
5960
implementation(Dependencies.AndroidX.Compose.materialIconsExtended)
61+
implementation(Dependencies.AndroidX.Compose.animation)
62+
implementation(Dependencies.AndroidX.Compose.foundationLayout)
63+
6064
implementation(Dependencies.AndroidX.Compose.activity)
6165
implementation(Dependencies.AndroidX.Compose.navigation)
6266

app/src/main/java/com/vanpra/composematerialdialogdemos/demos/ListDialog.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,8 @@ fun BasicListDialogDemo() {
7373
DialogAndShowButton(buttonText = "Custom List Dialog") {
7474
title(res = R.string.backup_dialog_title)
7575
listItems(
76-
emails,
76+
modifier = Modifier.padding(bottom = 8.dp).padding(horizontal = 24.dp),
77+
list = emails,
7778
item = { _, email ->
7879
Row(Modifier.fillMaxWidth()) {
7980
Image(

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ buildscript {
1515

1616
dependencies {
1717
classpath(Dependencies.Kotlin.gradlePlugin)
18-
classpath("com.android.tools.build:gradle:7.1.0-alpha11")
18+
classpath("com.android.tools.build:gradle:7.1.0-alpha13")
1919
classpath("com.vanniktech:gradle-maven-publish-plugin:0.17.0")
2020
classpath("org.jetbrains.dokka:dokka-gradle-plugin:1.5.0")
2121
classpath(Dependencies.Shot.core)

buildSrc/src/main/kotlin/CommonModulePlugin.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ class CommonModulePlugin: Plugin<Project> {
2828
implementation(Dependencies.AndroidX.Compose.ui)
2929
implementation(Dependencies.AndroidX.Compose.material)
3030
implementation(Dependencies.AndroidX.Compose.materialIconsExtended)
31+
implementation(Dependencies.AndroidX.Compose.animation)
32+
implementation(Dependencies.AndroidX.Compose.foundationLayout)
3133

3234
androidTestImplementation(Dependencies.AndroidX.Compose.activity)
3335
androidTestImplementation(Dependencies.AndroidX.Compose.testing)

buildSrc/src/main/kotlin/Dependencies.kt

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ object Dependencies {
22
const val desugar = "com.android.tools:desugar_jdk_libs:1.1.5"
33

44
object ComposeMaterialDialogs {
5-
const val version = "0.5.1"
5+
const val version = "0.6.0"
66

77
const val core = "io.github.vanpra.compose-material-dialogs:core:$version"
88
const val datetime = "io.github.vanpra.compose-material-dialogs:datetime:$version"
@@ -14,12 +14,12 @@ object Dependencies {
1414
}
1515

1616
object Accompanist {
17-
private const val version = "0.18.0"
17+
private const val version = "0.19.0"
1818
const val pager = "com.google.accompanist:accompanist-pager:$version"
1919
}
2020

2121
object Kotlin {
22-
private const val version = "1.5.30"
22+
private const val version = "1.5.31"
2323
const val stdlib = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$version"
2424
const val gradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$version"
2525
}
@@ -31,30 +31,32 @@ object Dependencies {
3131
}
3232

3333
object Google {
34-
const val material = "com.google.android.material:material:1.5.0-alpha02"
34+
const val material = "com.google.android.material:material:1.5.0-alpha04"
3535
}
3636

3737
object AndroidX {
38-
const val coreKtx = "androidx.core:core-ktx:1.7.0-alpha02"
38+
const val coreKtx = "androidx.core:core-ktx:1.7.0-beta02"
3939

4040
object Testing {
41-
const val version = "1.4.1-alpha01"
41+
const val version = "1.4.1-alpha03"
4242
const val core = "androidx.test:core:$version"
4343
const val rules = "androidx.test:rules:$version"
4444
const val runner = "androidx.test:runner:$version"
4545
}
4646

4747
object Compose {
48-
const val version = "1.1.0-alpha03"
48+
const val version = "1.1.0-alpha05"
4949

5050
const val ui = "androidx.compose.ui:ui:$version"
5151
const val material = "androidx.compose.material:material:$version"
5252
const val materialIconsExtended =
5353
"androidx.compose.material:material-icons-extended:$version"
54+
const val animation = "androidx.compose.animation:animation:$version"
55+
const val foundationLayout = "androidx.compose.foundation:foundation-layout:$version"
5456

55-
const val testing = "androidx.compose.ui:ui-test-junit4:1.1.0-alpha03"
56-
const val activity = "androidx.activity:activity-compose:1.4.0-alpha01"
57-
const val navigation = "androidx.navigation:navigation-compose:2.4.0-alpha08"
57+
const val testing = "androidx.compose.ui:ui-test-junit4:$version"
58+
const val activity = "androidx.activity:activity-compose:1.4.0-beta01"
59+
const val navigation = "androidx.navigation:navigation-compose:2.4.0-alpha10"
5860
}
5961
}
6062
}
11 Bytes
Loading
160 Bytes
Loading
Loading

0 commit comments

Comments
 (0)