Fix kotlin master builds #345
Merged
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
e5l
approved these changes
Jun 2, 2025
There was a problem hiding this comment.
Pull Request Overview
This PR adapts the codebase to Kotlin 2.2.0 changes by updating the diagnostics API and introducing a new v_2_2_2 source set to distinguish between different Kotlin versions.
- Updated several diagnostic checker classes and APIs under the new v_2_2_2 source set.
- Refactored the registration of diagnostic renderer factories to use an overridden getRendererFactoryVs() method instead of static init blocks.
- Harmonized version-specific API implementations and adjusted import statements.
Reviewed Changes
Copilot reviewed 26 out of 26 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
| compiler-plugin/compiler-plugin-k2/src/main/v_2_2_2/kotlinx/rpc/codegen/checkers/FirRpcCheckersVS.kt | Introduces updated checker classes using new context receiver syntax. |
| compiler-plugin/compiler-plugin-k2/src/main/v_2_2_2/kotlinx/rpc/codegen/FirVersionSpecificApiImpl.kt | Implements version‑specific APIs using updated extension properties. |
| compiler-plugin/compiler-plugin-k2/src/main/v_2_2_2/kotlinx/rpc/codegen/FirRpcSupertypeGenerator.kt | Adapts the supertype generator logic for additional supertypes. |
| Various diagnostics files under v_2_2, pre_2_0_21, pre_2_0_10, and latest | Update diagnostic container classes, renderer factory registration, and diagnostic factories. |
| compiler-plugin/compiler-plugin-k2/src/main/core/kotlinx/rpc/codegen/checkers/diagnostics/… | Refactors diagnostic API registration to override getRendererFactoryVs(). |
| compiler-plugin/compiler-plugin-k2/src/main/core/kotlinx/rpc/codegen/FirVersionSpecificApi.kt | Cleans up unused imports to align with new Kotlin version changes. |
| @@ -35,13 +35,13 @@ object FirRpcDiagnostics { | |||
| val TYPE_PARAMETERS_IN_RPC_FUNCTION by error0<KtElement>(SourceElementPositioningStrategies.TYPE_PARAMETERS_LIST) | |||
| val TYPE_PARAMETERS_IN_RPC_INTERFACE by error0<KtElement>(SourceElementPositioningStrategies.TYPE_PARAMETERS_LIST) | |||
|
|
|||
| init { | |||
| RootDiagnosticRendererFactory.registerFactory(RpcDiagnosticRendererFactory) | |||
| override fun getRendererFactoryVs(): BaseDiagnosticRendererFactory { | |||
There was a problem hiding this comment.
[nitpick] Consider adding a comment to explain the transition from using an init block for factory registration to the overridden getRendererFactoryVs() approach to aid future maintainers.
Copilot uses AI. Check for mistakes.
| @@ -0,0 +1,60 @@ | |||
| /* | |||
| * Copyright 2023-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license. | |||
There was a problem hiding this comment.
[nitpick] Consider standardizing the copyright year across files (e.g., updating to 2023-2025) for consistency.
Copilot uses AI. Check for mistakes.
Mr3zee
added a commit
that referenced
this pull request
Jun 11, 2025
(cherry picked from commit 700fad1)
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.
Subsystem
Compiler plugin, Gradle
Problem Description
Kotlin 2.2.0 brings yet another changes
Solution