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 kotlin 1.7.10, and language level to 1.5 #850

Merged
merged 8 commits into from Jul 21, 2022
Merged

Conversation

aSemy
Copy link
Contributor

@aSemy aSemy commented Jul 20, 2022

This PR updates the version of Kotlin to the latest version, 1.7.10.

I also set the API and language levels to 1.7. I have NO idea if this is the best choice! On one hand, I think it's best to 'go big or go home' - this kind of change only needs to be done once, and now mockk is at a high language level that will be available for years. On the other hand, perhaps maintaining and providing as wide compatibility is best. discussed below, will bump to 1.5

I'm making this change to help work related to supporting value classes - see #152 and #849

Summary

  • bumped Kotlin to 1.7.10
  • bumped Kotlin language & API levels to 1.5
  • regenerated binary-compatibility API specs
  • updated the GitHub action matrix to remove 1.4 and add 1.7
  • minor Kotlin migrations
    • toUpperCase() -> uppercase(), toLowerCase() -> lowercase()
    • made a couple of when branches exhaustive
  • As a minor change, I also converted some http URLs in the docs to https, since I spotted them.

@aSemy aSemy mentioned this pull request Jul 20, 2022
build.gradle Outdated Show resolved Hide resolved
@aSemy aSemy changed the title bump kotlin 1.7.10, and language level to 1.7 bump kotlin 1.7.10, and language level to 1.5 Jul 20, 2022
when (outcome) {
is VerificationResult.OK -> if (inverse) {
val callsReport = VerificationHelpers.formatCalls(outcome.verifiedCalls)
throw AssertionError("Inverse verification failed.\n\nVerified calls:\n$callsReport")
}
} else {
when (outcome) {
is VerificationResult.Failure -> throw AssertionError("Verification failed: ${outcome.message}")
is VerificationResult.Failure -> if (!inverse) {
throw AssertionError("Verification failed: ${outcome.message}")
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I did a little bit of refactoring here because having two 'when' statements seemed odd. I think it's clearer now.

@Raibaz Raibaz merged commit 54e30ec into mockk:master Jul 21, 2022
44 checks passed
@aSemy aSemy deleted the kotlin-1-7 branch July 24, 2022 09:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants