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.

Sign up for GitHub

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

Jump to bottom

Update to Kotlin 2.0.0 #6640

Merged
merged 6 commits into from May 22, 2024
+8 −8
Merged

Update to Kotlin 2.0.0 #6640

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0449694
Kotlin 2.0.0
3flex Nov 18, 2023
a032914
Poko 0.16.0-beta01
3flex May 21, 2024
6d32838
kctfork 0.5.0-alpha07
3flex Mar 21, 2024
e6cbe7c
Update import
3flex Dec 30, 2023
b11fd23
Pass Project to CliBindingTrace
3flex Mar 20, 2024
73c8d7e
Update expected error message in test
3flex Nov 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion detekt-api/build.gradle.kts
View file
Open in desktop
Expand Up @@ -2,7 +2,7 @@ plugins {
id("module")
id("public-api")
id("java-test-fixtures")
id("dev.drewhamilton.poko") version "0.15.3"
id("dev.drewhamilton.poko") version "0.16.0-beta01"
}

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion detekt-compiler-plugin/gradle.properties
View file
Open in desktop
@@ -1,4 +1,4 @@
kotlinCompilerChecksum=eb7b68e01029fa67bc8d060ee54c12018f2c60ddc438cf21db14517229aa693b
kotlinCompilerChecksum=ef578730976154fd2c5968d75af8c2703b3de84a78dffe913f670326e149da3b

kotlin.code.style=official
systemProp.sonar.host.url=http://localhost:9000
Expand Down
2 changes: 1 addition & 1 deletion detekt-parser/src/main/kotlin/io/github/detekt/parser/BindingContextUtils.kt
View file
Open in desktop
Expand Up @@ -36,7 +36,7 @@
TopDownAnalyzerFacadeForJVM.analyzeFilesWithJavaIntegration(
environment.project,
files,
NoScopeRecordCliBindingTrace(),
NoScopeRecordCliBindingTrace(environment.project),

Check warning on line 39 in detekt-parser/src/main/kotlin/io/github/detekt/parser/BindingContextUtils.kt

View check run for this annotation

Codecov / codecov/patch

detekt-parser/src/main/kotlin/io/github/detekt/parser/BindingContextUtils.kt#L39 

Added line #L39 was not covered by tests
environment.configuration,
environment::createPackagePartProvider
)
Expand Down
2 changes: 1 addition & 1 deletion ...s-errorprone/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/bugs/IgnoredReturnValue.kt
View file
Open in desktop
Expand Up @@ -13,8 +13,8 @@ import io.gitlab.arturbosch.detekt.api.configWithFallback
import io.gitlab.arturbosch.detekt.api.simplePatternToRegex
import io.gitlab.arturbosch.detekt.rules.fqNameOrNull
import io.gitlab.arturbosch.detekt.rules.isCalling
import org.jetbrains.kotlin.backend.common.serialization.findPackage
import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor
import org.jetbrains.kotlin.descriptors.findPackage
import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.psi.KtCallExpression
import org.jetbrains.kotlin.psi.KtExpression
Expand Down
2 changes: 1 addition & 1 deletion detekt-test-utils/src/test/kotlin/io/github/detekt/test/utils/KotlinScriptEngineTest.kt
View file
Open in desktop
Expand Up @@ -47,7 +47,7 @@ class KotlinScriptEngineTest {

assertThatThrownBy { KotlinScriptEngine.compile(codeWithMissingImport) }
.isInstanceOf(IllegalStateException::class.java)
.hasMessage("ERROR Unresolved reference: Random (script.main.kts:2:5)")
.hasMessage("ERROR Unresolved reference 'Random'. (script.main.kts:2:5)")
}

@RepeatedTest(10)
Expand Down
2 changes: 1 addition & 1 deletion ...-test/src/main/kotlin/io/gitlab/arturbosch/detekt/test/KotlinCoreEnvironmentExtensions.kt
View file
Open in desktop
Expand Up @@ -10,7 +10,7 @@ fun KotlinCoreEnvironment.createBindingContext(files: List<KtFile>): BindingCont
TopDownAnalyzerFacadeForJVM.analyzeFilesWithJavaIntegration(
this.project,
files,
NoScopeRecordCliBindingTrace(),
NoScopeRecordCliBindingTrace(this.project),
this.configuration,
this::createPackagePartProvider
).bindingContext
4 changes: 2 additions & 2 deletions gradle/libs.versions.toml
View file
Open in desktop
@@ -1,7 +1,7 @@
[versions]
dokka = "1.9.20"
jacoco = "0.8.12"
kotlin = "1.9.24"
kotlin = "2.0.0"
coroutines = "1.8.1"
ktlint = "1.2.1"
junit = "5.10.2"
Expand Down Expand Up @@ -42,7 +42,7 @@ assertj = "org.assertj:assertj-core:3.25.3"
classgraph = "io.github.classgraph:classgraph:4.8.172"
snakeyaml = "org.snakeyaml:snakeyaml-engine:2.7"
jcommander = "org.jcommander:jcommander:1.83"
kotlinCompileTesting = { module = "dev.zacsweers.kctfork:core", version = "0.4.1" }
kotlinCompileTesting = { module = "dev.zacsweers.kctfork:core", version = "0.5.0-alpha07" }
jetbrains-annotations = "org.jetbrains:annotations:24.1.0"

[plugins]
Expand Down