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 mockk from 1.12.3 to 1.13.2 - BLOCK - REBASE LATER #7250

Closed
wants to merge 3 commits into from

Conversation

dependabot[bot]
Copy link
Contributor

@dependabot dependabot bot commented on behalf of github Sep 28, 2022

Bumps mockk from 1.12.3 to 1.13.2.
Updates mockk from 1.12.3 to 1.13.2

Release notes

Sourced from mockk's releases.

1.13.2

What's Changed

New Contributors

Full Changelog: mockk/mockk@1.13.1...1.13.2

1.13.1

New major release, mainly because the dependency to be included in gradle/maven files has changed from io.mockk:mockk to io.mockk:mockk-<platform>, where platform is either jvm or android.

What's Changed

Full Changelog: mockk/mockk@v1.12.8...1.13.1

V1.12.8

Big thanks to @​aSemy, @​qoomon and @​kubode for investigating and fixing the bugs introduced in v1.12.7 and further improving the library!

What's Changed

Full Changelog: mockk/mockk@1.12.7...v1.12.8

1.12.7

What's Changed

New Contributors

Full Changelog: mockk/mockk@1.12.6...1.12.7

... (truncated)

Commits
  • 6d5fe10 Bump version to 1.13.3-SNAPSHOT
  • 85737c8 Merge pull request #933 from aSemy/add_jdk_19_to_test_matrix
  • 51dac76 Merge remote-tracking branch 'origin/master' into add_jdk_19_to_test_matrix
  • 985c6fe add jdk 19 to workflow test matrix
  • 159a50a Merge pull request #916 from stuebingerb/fix/fix-sealed-classes
  • 7cf6f19 Merge pull request #926 from aSemy/docs/readme_update_dependencies
  • 00b8bb9 formatting, remove NBSPs
  • 7a826fc update dependencies in readme to reflect new multiplatform structure
  • 3c78f7c Updated the dependency name after 1.13.1 change
  • 5f7a350 Bump version after 1.13.1 release
  • Additional commits viewable in compare view

Updates mockk-android from 1.12.3 to 1.13.2

Release notes

Sourced from mockk-android's releases.

1.13.2

What's Changed

New Contributors

Full Changelog: mockk/mockk@1.13.1...1.13.2

1.13.1

New major release, mainly because the dependency to be included in gradle/maven files has changed from io.mockk:mockk to io.mockk:mockk-<platform>, where platform is either jvm or android.

What's Changed

Full Changelog: mockk/mockk@v1.12.8...1.13.1

V1.12.8

Big thanks to @​aSemy, @​qoomon and @​kubode for investigating and fixing the bugs introduced in v1.12.7 and further improving the library!

What's Changed

Full Changelog: mockk/mockk@1.12.7...v1.12.8

1.12.7

What's Changed

New Contributors

Full Changelog: mockk/mockk@1.12.6...1.12.7

... (truncated)

Commits
  • 6d5fe10 Bump version to 1.13.3-SNAPSHOT
  • 85737c8 Merge pull request #933 from aSemy/add_jdk_19_to_test_matrix
  • 51dac76 Merge remote-tracking branch 'origin/master' into add_jdk_19_to_test_matrix
  • 985c6fe add jdk 19 to workflow test matrix
  • 159a50a Merge pull request #916 from stuebingerb/fix/fix-sealed-classes
  • 7cf6f19 Merge pull request #926 from aSemy/docs/readme_update_dependencies
  • 00b8bb9 formatting, remove NBSPs
  • 7a826fc update dependencies in readme to reflect new multiplatform structure
  • 3c78f7c Updated the dependency name after 1.13.1 change
  • 5f7a350 Bump version after 1.13.1 release
  • Additional commits viewable in compare view

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)

@dependabot dependabot bot added dependencies Pull requests that update a dependency file java Pull requests that update Java code labels Sep 28, 2022
@dependabot dependabot bot requested review from a team and yostyle and removed request for a team September 28, 2022 23:17
@dependabot dependabot bot requested review from Florian14 and mnaturel September 28, 2022 23:17
@Florian14
Copy link
Contributor

@dependabot rebase

@dependabot dependabot bot force-pushed the dependabot/gradle/mockk-1.13.2 branch from 76296c2 to ceeb52a Compare October 5, 2022 08:25
@Florian14
Copy link
Contributor

Still blocked because of:

Execution failed for task ':element-android:vector:mergeDebugAndroidTestJavaResource'.
> A failure occurred while executing com.android.build.gradle.internal.tasks.MergeJavaResWorkAction
   > 2 files found with path 'MANIFEST.MF' from inputs:
      - /home/runner/.gradle/caches/transforms-3/ffaf689bdde2285373c6e15dcac7f7d1/transformed/jetified-mockk-agent-android-1.13.2/jars/classes.jar
      - /home/runner/.gradle/caches/transforms-3/ed3634fff82f765b582c3168fb67fe77/transformed/jetified-checker-3.1.1.jar

Not better after disabling jetifier (which should now be possible according to #7214 (comment)):

Execution failed for task ':vector:mergeDebugAndroidTestJavaResource'.
> A failure occurred while executing com.android.build.gradle.internal.tasks.MergeJavaResWorkAction
  > 2 files found with path 'MANIFEST.MF' from inputs:
     - /Users/florianr/.gradle/caches/transforms-3/78b00cb7aa826fc5eee4625bd2dd82a5/transformed/mockk-agent-android-1.13.2/jars/classes.jar
     - /Users/florianr/.gradle/caches/modules-2/files-2.1/org.checkerframework/checker/3.1.1/ae500b8c751519355226aa862ef0a83c6983a8bb/checker-3.1.1.jar

Copy link
Member

@bmarty bmarty left a 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 🤞 .

@@ -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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe remove the comment?

@Florian14 Florian14 force-pushed the dependabot/gradle/mockk-1.13.2 branch from 0009bf0 to 8fa51f2 Compare October 10, 2022 12:51
@Florian14
Copy link
Contributor

Florian14 commented Oct 10, 2022

@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 🤞 .

@bmarty It should be fixed now, I used merge instead of pickFirsts following this post

@Florian14 Florian14 force-pushed the dependabot/gradle/mockk-1.13.2 branch from 8fa51f2 to 566e7f7 Compare October 10, 2022 13:59
@bmarty
Copy link
Member

bmarty commented Oct 10, 2022

There is still an error:

java.lang.IllegalStateException: Zip file '/home/runner/work/element-android/element-android/vector-app/build/outputs/apk/gplay/debug/vector-gplay-arm64-v8a-debug.apk' already contains entry 'META-INF/MANIFEST.MF', cannot overwrite

Looks like merge "**/MANIFEST.MF" does not work (?)

@Florian14
Copy link
Contributor

There is still an error:

java.lang.IllegalStateException: Zip file '/home/runner/work/element-android/element-android/vector-app/build/outputs/apk/gplay/debug/vector-gplay-arm64-v8a-debug.apk' already contains entry 'META-INF/MANIFEST.MF', cannot overwrite

Looks like merge "**/MANIFEST.MF" does not work (?)

@bmarty I think we should probably do the same in the build.gradle of the vector-app module

@yostyle yostyle removed their request for review October 14, 2022 17:57
@Florian14 Florian14 force-pushed the dependabot/gradle/mockk-1.13.2 branch from 566e7f7 to d205455 Compare October 21, 2022 12:30
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]>
@bmarty bmarty force-pushed the dependabot/gradle/mockk-1.13.2 branch 2 times, most recently from 4b19736 to 55389f2 Compare October 25, 2022 15:29
@bmarty bmarty force-pushed the dependabot/gradle/mockk-1.13.2 branch from 55389f2 to 22a8130 Compare October 25, 2022 15:34
@bmarty
Copy link
Member

bmarty commented Oct 25, 2022

@Florian14 this should be fine now, I have reverted your changes and force pushed.

@bmarty bmarty enabled auto-merge October 25, 2022 15:35
@sonarqubecloud
Copy link

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
No Duplication information No Duplication information

@bmarty
Copy link
Member

bmarty commented Oct 25, 2022

Failure to build Android test:

 > A failure occurred while executing com.android.build.gradle.internal.tasks.MergeJavaResWorkAction
   > 2 files found with path 'MANIFEST.MF' from inputs:
      - /home/runner/.gradle/caches/transforms-3/9ba5ca6779bd9faece19cca61d40fbbe/transformed/jetified-mockk-agent-android-1.13.2/jars/classes.jar
      - /home/runner/.gradle/caches/transforms-3/83f18932f500eb453310d51ef11bbafa/transformed/jetified-checker-3.1.1.jar
     Adding a packagingOptions block may help, please refer to
     https://developer.android.com/reference/tools/gradle-api/7.3/com/android/build/api/dsl/ResourcesPackagingOptions
     for more information

I will handle it

@Florian14
Copy link
Contributor

Failure to build Android test:

 > A failure occurred while executing com.android.build.gradle.internal.tasks.MergeJavaResWorkAction
   > 2 files found with path 'MANIFEST.MF' from inputs:
      - /home/runner/.gradle/caches/transforms-3/9ba5ca6779bd9faece19cca61d40fbbe/transformed/jetified-mockk-agent-android-1.13.2/jars/classes.jar
      - /home/runner/.gradle/caches/transforms-3/83f18932f500eb453310d51ef11bbafa/transformed/jetified-checker-3.1.1.jar
     Adding a packagingOptions block may help, please refer to
     https://developer.android.com/reference/tools/gradle-api/7.3/com/android/build/api/dsl/ResourcesPackagingOptions
     for more information

I will handle it

This is the issue I tried to fix in several ways...

@bmarty
Copy link
Member

bmarty commented Oct 26, 2022

OK, I am stuck at this point. This is not an urgent upgrade, so maybe rebasing later will just fix the issue.

@bmarty bmarty changed the title Bump mockk from 1.12.3 to 1.13.2 Bump mockk from 1.12.3 to 1.13.2 - BLOCK - REBASE LATER Oct 26, 2022
@bmarty
Copy link
Member

bmarty commented Jan 10, 2023

Let's handle that later.

@bmarty bmarty closed this Jan 10, 2023
auto-merge was automatically disabled January 10, 2023 13:46

Pull request was closed

@dependabot @github
Copy link
Contributor Author

dependabot bot commented on behalf of github Jan 10, 2023

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 ignore condition with the desired update_types to your config file.

If you change your mind, just re-open this PR and I'll resolve any conflicts on it.

@dependabot dependabot bot deleted the dependabot/gradle/mockk-1.13.2 branch January 10, 2023 13:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dependencies Pull requests that update a dependency file java Pull requests that update Java code
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants