Kotlin: clean up alternate-version code now that v1.5.x support is dropped #19496
Conversation
This file contains hidden or 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
There was a problem hiding this comment.
Pull Request Overview
Clean up version-specific wrappers now that support for Kotlin v1.5.x has been dropped and inlined functionality directly into v1.6.0.
- Delete unused type aliases and helper functions for v1.5.0, v1.5.20, and v1.6.0
- Inline direct calls to
pluginContext.irBuiltIns.annotationTypeandpluginContext.irBuiltIns.functionN - Remove obsolete imports of versioned helpers
Reviewed Changes
Copilot reviewed 42 out of 42 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_6_0/IrBuiltIns.kt | Removed redundant IrBuiltIns typealias for v1.6.0 |
| java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_6_0/Functions.kt | Removed redundant functionN helper for v1.6.0 |
| java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_20/FileEntry.kt | Removed legacy FileEntry alias for v1.5.20 |
| java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_0/annotationType.kt | Removed deprecated annotation type helper for v1.5.0 |
| java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_0/Psi2Ir.kt | Removed stub of getPsi2Ir for v1.5.0 |
| java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_0/IrBuiltIns.kt | Removed outdated IrBuiltIns alias for v1.5.0 |
| java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_0/Functions.kt | Removed version-specific functionN implementation for v1.5.0 |
| java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_5_0/FileEntry.kt | Removed legacy FileEntry alias for v1.5.0 |
| java/kotlin-extractor/src/main/kotlin/MetaAnnotationSupport.kt | Inlined pluginContext.irBuiltIns.annotationType in place of helper |
| java/kotlin-extractor/src/main/kotlin/KotlinFileExtractor.kt | Inlined pluginContext.irBuiltIns.functionN in place of helper |
Comments suppressed due to low confidence (1)
java/kotlin-extractor/src/main/kotlin/utils/versions/v_1_6_0/Functions.kt:1
- [nitpick] The v_1_6_0 directory is now empty after removing its files; consider deleting the folder to avoid leftover empty version directories.
package com.github.codeql.utils.versions
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.
Alternative versions for v1.5.0 and v1.5.20 are merged forwards into v1.6.0 preferring the later version. Three files are deleted entirely since there would now be only one version, and their definitions inlined.