From 704724c8415870d619d0078768d11f2264575e30 Mon Sep 17 00:00:00 2001 From: Pranav Maganti Date: Fri, 21 Jan 2022 12:49:53 +0000 Subject: [PATCH] Update compose to 1.1.0-rc01 --- CHANGELOG.md | 5 +++++ CONTRIBUTING.md | 2 +- README.md | 8 ++++---- build.gradle.kts | 4 ++-- buildSrc/src/main/kotlin/Dependencies.kt | 10 +++++----- datetime/build.gradle.kts | 6 ++++++ .../composematerialdialogs/datetime/date/DatePicker.kt | 2 +- gradle.properties | 2 +- 8 files changed, 25 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3530566f..c629368f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +### 0.6.3 - 2021-01-21 + +- Update compose to 1.1.0-rc01 +- Add ability to disable specific days in date picker (#126)[https://github.com/vanpra/compose-material-dialogs/pull/126] + ### 0.6.2 - 2021-12-02 - Update compose to 1.1.0-beta04 ([#120](https://github.com/vanpra/compose-material-dialogs/issues/120)) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 924c1656..51850f26 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -74,7 +74,7 @@ To run the screenshot tests you can use: ./gradlew executeScreenshotTests -Pandroid.testInstrumentationRunnerArguments.filter=com.vanpra.composematerialdialogs.test.utils.ScreenshotTestFilter ``` -You can then view the screenshot test report at in the directory `[module]/build/screenshots/` +You can then view the screenshot test report at in the directory `[module]/build/reports/shot/verification/index.htm` If you have added a new screenshot test or changed the UI such that it affects an existing screenshot test you will have to recapture the screenshots using an emulator. Before doing this run the screenshot tests to verify that all the tests which are not affected by the change are still passing. After doing so you can run the following command which will capture on the emulator which should be setup as mentioned above: diff --git a/README.md b/README.md index 1c63a9cd..630f4786 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ [![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) -**Current Library Compose Version: 1.1.0-beta04** +**Current Library Compose Version: 1.1.0-rc01** ### [See Releases and Changelog](https://github.com/vanpra/compose-material-dialogs/blob/main/CHANGELOG.md) @@ -19,7 +19,7 @@ ```gradle dependencies { ... - implementation "io.github.vanpra.compose-material-dialogs:core:0.6.2" + implementation "io.github.vanpra.compose-material-dialogs:core:0.6.3" ... } ``` @@ -35,7 +35,7 @@ dependencies { ```gradle dependencies { ... - implementation "io.github.vanpra.compose-material-dialogs:datetime:0.6.2" + implementation "io.github.vanpra.compose-material-dialogs:datetime:0.6.3" ... } ``` @@ -51,7 +51,7 @@ dependencies { ```gradle dependencies { ... - implementation "io.github.vanpra.compose-material-dialogs:color:0.6.2" + implementation "io.github.vanpra.compose-material-dialogs:color:0.6.3" ... } ``` diff --git a/build.gradle.kts b/build.gradle.kts index 6a1db0ac..041a9bf8 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -14,8 +14,8 @@ buildscript { dependencies { classpath(Dependencies.Kotlin.gradlePlugin) - classpath("com.android.tools.build:gradle:7.1.0-rc01") - classpath("com.vanniktech:gradle-maven-publish-plugin:0.17.0") + classpath("com.android.tools.build:gradle:7.2.0-alpha07") + classpath("com.vanniktech:gradle-maven-publish-plugin:0.18.0") classpath("org.jetbrains.dokka:dokka-gradle-plugin:1.6.0") classpath(Dependencies.Shot.core) } diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt index 013b0dc4..b05e748c 100644 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ b/buildSrc/src/main/kotlin/Dependencies.kt @@ -14,7 +14,7 @@ object Dependencies { } object Accompanist { - private const val version = "0.21.4-beta" + private const val version = "0.22.0-rc" const val pager = "com.google.accompanist:accompanist-pager:$version" } @@ -24,13 +24,13 @@ object Dependencies { } object Shot { - private const val version = "5.11.2" + private const val version = "5.12.2" const val core = "com.karumi:shot:$version" const val android = "com.karumi:shot-android:$version" } object Google { - const val material = "com.google.android.material:material:1.5.0-beta01" + const val material = "com.google.android.material:material:1.6.0-alpha02" } object AndroidX { @@ -44,7 +44,7 @@ object Dependencies { } object Compose { - const val version = "1.1.0-beta04" + const val version = "1.1.0-rc01" const val ui = "androidx.compose.ui:ui:$version" const val material = "androidx.compose.material:material:$version" @@ -55,7 +55,7 @@ object Dependencies { const val testing = "androidx.compose.ui:ui-test-junit4:$version" const val activity = "androidx.activity:activity-compose:1.4.0" - const val navigation = "androidx.navigation:navigation-compose:2.4.0-beta02" + const val navigation = "androidx.navigation:navigation-compose:2.4.0-rc01" } } } \ No newline at end of file diff --git a/datetime/build.gradle.kts b/datetime/build.gradle.kts index 3675ad78..1f78fe91 100644 --- a/datetime/build.gradle.kts +++ b/datetime/build.gradle.kts @@ -47,6 +47,12 @@ android { composeOptions { kotlinCompilerExtensionVersion = Dependencies.AndroidX.Compose.version } + + kotlinOptions { + freeCompilerArgs = freeCompilerArgs + listOf( + "-Xopt-in=com.google.accompanist.pager.ExperimentalPagerApi" + ) + } } dependencies { diff --git a/datetime/src/main/java/com/vanpra/composematerialdialogs/datetime/date/DatePicker.kt b/datetime/src/main/java/com/vanpra/composematerialdialogs/datetime/date/DatePicker.kt index 92fb75c7..39bab890 100644 --- a/datetime/src/main/java/com/vanpra/composematerialdialogs/datetime/date/DatePicker.kt +++ b/datetime/src/main/java/com/vanpra/composematerialdialogs/datetime/date/DatePicker.kt @@ -145,7 +145,7 @@ internal fun DatePickerImpl(title: String, state: DatePickerState, allowedDateVa } } -@OptIn(ExperimentalPagerApi::class, ExperimentalFoundationApi::class) +@OptIn(ExperimentalFoundationApi::class, ExperimentalPagerApi::class) @Composable private fun YearPicker( viewDate: LocalDate, diff --git a/gradle.properties b/gradle.properties index 663f04f9..dc259536 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,7 +10,7 @@ android.enableJetifier=false kotlin.code.style=official GROUP=io.github.vanpra.compose-material-dialogs -VERSION_NAME=0.6.2 +VERSION_NAME=0.6.3 POM_DESCRIPTION=A Material Dialog Builder for Jetpack Compose POM_INCEPTION_YEAR=2020