Update Kotlin to 1.7.20-RC #2682
Merged
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
Sep 26, 2022
Comment on lines
-23
to
-30
| internal fun Project.compilationsOf(sourceSet: KotlinSourceSet): List<KotlinCompilation> { | ||
| //KT-45412 Make sure .kotlinSourceSets and .allKotlinSourceSets include the default source set | ||
| return allCompilationsOf(sourceSet).filter { compilation -> sourceSet in compilation.kotlinSourceSets || sourceSet == compilation.defaultSourceSet } | ||
| } | ||
|
|
||
| private fun KotlinMultiplatformExtension.allCompilationsOf(sourceSet: KotlinSourceSet): List<KotlinCompilation> { | ||
| val allCompilations = targets.flatMap { target -> target.compilations } | ||
| return allCompilations.filter { compilation -> sourceSet in compilation.allKotlinSourceSets || sourceSet == compilation.defaultSourceSet } |
There was a problem hiding this comment.
It failed with Overload resolution ambiguity, so refactored it a bit
e: /home/ignat/IdeaProjects/dokka/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/kotlinCompilationUtils.kt: (17, 51): Overload resolution ambiguity:
private fun [Error type: Type for error type constructor (KotlinSingleTargetExtension)].allCompilationsOf(sourceSet: KotlinSourceSet): List<org.jetbrains.dokka.gradle.kotlin.KotlinCompilation /* = org.jetbrains.kotlin.gradle.plugin.KotlinCompilation<KotlinCommonOptions> */> defined in org.jetbrains.dokka.gradle.kotlin in file kotlinCompilationUtils.kt
private fun KotlinMultiplatformExtension.allCompilationsOf(sourceSet: KotlinSourceSet): List<org.jetbrains.dokka.gradle.kotlin.KotlinCompilation /* = org.jetbrains.kotlin.gradle.plugin.KotlinCompilation<KotlinCommonOptions> */> defined in org.jetbrains.dokka.gradle.kotlin in file kotlinCompilationUtils.kt
e: /home/ignat/IdeaProjects/dokka/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/kotlinCompilationUtils.kt: (18, 12): One type argument expected. Use 'KotlinSingleTargetExtension<*>' if you don't want to pass type arguments
e: /home/ignat/IdeaProjects/dokka/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/kotlinCompilationUtils.kt: (25, 12): Overload resolution ambiguity:
private fun [Error type: Type for error type constructor (KotlinSingleTargetExtension)].allCompilationsOf(sourceSet: KotlinSourceSet): List<org.jetbrains.dokka.gradle.kotlin.KotlinCompilation /* = org.jetbrains.kotlin.gradle.plugin.KotlinCompilation<KotlinCommonOptions> */> defined in org.jetbrains.dokka.gradle.kotlin in file kotlinCompilationUtils.kt
internal fun Project.allCompilationsOf(sourceSet: KotlinSourceSet): List<org.jetbrains.dokka.gradle.kotlin.KotlinCompilation /* = org.jetbrains.kotlin.gradle.plugin.KotlinCompilation<KotlinCommonOptions> */> defined in org.jetbrains.dokka.gradle.kotlin in file kotlinCompilationUtils.kt
e: /home/ignat/IdeaProjects/dokka/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/kotlinCompilationUtils.kt: (25, 50): Cannot infer a type for this parameter. Please specify it explicitly.
e: /home/ignat/IdeaProjects/dokka/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/kotlinCompilationUtils.kt: (33, 13): One type argument expected for class KotlinSingleTargetExtension<TARGET : KotlinTarget>
e: /home/ignat/IdeaProjects/dokka/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/kotlin/kotlinCompilationUtils.kt: (34, 41): Cannot infer a type for this parameter. Please specify it explicitly
IgnatBeresnev
commented
Sep 26, 2022
Comment on lines
+365
to
+369
| CommonAnalysisParameters( | ||
| metadataPartProviderFactory = { content -> | ||
| environment.createPackagePartProvider(content.moduleContentScope) | ||
| } | ||
| ), |
There was a problem hiding this comment.
A new primary constructor arg has been added (doesn't look like we need it), so have to use named parameters
IgnatBeresnev
commented
Sep 26, 2022
| @@ -113,7 +113,7 @@ class GradleDokkaSourceSetBuilderTest { | |||
| sourceSet.dependsOn(sourceSet.DokkaSourceSetID("s3")) | |||
| sourceSet.dependsOn(GradleDokkaSourceSetBuilder("s4", project)) | |||
| sourceSet.dependsOn(GradleDokkaSourceSetBuilder("s5", project).build()) | |||
| sourceSet.dependsOn(DefaultKotlinSourceSet(project, "s6")) | |||
There was a problem hiding this comment.
Looks like there was some refactoring of gradle api, DefaultKotlinSourceSet is now abstract, so cannot instantiate it directly.
vmishenev
reviewed
Sep 26, 2022
Oh yeah, indeed. I had a feeling I forgot to do something, that was it :) |
IgnatBeresnev
force-pushed
the
kotlin-1.7.20-RC
branch
from
ead9d99
to
36e4be0
Compare
|
JFYI serialization and coroutine integration tests cannot be run with Kotlin 1.7.20 yet - there's native/npm compilation failures. So I didn't update them |
vmishenev
approved these changes
Sep 27, 2022
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.
No description provided.