Enable explicit API mode #3139
Merged
Enable explicit API mode #3139
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
IgnatBeresnev
commented
Aug 24, 2023
| val projectsWithoutOptInDependency = setOf( | ||
| ":integration-tests", ":integration-tests:gradle", ":integration-tests:maven", ":integration-tests:cli") | ||
| kotlin { | ||
| explicitApi = ExplicitApiMode.Strict |
There was a problem hiding this comment.
If explicitApi was set in tasks.withType<KotlinCompile>(), it would be applied to the test sources as well, which we don't want. But setting it in kotlin {} fixes it, so I did that and moved other compiler arguments into it as well.
IgnatBeresnev
commented
Aug 24, 2023
Comment on lines
-107
to
+126
| fun ContentMatcherBuilder<*>.list(block: ContentMatcherBuilder<ContentList>.() -> Unit) = composite(block) | ||
| public fun ContentMatcherBuilder<*>.list(block: ContentMatcherBuilder<ContentList>.() -> Unit) { | ||
| composite(block) | ||
| } |
There was a problem hiding this comment.
Instead of specifying the : Unit return type, I converted void functions to block bodies. Didn't think it would lead to so many changes lines, sorry if it makes it difficult to review :(
IgnatBeresnev
force-pushed
the
explicit-api-mode
branch
2 times, most recently
from
c2ffa20 to
8d7e77a
Compare
|
Rebased the branch onto |
IgnatBeresnev
force-pushed
the
explicit-api-mode
branch
from
8d7e77a to
c384eac
Compare
|
Had to rebase and force push again after #3149, there were too many conflicts |
vmishenev
approved these changes
Aug 31, 2023
Language settings weren't applied to the integrationTest module before by mistake, but now they are, so assertContains is not available
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Depends on #3138, will rebase onto master once it gets merged.
This PR enables explicit API mode, which adds compiler checks for explicit visibility modifiers and return types.
You can see by the changes in the
.apifiles that I changed some of the return types - I believe they were inferred incorrectly, as in most cases the supertype was deduced instead of the interface / base type. Other than that, I think everything should be fine in terms of backward compatibility.Additionally, because visibility modifiers and return types made the lines longer, I did some small reformatting along the way, mostly adding line breaks or converting functions to block bodies.