-
Notifications
You must be signed in to change notification settings - Fork 743
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 mockk from 1.12.3 to 1.13.2 - BLOCK - REBASE LATER #7250
Conversation
@dependabot rebase |
76296c2
to
ceeb52a
Compare
Still blocked because of:
Not better after disabling jetifier (which should now be possible according to #7214 (comment)):
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@Florian14 have you tried the suggested solution (https://developer.android.com/reference/tools/gradle-api/7.2/com/android/build/api/dsl/ResourcesPackagingOptions)? We had a packagingOptions
block in the past, but it had vanished, I do not know why. Using pickFirsts
should fix the issue 🤞 .
dependencies.gradle
Outdated
@@ -32,7 +32,7 @@ def vanniktechEmoji = "0.16.0-SNAPSHOT" | |||
def fragment = "1.5.3" | |||
|
|||
// Testing | |||
def mockk = "1.12.3" // We need to use 1.12.3 to have mocking in androidTest until a new version is released: https://github.com/mockk/mockk/issues/819 | |||
def mockk = "1.13.2" // We need to use 1.12.3 to have mocking in androidTest until a new version is released: https://github.com/mockk/mockk/issues/819 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe remove the comment?
0009bf0
to
8fa51f2
Compare
@bmarty It should be fixed now, I used |
8fa51f2
to
566e7f7
Compare
There is still an error:
Looks like |
@bmarty I think we should probably do the same in the |
566e7f7
to
d205455
Compare
Bumps `mockk` from 1.12.3 to 1.13.2. Updates `mockk` from 1.12.3 to 1.13.2 - [Release notes](https://github.com/mockk/mockk/releases) - [Commits](mockk/mockk@1.12.3...1.13.2) Updates `mockk-android` from 1.12.3 to 1.13.2 - [Release notes](https://github.com/mockk/mockk/releases) - [Commits](mockk/mockk@1.12.3...1.13.2) --- updated-dependencies: - dependency-name: io.mockk:mockk dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.mockk:mockk-android dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>
4b19736
to
55389f2
Compare
55389f2
to
22a8130
Compare
@Florian14 this should be fine now, I have reverted your changes and force pushed. |
Kudos, SonarCloud Quality Gate passed! |
Failure to build Android test:
I will handle it |
This is the issue I tried to fix in several ways... |
OK, I am stuck at this point. This is not an urgent upgrade, so maybe rebasing later will just fix the issue. |
Let's handle that later. |
Pull request was closed
OK, I won't notify you again about this release, but will get in touch when a new version is available. You can also ignore all major, minor, or patch releases for a dependency by adding an If you change your mind, just re-open this PR and I'll resolve any conflicts on it. |
Bumps
mockk
from 1.12.3 to 1.13.2.Updates
mockk
from 1.12.3 to 1.13.2Release notes
Sourced from mockk's releases.
... (truncated)
Commits
6d5fe10
Bump version to 1.13.3-SNAPSHOT85737c8
Merge pull request #933 from aSemy/add_jdk_19_to_test_matrix51dac76
Merge remote-tracking branch 'origin/master' into add_jdk_19_to_test_matrix985c6fe
add jdk 19 to workflow test matrix159a50a
Merge pull request #916 from stuebingerb/fix/fix-sealed-classes7cf6f19
Merge pull request #926 from aSemy/docs/readme_update_dependencies00b8bb9
formatting, remove NBSPs7a826fc
update dependencies in readme to reflect new multiplatform structure3c78f7c
Updated the dependency name after 1.13.1 change5f7a350
Bump version after 1.13.1 releaseUpdates
mockk-android
from 1.12.3 to 1.13.2Release notes
Sourced from mockk-android's releases.
... (truncated)
Commits
6d5fe10
Bump version to 1.13.3-SNAPSHOT85737c8
Merge pull request #933 from aSemy/add_jdk_19_to_test_matrix51dac76
Merge remote-tracking branch 'origin/master' into add_jdk_19_to_test_matrix985c6fe
add jdk 19 to workflow test matrix159a50a
Merge pull request #916 from stuebingerb/fix/fix-sealed-classes7cf6f19
Merge pull request #926 from aSemy/docs/readme_update_dependencies00b8bb9
formatting, remove NBSPs7a826fc
update dependencies in readme to reflect new multiplatform structure3c78f7c
Updated the dependency name after 1.13.1 change5f7a350
Bump version after 1.13.1 releaseDependabot 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)