Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump compose-theme-adapter from 1.1.8 to 1.1.17 #7287

Conversation

dependabot[bot]
Copy link
Contributor

@dependabot dependabot bot commented on behalf of github Aug 26, 2022

Bumps compose-theme-adapter from 1.1.8 to 1.1.17.

Release notes

Sourced from compose-theme-adapter's releases.

Compose Theme Adapter 1.1.17

What’s Changed

  • Update to Compose 1.3.0-beta01 @​ricknout ffcbd5a2ae4fc2526c5bb1f37254016cdbbe6fb3

Compose Theme Adapter 1.1.16

What’s Changed

  • Separate MDC versions for different artifacts @​ricknout 9f251bf5f81d93fcd4997f0720d823f0b21eef12
  • Update to AGP 7.2.2 @​ricknout 3732c27bf25515317c43fdc8fc7a444fd1a5934b
  • Update to AppCompat 1.5.0 @​ricknout 517dccb9df40b7fa32e0c37c447bd312e615384a
  • Update to Compose Compiler 1.3.0 @​ricknout 98cdff84c82d03cace39eac1a98d62113b6f3e7f
  • Update to SDK 33 @​ricknout 70d2ed999928c986b61224f0d739317fd112f881
  • Update to Kotlin 1.7.10 @​ricknout 884e3a7efb06aa28c19bacdd27c750d1f8173313
  • Update to Compose 1.2.1 @​ricknout aab4231fc98234941522be395a0cd6ab3dfee30f

Compose Theme Adapter 1.1.15

What’s Changed

  • Update to Compose 1.2.0 @​ricknout 9c3acfcf19de8a4acb83fd5504fd7b664d44ca35
  • Update to MDC 1.7.0-alpha03 @​ricknout 30c45e04a97fc5c4aea53b84ea88831adab7a7d5
  • Update to Activity 1.5.1 @​ricknout 3df483e9461aa4d1f1d4c1ca5ad305d061aa011d

Compose Theme Adapter 1.1.14

What’s Changed

  • Update to Compose 1.2.0-rc03 @​ricknout 79dc0e56d83772f1068b350d52404f87fbacf72f
  • Update to Compose Compiler 1.2.0 and Kotlin 1.7.0 @​ricknout 3e021df88dff2a322d38e8348bb76698e71abd89
  • Update to Activity 1.5.0 @​ricknout 163c3297a3c26853ea5d9f56daff05a0197de329

Compose Theme Adapter 1.1.13

What’s Changed

  • Update to Compose 1.2.0-rc02 @​ricknout 98e3bf30c838daa634a552accc25e9ef2c47fbc9

Compose Theme Adapter 1.1.12

What’s Changed

  • Update to Compose 1.2.0-rc01 @​ricknout 202874cf2a39109821e979ca8ea7fe97e19b0d85
  • Update to Core 1.8.0 @​ricknout 3bcd5b7567ffd89148d2db1a35a9f21c1c9e8ea2

Compose Theme Adapter 1.1.11

What’s Changed

  • Update to AGP 7.2.1 @​ricknout 69b2d935f294cd127bc9226862a58d3a8a48b83d
  • Update to Compose 1.2.0-beta03 @​ricknout 15313eb1840351d9bc2e4a37e5290b1b28af2358
  • Update to SDK 32 @​ricknout c7c07ae98c42979a633dc0564dac555dbe879edf

Compose Theme Adapter 1.1.10

What’s Changed

  • Update various AndroidX dependencies @​ricknout c4405d0470f3f2a16bd3483834237a892b9a437e
  • Update to Compose 1.2.0-beta02 @​ricknout d11912166faf475bcbd28a94cb9eebf60fdd1ce6

Compose Theme Adapter 1.1.9

What’s Changed

  • Update to AGP 7.2.0 @​ricknout 0e95fe07edd229cd03e5ed19006c1d15b8f1a358
  • Update to Compose 1.2.0-beta01 @​ricknout b4d9a930f36f027f6fda21b1dde03fb449357301
Commits
  • 94f5293 material-v1.1.17 and material3-v1.0.17
  • dfe8a43 Add support for ColorScheme.scrim
  • 2930319 Update to MDC-Android 1.7.0-beta01 in material3
  • ffcbd5a Update to Compose 1.3.0-beta01
  • 6a258a6 Update to Compose Material 3 1.0.0-beta01
  • 62ca907 Back to development versions
  • 8a29deb material-v1.1.16 and material3-v1.0.16
  • 884e3a7 Update to Kotlin 1.7.10
  • 70d2ed9 Update to SDK 33
  • 43a706a Update to Compose Material 3 1.0.0-alpha16
  • Additional commits viewable in compare view

Dependabot compatibility score

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.


Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot merge will merge this PR after your CI passes on it
  • @dependabot squash and merge will squash and merge this PR after your CI passes on it
  • @dependabot cancel merge will cancel a previously requested merge and block automerging
  • @dependabot reopen will reopen this PR if it is closed
  • @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
  • @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

Bumps [compose-theme-adapter](https://github.com/material-components/material-components-android-compose-theme-adapter) from 1.1.8 to 1.1.17.
- [Release notes](https://github.com/material-components/material-components-android-compose-theme-adapter/releases)
- [Commits](material-components/material-components-android-compose-theme-adapter@material-v1.1.8...material-v1.1.17)

---
updated-dependencies:
- dependency-name: com.google.android.material:compose-theme-adapter
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
@dependabot dependabot bot added the bot: dependencies update PRs that update a dependency file, used by Dependabot. label Aug 26, 2022
@dependabot dependabot bot requested review from a team and kidinov and removed request for a team August 26, 2022 18:12
@JorgeMucientes
Copy link
Contributor

JorgeMucientes commented Sep 5, 2022

Pending to investigate error:
DialogButtonsRowLayout.kt: (37, 9): Inheritance from an interface with '@JvmDefault' members is only allowed with -Xjvm-default option

DialogButtonsRowLayout is using MeasurePolicy which has been annotated with @JvmDefaultWithCompatibility in this latest version of MDC-adapter. This annotation requires adding "-Xjvm-default=all-compatibility" to the compiler options in order to build the app successfully, which I'm not sure we want to add.

Adding @JvmDefaultWithCompatibility is a breaking change. Not sure they should've added that to a public API that had been previously released.

Need to investigate further. Marking it as blocked temporarily.

@JorgeMucientes JorgeMucientes added the status: blocked Blocked from progressing somehow, waiting for another piece of work to be done. label Sep 5, 2022
@kidinov
Copy link
Contributor

kidinov commented Sep 5, 2022

@JorgeMucientes I've got the same while working on this PR. Honestly, I didn't dive much into the topic and just added the flag. If you will find any good explanation of what's going on here, please let me know =)

@dependabot @github
Copy link
Contributor Author

dependabot bot commented on behalf of github Sep 8, 2022

A newer version of com.google.android.material:compose-theme-adapter exists, but since this PR has been edited by someone other than Dependabot I haven't updated it. You'll get a PR for the updated version as normal once this PR is merged.

@ThomazFB ThomazFB removed their request for review October 18, 2022 02:42
@JorgeMucientes
Copy link
Contributor

Additional input:
I've checked that updating Kotlin version to 1.6.20 the compile problems with @JvmDefaultWithCompatibility are fixed. Note that updating Kotlin to 1.6.20 requires additional changes like upgrading composeCompiler to 1.2.0-alpha08

@JorgeMucientes
Copy link
Contributor

@dependabot rebase

@dependabot @github
Copy link
Contributor Author

dependabot bot commented on behalf of github Dec 28, 2022

Looks like this PR has been edited by someone other than Dependabot. That means Dependabot can't rebase it - sorry!

If you're happy for Dependabot to recreate it from scratch, overwriting any edits, you can request @dependabot recreate.

…al-compose-theme-adapter-1.1.17

# Conflicts:
#	build.gradle
@peril-woocommerce
Copy link

Warnings
⚠️ PR is not assigned to a milestone.

Generated by 🚫 dangerJS

@wpmobilebot
Copy link
Collaborator

wpmobilebot commented Jan 3, 2023

You can test the changes on this Pull Request by downloading an installable build, or scanning this QR code:

…m.google.android.material-compose-theme-adapter-1.1.17
@JorgeMucientes
Copy link
Contributor

JorgeMucientes commented Jan 9, 2023

Smoke tested the Compose screen from the app and all looks good. Ensured MoreMenu is displayed correctly
:shipit:

@wpmobilebot
Copy link
Collaborator

Found 1 violations:

The PR caused the following dependency changes:

expand

 +--- androidx.constraintlayout:constraintlayout:2.1.4
-|    \--- androidx.appcompat:appcompat:1.2.0 -> 1.4.2
-|         +--- androidx.annotation:annotation:1.3.0 -> 1.5.0 (*)
-|         +--- androidx.core:core:1.7.0 -> 1.8.0 (*)
-|         +--- androidx.cursoradapter:cursoradapter:1.0.0 (*)
-|         +--- androidx.activity:activity:1.2.4 -> 1.5.1 (*)
-|         +--- androidx.fragment:fragment:1.3.6 -> 1.5.4 (*)
-|         +--- androidx.appcompat:appcompat-resources:1.4.2
-|         |    +--- androidx.collection:collection:1.0.0 -> 1.2.0 (*)
-|         |    +--- androidx.annotation:annotation:1.2.0 -> 1.5.0 (*)
-|         |    +--- androidx.core:core:1.0.1 -> 1.8.0 (*)
-|         |    +--- androidx.vectordrawable:vectordrawable:1.1.0
-|         |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.5.0 (*)
-|         |    |    +--- androidx.core:core:1.1.0 -> 1.8.0 (*)
-|         |    |    \--- androidx.collection:collection:1.1.0 -> 1.2.0 (*)
-|         |    \--- androidx.vectordrawable:vectordrawable-animated:1.1.0
-|         |         +--- androidx.vectordrawable:vectordrawable:1.1.0 (*)
-|         |         +--- androidx.interpolator:interpolator:1.0.0 (*)
-|         |         \--- androidx.collection:collection:1.1.0 -> 1.2.0 (*)
-|         +--- androidx.drawerlayout:drawerlayout:1.0.0 -> 1.1.1 (*)
-|         +--- androidx.savedstate:savedstate:1.1.0 -> 1.2.0 (*)
-|         +--- androidx.emoji2:emoji2:1.0.0
-|         |    +--- androidx.collection:collection:1.1.0 -> 1.2.0 (*)
-|         |    +--- androidx.annotation:annotation:1.2.0 -> 1.5.0 (*)
-|         |    +--- androidx.lifecycle:lifecycle-process:2.4.0 -> 2.5.1
-|         |    |    +--- androidx.annotation:annotation:1.2.0 -> 1.5.0 (*)
-|         |    |    +--- androidx.lifecycle:lifecycle-runtime:2.5.1 (*)
-|         |    |    \--- androidx.startup:startup-runtime:1.1.1
-|         |    |         +--- androidx.annotation:annotation:1.1.0 -> 1.5.0 (*)
-|         |    |         \--- androidx.tracing:tracing:1.0.0 (*)
-|         |    +--- androidx.core:core:1.3.0 -> 1.8.0 (*)
-|         |    \--- androidx.startup:startup-runtime:1.0.0 -> 1.1.1 (*)
-|         +--- androidx.emoji2:emoji2-views-helper:1.0.0
-|         |    +--- androidx.emoji2:emoji2:1.0.0 (*)
-|         |    +--- androidx.collection:collection:1.1.0 -> 1.2.0 (*)
-|         |    \--- androidx.core:core:1.3.0 -> 1.8.0 (*)
-|         +--- androidx.collection:collection:1.0.0 -> 1.2.0 (*)
-|         +--- androidx.lifecycle:lifecycle-runtime:2.3.1 -> 2.5.1 (*)
-|         +--- androidx.lifecycle:lifecycle-viewmodel:2.3.1 -> 2.5.1 (*)
-|         \--- androidx.resourceinspection:resourceinspection-annotation:1.0.0
-|              \--- androidx.annotation:annotation:1.1.0 -> 1.5.0 (*)
+|    \--- androidx.appcompat:appcompat:1.2.0 -> 1.5.0
+|         +--- androidx.activity:activity:1.5.0 -> 1.5.1 (*)
+|         +--- androidx.annotation:annotation:1.3.0 -> 1.5.0 (*)
+|         +--- androidx.appcompat:appcompat-resources:1.5.0
+|         |    +--- androidx.annotation:annotation:1.2.0 -> 1.5.0 (*)
+|         |    +--- androidx.collection:collection:1.0.0 -> 1.2.0 (*)
+|         |    +--- androidx.core:core:1.6.0 -> 1.8.0 (*)
+|         |    +--- androidx.vectordrawable:vectordrawable:1.1.0
+|         |    |    +--- androidx.annotation:annotation:1.1.0 -> 1.5.0 (*)
+|         |    |    +--- androidx.core:core:1.1.0 -> 1.8.0 (*)
+|         |    |    \--- androidx.collection:collection:1.1.0 -> 1.2.0 (*)
+|         |    +--- androidx.vectordrawable:vectordrawable-animated:1.1.0
+|         |    |    +--- androidx.vectordrawable:vectordrawable:1.1.0 (*)
+|         |    |    +--- androidx.interpolator:interpolator:1.0.0 (*)
+|         |    |    \--- androidx.collection:collection:1.1.0 -> 1.2.0 (*)
+|         |    \--- androidx.appcompat:appcompat:1.5.0 (c)
+|         +--- androidx.collection:collection:1.0.0 -> 1.2.0 (*)
+|         +--- androidx.core:core:1.8.0 (*)
+|         +--- androidx.core:core-ktx:1.8.0 (*)
+|         +--- androidx.cursoradapter:cursoradapter:1.0.0 (*)
+|         +--- androidx.drawerlayout:drawerlayout:1.0.0 -> 1.1.1 (*)
+|         +--- androidx.emoji2:emoji2:1.2.0
+|         |    +--- androidx.annotation:annotation:1.2.0 -> 1.5.0 (*)
+|         |    +--- androidx.collection:collection:1.1.0 -> 1.2.0 (*)
+|         |    +--- androidx.core:core:1.3.0 -> 1.8.0 (*)
+|         |    +--- androidx.lifecycle:lifecycle-process:2.4.1 -> 2.5.1
+|         |    |    +--- androidx.annotation:annotation:1.2.0 -> 1.5.0 (*)
+|         |    |    +--- androidx.lifecycle:lifecycle-runtime:2.5.1 (*)
+|         |    |    \--- androidx.startup:startup-runtime:1.1.1
+|         |    |         +--- androidx.annotation:annotation:1.1.0 -> 1.5.0 (*)
+|         |    |         \--- androidx.tracing:tracing:1.0.0 (*)
+|         |    \--- androidx.startup:startup-runtime:1.0.0 -> 1.1.1 (*)
+|         +--- androidx.emoji2:emoji2-views-helper:1.2.0
+|         |    +--- androidx.collection:collection:1.1.0 -> 1.2.0 (*)
+|         |    +--- androidx.core:core:1.3.0 -> 1.8.0 (*)
+|         |    \--- androidx.emoji2:emoji2:1.2.0 (*)
+|         +--- androidx.fragment:fragment:1.3.6 -> 1.5.4 (*)
+|         +--- androidx.lifecycle:lifecycle-runtime:2.3.1 -> 2.5.1 (*)
+|         +--- androidx.lifecycle:lifecycle-viewmodel:2.3.1 -> 2.5.1 (*)
+|         +--- androidx.resourceinspection:resourceinspection-annotation:1.0.1
+|         |    \--- androidx.annotation:annotation:1.1.0 -> 1.5.0 (*)
+|         +--- androidx.savedstate:savedstate:1.1.0 -> 1.2.0 (*)
+|         +--- org.jetbrains.kotlin:kotlin-stdlib:1.7.10 -> 1.7.20 (*)
+|         \--- androidx.appcompat:appcompat-resources:1.5.0 (c)
-+--- androidx.appcompat:appcompat:1.4.2 (*)
++--- androidx.appcompat:appcompat:1.4.2 -> 1.5.0 (*)
 +--- com.google.android.material:material:1.6.1
-|    \--- androidx.appcompat:appcompat:1.1.0 -> 1.4.2 (*)
+|    \--- androidx.appcompat:appcompat:1.1.0 -> 1.5.0 (*)
 +--- androidx.preference:preference:1.2.0
-|    \--- androidx.appcompat:appcompat:1.1.0 -> 1.4.2 (*)
+|    \--- androidx.appcompat:appcompat:1.1.0 -> 1.5.0 (*)
 +--- org.wordpress:fluxc:trunk-9d9fae38503c1a9d519f593284e37617d545944e
-|    \--- androidx.appcompat:appcompat:1.0.2 -> 1.4.2 (*)
+|    \--- androidx.appcompat:appcompat:1.0.2 -> 1.5.0 (*)
 +--- org.wordpress:login:0.21.0
-|    +--- androidx.appcompat:appcompat:1.0.2 -> 1.4.2 (*)
+|    +--- androidx.appcompat:appcompat:1.0.2 -> 1.5.0 (*)
 |    \--- com.google.dagger:dagger-android-support:2.42
-|         \--- androidx.appcompat:appcompat:1.3.1 -> 1.4.2 (*)
+|         \--- androidx.appcompat:appcompat:1.3.1 -> 1.5.0 (*)
 +--- project :libs:cardreader
-|    \--- androidx.appcompat:appcompat:1.4.2 (*)
+|    \--- androidx.appcompat:appcompat:1.4.2 -> 1.5.0 (*)
 +--- project :libs:iap
-|    \--- androidx.appcompat:appcompat:1.4.2 (*)
+|    \--- androidx.appcompat:appcompat:1.4.2 -> 1.5.0 (*)
 +--- com.github.chrisbanes:PhotoView:2.3.0
-|    \--- androidx.appcompat:appcompat:1.0.0 -> 1.4.2 (*)
+|    \--- androidx.appcompat:appcompat:1.0.0 -> 1.5.0 (*)
 +--- com.automattic:about:0.0.6
-|    \--- com.google.android.material:compose-theme-adapter:1.1.1 -> 1.1.8
-|         +--- androidx.appcompat:appcompat:1.4.1 -> 1.4.2 (*)
-|         +--- androidx.core:core-ktx:1.7.0 -> 1.8.0 (*)
-|         +--- androidx.compose.runtime:runtime:1.1.1 -> 1.3.2 (*)
-|         +--- androidx.compose.material:material:1.1.1 -> 1.3.1 (*)
-|         +--- com.google.android.material:material:1.5.0 -> 1.6.1 (*)
-|         \--- org.jetbrains.kotlin:kotlin-stdlib:1.6.10 -> 1.7.20 (*)
+|    \--- com.google.android.material:compose-theme-adapter:1.1.1 -> 1.1.17
+|         +--- androidx.appcompat:appcompat:1.5.0 (*)
+|         +--- androidx.core:core-ktx:1.8.0 (*)
+|         +--- androidx.compose.runtime:runtime:1.3.0-beta01 -> 1.3.2 (*)
+|         +--- androidx.compose.material:material:1.3.0-beta01 -> 1.3.1 (*)
+|         +--- com.google.android.material:material:1.6.1 (*)
+|         \--- org.jetbrains.kotlin:kotlin-stdlib:1.7.10 -> 1.7.20 (*)
 +--- com.zendesk:support:5.0.8
 |    +--- com.zendesk:guide:1.0.7
 |    |    +--- com.zendesk:messaging:5.2.3
 |    |    |    +--- com.zendesk:common-ui:4.0.3
-|    |    |    |    \--- androidx.appcompat:appcompat:1.0.0 -> 1.4.2 (*)
+|    |    |    |    \--- androidx.appcompat:appcompat:1.0.0 -> 1.5.0 (*)
-|    |    |    \--- androidx.appcompat:appcompat:1.0.0 -> 1.4.2 (*)
+|    |    |    \--- androidx.appcompat:appcompat:1.0.0 -> 1.5.0 (*)
-|    |    \--- androidx.appcompat:appcompat -> 1.4.2 (*)
+|    |    \--- androidx.appcompat:appcompat -> 1.5.0 (*)
-|    \--- androidx.appcompat:appcompat:1.0.0 -> 1.4.2 (*)
+|    \--- androidx.appcompat:appcompat:1.0.0 -> 1.5.0 (*)
 +--- org.wordpress:mediapicker:0.1.1
-|    \--- androidx.appcompat:appcompat:1.4.1 -> 1.4.2 (*)
+|    \--- androidx.appcompat:appcompat:1.4.1 -> 1.5.0 (*)
-+--- com.google.android.material:compose-theme-adapter:1.1.8 (*)
++--- com.google.android.material:compose-theme-adapter:1.1.17 (*)
 \--- io.coil-kt:coil-compose:2.1.0
      \--- io.coil-kt:coil-compose-base:2.1.0
           \--- io.coil-kt:coil-base:2.1.0
-               \--- androidx.appcompat:appcompat-resources:1.4.1 -> 1.4.2 (*)
+               \--- androidx.appcompat:appcompat-resources:1.4.1 -> 1.5.0 (*)

Please review and act accordingly

@JorgeMucientes JorgeMucientes merged commit 4fb8bf8 into trunk Jan 9, 2023
@JorgeMucientes JorgeMucientes deleted the dependabot/gradle/com.google.android.material-compose-theme-adapter-1.1.17 branch January 9, 2023 13:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bot: dependencies update PRs that update a dependency file, used by Dependabot. status: blocked Blocked from progressing somehow, waiting for another piece of work to be done.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants