Support Kotlin 1.4 by arturbosch · Pull Request #2981 · detekt/detekt

arturbosch · 2020-08-18T12:23:54Z

arturbosch · 2020-08-18T12:25:28Z

-                        bindingContext[BindingContext.DECLARATION_TO_DESCRIPTOR, it] !in referenceDescriptors
+                    val referenceDescriptors = (references + referencesViaOperator)
+                        .mapNotNull { it.getResolvedCall(bindingContext)?.resultingDescriptor }
+                        .map { it.original }


The resulting descriptors are not the same reference-wise. So I had to unwrap them in Kotlin 1.4.

arturbosch · 2020-08-18T12:36:55Z

I'm not sure how to resolve this Gradle warning:

> Task :detekt-gradle-plugin:compileKotlin FAILED
    /home/runner/.gradle/wrapper/dists/gradle-6.6-all/dm6whvs5m6hlkbnc6ae2jubui/gradle-6.6/lib/kotlin-stdlib-common-1.3.72.jar (version 1.3)
    /home/runner/.gradle/wrapper/dists/gradle-6.6-all/dm6whvs5m6hlkbnc6ae2jubui/gradle-6.6/lib/kotlin-stdlib-jdk7-1.3.72.jar (version 1.3)
    /home/runner/.gradle/wrapper/dists/gradle-6.6-all/dm6whvs5m6hlkbnc6ae2jubui/gradle-6.6/lib/kotlin-stdlib-jdk8-1.3.72.jar (version 1.3)
    /home/runner/.gradle/wrapper/dists/gradle-6.6-all/dm6whvs5m6hlkbnc6ae2jubui/gradle-6.6/lib/kotlin-reflect-1.3.72.jar (version 1.3)
    /home/runner/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.4.0/e3765b66f0610afc92053ff1a93a87a544fca2b/kotlin-stdlib-jdk8-1.4.0.jar (version 1.4)
    /home/runner/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.4.0/9cc187c3dfaf6e4001bdf962e3cdadff7690261b/kotlin-stdlib-jdk7-1.4.0.jar (version 1.4)
    /home/runner/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.4.0/63e75298e93d4ae0b299bb869cf0c627196f8843/kotlin-stdlib-1.4.0.jar (version 1.4)
    /home/runner/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.4.0/1c752cce0ead8d504ccc88a4fed6471fd83ab0dd/kotlin-stdlib-common-1.4.0.jar (version 1.4)
w: Consider providing an explicit dependency on kotlin-reflect 1.4 to prevent strange errors
w: Some runtime JAR files in the classpath have an incompatible version. Consider removing them from the classpath
e: warnings found and -Werror specified

Including kotlin-reflect as runtime or implementation dependency does not fix this.

codecov · 2020-08-18T13:10:41Z

Codecov Report

Merging #2981 into master will decrease coverage by 0.54%.
The diff coverage is 84.37%.

@@             Coverage Diff              @@
##             master    #2981      +/-   ##
============================================
- Coverage     80.31%   79.77%   -0.55%     
- Complexity     2477     2493      +16     
============================================
  Files           424      424              
  Lines          7478     7490      +12     
  Branches       1369     1409      +40     
============================================
- Hits           6006     5975      -31     
- Misses          760      768       +8     
- Partials        712      747      +35

Impacted Files	Coverage Δ	Complexity Δ
...io/gitlab/arturbosch/detekt/core/BindingContext.kt	`6.25% <0.00%> (+0.36%)`	`0.00 <0.00> (ø)`
...ab/arturbosch/detekt/core/settings/LoggingAware.kt	`42.85% <50.00%> (ø)`	`0.00 <0.00> (ø)`
...turbosch/detekt/rules/style/UnusedPrivateMember.kt	`91.42% <86.66%> (+0.16%)`	`5.00 <0.00> (ø)`
...ab/arturbosch/detekt/cli/DetektProgressListener.kt	`83.33% <100.00%> (ø)`	`4.00 <0.00> (ø)`
...tlin/io/gitlab/arturbosch/detekt/cli/JCommander.kt	`91.30% <100.00%> (ø)`	`0.00 <0.00> (ø)`
...gitlab/arturbosch/detekt/cli/runners/AstPrinter.kt	`100.00% <100.00%> (ø)`	`4.00 <0.00> (ø)`
...ab/arturbosch/detekt/cli/runners/ConfigExporter.kt	`75.00% <100.00%> (ø)`	`2.00 <0.00> (ø)`
...ab/arturbosch/detekt/cli/runners/ElementPrinter.kt	`96.42% <100.00%> (ø)`	`11.00 <0.00> (ø)`
...ab/arturbosch/detekt/cli/runners/VersionPrinter.kt	`100.00% <100.00%> (ø)`	`2.00 <1.00> (ø)`
...b/arturbosch/detekt/core/reporting/OutputFacade.kt	`94.11% <100.00%> (ø)`	`10.00 <0.00> (ø)`
... and 33 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update f3877b4...b575a17. Read the comment docs.

BraisGabin · 2020-08-18T17:07:44Z

I'm not sure how to resolve this Gradle warning:

> Task :detekt-gradle-plugin:compileKotlin FAILED
    /home/runner/.gradle/wrapper/dists/gradle-6.6-all/dm6whvs5m6hlkbnc6ae2jubui/gradle-6.6/lib/kotlin-stdlib-common-1.3.72.jar (version 1.3)
    /home/runner/.gradle/wrapper/dists/gradle-6.6-all/dm6whvs5m6hlkbnc6ae2jubui/gradle-6.6/lib/kotlin-stdlib-jdk7-1.3.72.jar (version 1.3)
    /home/runner/.gradle/wrapper/dists/gradle-6.6-all/dm6whvs5m6hlkbnc6ae2jubui/gradle-6.6/lib/kotlin-stdlib-jdk8-1.3.72.jar (version 1.3)
    /home/runner/.gradle/wrapper/dists/gradle-6.6-all/dm6whvs5m6hlkbnc6ae2jubui/gradle-6.6/lib/kotlin-reflect-1.3.72.jar (version 1.3)
    /home/runner/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.4.0/e3765b66f0610afc92053ff1a93a87a544fca2b/kotlin-stdlib-jdk8-1.4.0.jar (version 1.4)
    /home/runner/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.4.0/9cc187c3dfaf6e4001bdf962e3cdadff7690261b/kotlin-stdlib-jdk7-1.4.0.jar (version 1.4)
    /home/runner/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.4.0/63e75298e93d4ae0b299bb869cf0c627196f8843/kotlin-stdlib-1.4.0.jar (version 1.4)
    /home/runner/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.4.0/1c752cce0ead8d504ccc88a4fed6471fd83ab0dd/kotlin-stdlib-common-1.4.0.jar (version 1.4)
w: Consider providing an explicit dependency on kotlin-reflect 1.4 to prevent strange errors
w: Some runtime JAR files in the classpath have an incompatible version. Consider removing them from the classpath
e: warnings found and -Werror specified

Including kotlin-reflect as runtime or implementation dependency does not fix this.

Really strange... The 1.3.72 version doesn't appear at ./gradlew :detekt-gradle-plugin:dependencies

arturbosch · 2020-08-18T18:24:31Z

I'm not sure how to resolve this Gradle warning:

> Task :detekt-gradle-plugin:compileKotlin FAILED
    /home/runner/.gradle/wrapper/dists/gradle-6.6-all/dm6whvs5m6hlkbnc6ae2jubui/gradle-6.6/lib/kotlin-stdlib-common-1.3.72.jar (version 1.3)
    /home/runner/.gradle/wrapper/dists/gradle-6.6-all/dm6whvs5m6hlkbnc6ae2jubui/gradle-6.6/lib/kotlin-stdlib-jdk7-1.3.72.jar (version 1.3)
    /home/runner/.gradle/wrapper/dists/gradle-6.6-all/dm6whvs5m6hlkbnc6ae2jubui/gradle-6.6/lib/kotlin-stdlib-jdk8-1.3.72.jar (version 1.3)
    /home/runner/.gradle/wrapper/dists/gradle-6.6-all/dm6whvs5m6hlkbnc6ae2jubui/gradle-6.6/lib/kotlin-reflect-1.3.72.jar (version 1.3)
    /home/runner/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.4.0/e3765b66f0610afc92053ff1a93a87a544fca2b/kotlin-stdlib-jdk8-1.4.0.jar (version 1.4)
    /home/runner/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.4.0/9cc187c3dfaf6e4001bdf962e3cdadff7690261b/kotlin-stdlib-jdk7-1.4.0.jar (version 1.4)
    /home/runner/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.4.0/63e75298e93d4ae0b299bb869cf0c627196f8843/kotlin-stdlib-1.4.0.jar (version 1.4)
    /home/runner/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.4.0/1c752cce0ead8d504ccc88a4fed6471fd83ab0dd/kotlin-stdlib-common-1.4.0.jar (version 1.4)
w: Consider providing an explicit dependency on kotlin-reflect 1.4 to prevent strange errors
w: Some runtime JAR files in the classpath have an incompatible version. Consider removing them from the classpath
e: warnings found and -Werror specified

Including kotlin-reflect as runtime or implementation dependency does not fix this.

Really strange... The 1.3.72 version doesn't appear at ./gradlew :detekt-gradle-plugin:dependencies

It's the Kotlin version gradle-api ships with.

arturbosch · 2020-08-19T20:09:51Z

I would say lets merge this with the warning so our users have a working detekt version for Kotlin 1.4 if they do not use formatting to much.
Edit: code coverage should just be buggy here.

realdadfish · 2020-08-20T09:05:22Z

Kotlin 1.4 is smoke-tested currently in gradle/gradle#12660 and - with some luck - available with Gradle 6.7 - if Gradle does not decide to skip this upgrade until Gradle 7.

realdadfish

👍 LGTM

realdadfish · 2020-08-20T09:07:58Z

    environment: KotlinCoreEnvironment,
    classpath: List<String>,
-    files: List<KtFile>
+    files: List<KtFile>,


Nit: Out of interest - we can have trailing commas now, but why should we have them here?

Seems like IntelliJ autoformatted them for me here :/. Wasn't aware of.

3flex · 2020-08-20T12:49:41Z

 #### with Gradle

-Gradle 5.0+ is required:
+Gradle 5.3+ is required:


Is this changed to reflect the new minimum Gradle version required by Kotlin? If so....

Suggested change

Gradle 5.3+ is required:

Gradle 5.4+ is required:

https://kotlinlang.org/docs/reference/using-gradle.html#plugin-and-versions:

The Kotlin Gradle plugin 1.4.0 works with Gradle 5.4 and later.

Interesting! It works with 5.3 and running it with 5.0 revealed an error message saying it supports Gradle 5.3+.
But lets follow the website's info ^^

cortinico · 2020-08-20T16:37:11Z

 private fun getGradleVersionsUnderTest() =
    if (getJdkVersion() < 13) {
-        listOf("5.0", "6.4.1")
+        listOf("5.3", "6.6")


Suggested change

listOf("5.3", "6.6")

listOf("5.4", "6.6")

… 1.4

…bsite

* Deprecate Location.file in favor of Location.filePath * Fix warnings * Enable warningsAsErrors again This was removed in #2981 for an issue with kotlin 1.4 but that issue is fixed now so it's safe to enable it again

* Deprecate Location.file in favor of Location.filePath * Fix warnings * Enable warningsAsErrors again This was removed in detekt#2981 for an issue with kotlin 1.4 but that issue is fixed now so it's safe to enable it again

arturbosch added this to the 1.12.0-RC1 milestone Aug 18, 2020

arturbosch commented Aug 18, 2020

View reviewed changes

arturbosch force-pushed the kotlin-1.4 branch 2 times, most recently from bcd8a02 to e8aa819 Compare August 18, 2020 12:27

arturbosch mentioned this pull request Aug 18, 2020

Upgrade to new dokka #2931

Merged

arturbosch added the migration Marker to add a migration step in the changelog label Aug 18, 2020

arturbosch force-pushed the kotlin-1.4 branch from e2a80cf to a3f8692 Compare August 18, 2020 13:00

BraisGabin reviewed Aug 18, 2020

View reviewed changes

Comment thread config/detekt/detekt.yml

Comment thread config/detekt/format.yml

Comment thread gradle/wrapper/gradle-wrapper.properties

schalkms reviewed Aug 18, 2020

View reviewed changes

Comment thread detekt-cli/src/test/kotlin/io/gitlab/arturbosch/detekt/cli/runners/VersionPrinterSpec.kt

Comment thread gradlew

arturbosch mentioned this pull request Aug 18, 2020

Detekt fails with error #2983

Closed

BraisGabin approved these changes Aug 19, 2020

View reviewed changes

realdadfish reviewed Aug 20, 2020

View reviewed changes

3flex reviewed Aug 20, 2020

View reviewed changes

cortinico reviewed Aug 20, 2020

View reviewed changes

cortinico approved these changes Aug 20, 2020

View reviewed changes

arturbosch added 9 commits August 20, 2020 19:20

Update to Gradle 6.6

3bda983

Update to Kotlin 1.4

3392b80

Upgrade to prerelease of KtLint 0.38

90c5278

Fix testcase by unwrapping the original descriptor

557f4a2

Increase max heap for dokka on Java 11

2fe7a4d

Update minimal supported Gradle version to 5.3

86e6674

Do not run warningsAsErrors on CI due to Gradle not supporting Kotlin…

0caa53d

… 1.4

Remove new line testing as it fails on windows

fa3dfe9

Require Gradle 5.4 to reflect Kotlin's required version from their we…

b575a17

…bsite

arturbosch force-pushed the kotlin-1.4 branch from 2464940 to b575a17 Compare August 20, 2020 17:33

arturbosch merged commit ee49144 into master Aug 20, 2020

arturbosch deleted the kotlin-1.4 branch August 20, 2020 18:00

julioz mentioned this pull request Aug 21, 2020

Kotlin 1.4 and Gradle 6.6 julioz/FloorPlan#55

Merged

BraisGabin mentioned this pull request Apr 2, 2021

Warnings as errors #3646

Merged

Uh oh!

Conversation

arturbosch commented Aug 18, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

arturbosch Aug 18, 2020

Choose a reason for hiding this comment

Uh oh!

arturbosch commented Aug 18, 2020

Uh oh!

codecov bot commented Aug 18, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Uh oh!

Uh oh!

Uh oh!

BraisGabin commented Aug 18, 2020

Uh oh!

arturbosch commented Aug 18, 2020

Uh oh!

Uh oh!

Uh oh!

arturbosch commented Aug 19, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

realdadfish commented Aug 20, 2020

Uh oh!

realdadfish left a comment

Choose a reason for hiding this comment

Uh oh!

realdadfish Aug 20, 2020

Choose a reason for hiding this comment

Uh oh!

arturbosch Aug 20, 2020

Choose a reason for hiding this comment

Uh oh!

3flex Aug 20, 2020

Choose a reason for hiding this comment

Uh oh!

arturbosch Aug 20, 2020

Choose a reason for hiding this comment

Uh oh!

cortinico Aug 20, 2020

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

arturbosch commented Aug 18, 2020 •

edited

Loading

codecov bot commented Aug 18, 2020 •

edited

Loading

arturbosch commented Aug 19, 2020 •

edited

Loading