Bump kotlin-gradle-plugin from 1.5.31 to 1.6.0 - BLOCKED #4471

dependabot · 2021-11-15T23:08:10Z

EDIT @bmarty

Kotlin 1.6.0 now output warning for non exhaustive when so I have just deleted our exhaustive trick, it is not needed anymore.
Also updated the coroutine lib.
Could be reviewed commit per commit.

End of EDIT

Bumps kotlin-gradle-plugin from 1.5.31 to 1.6.0.

Release notes

Sourced from kotlin-gradle-plugin's releases.

Kotlin 1.6.0-RC2

Learn how to install Kotlin 1.6.0-RC2 plugin and how to configure build with 1.6.0-RC2

Changelog

Compiler

New Features

KT-43919 Support loading Java annotations on base classes and implementing interfaces' type arguments

Performance Improvements

KT-45185 FIR2IR: get rid of IrBuiltIns usages

Fixes

KT-49477 Has ran into recursion problem with two interdependant delegates

KT-49371 JVM / IR: "NoSuchMethodError" with multiple inheritance

KT-49294 Turning FlowCollector into 'fun interface' leads to AbstractMethodError

KT-18282 Companion object referencing it's own method during construction compiles successfully but fails at runtime with VerifyError

KT-25289 Prohibit access to class members in the super constructor call of its companion and nested object

KT-32753 Prohibit @JvmField on property in primary constructor that overrides interface property

KT-43433 Suspend conversion is disabled message in cases where it is not supported and quickfix to update language version is suggested

KT-49209 Default upper bound for type variables should be non-null

KT-22562 Deprecate calls to "suspend" named functions with single dangling lambda argument

KT-49335 NPE in RepeatedAnnotationLowering.wrapAnnotationEntriesInContainer when using @Repeatable annotation from different file

KT-49322 Postpone promoting warnings to errors for ProperTypeInferenceConstraintsProcessing feature

KT-49285 Exception on nested builder inference calls

KT-49101 IllegalArgumentException: ClassicTypeSystemContext couldn't handle: Captured(out Number)

KT-36399 Gradually support TYPE_USE nullability annotations read from class-files

KT-11454 Load annotations on TYPE_USE/TYPE_PARAMETER positions from Java class-files

KT-18768 @Notnull annotation from Java does not work with varargs

KT-24392 Nullability of Java arrays is read incorrectly if @Nullable annotation has both targets TYPE_USE and VALUE_PARAMETER

KT-48157 FIR: incorrect resolve with built-in names in use

KT-46409 FIR: erroneous resolve to qualifier instead of extension

KT-44566 FirConflictsChecker do not check for conflicting overloads across multiple files

KT-37318 FIR: Discuss treating flexible bounded constraints in inference

KT-45989 FIR: wrong callable reference type inferred

KT-46058 [FIR] Remove state from some checkers

KT-45973 FIR: wrong projection type inferred

KT-43083 [FIR] False positive 'HIDDEN' on internal

KT-46727 Report warning on contravariant usages of star projected argument from Java

KT-40668 FIR: Ambiguity on qualifier when having multiple different same-named objects in near scopes

KT-37081 [FIR] errors NO_ELSE_IN_WHEN and INCOMPATIBLE_TYPES absence

KT-48162 NON_VARARG_SPREAD isn't reported on *toTypedArray() call

KT-45118 ClassCastException caused by parent and child class in if-else

KT-47605 Kotlin/Native: switch to LLD linker for MinGW targets

KT-44436 Support default not null annotations to enhance T into T!!

KT-49190 Increase stub versions

... (truncated)

Changelog

Sourced from kotlin-gradle-plugin's changelog.

CHANGELOG

Commits

See full diff in compare view

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.

Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

@dependabot rebase will rebase this PR
@dependabot recreate will recreate this PR, overwriting any edits that have been made to it
@dependabot merge will merge this PR after your CI passes on it
@dependabot squash and merge will squash and merge this PR after your CI passes on it
@dependabot cancel merge will cancel a previously requested merge and block automerging
@dependabot reopen will reopen this PR if it is closed
@dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
@dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
@dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
@dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

bmarty · 2021-11-16T12:32:55Z

@dependabot rebase

bmarty

CI is not happy, it appears that some dependencies require some upgrade first.
Let's just wait a while

bmarty · 2021-12-02T20:24:30Z

Blockers: square/moshi#1368 (and square/moshi#1324). Those issues are closed, but maybe Moshi is not released yet with the fix?

bmarty · 2021-12-13T22:54:49Z

Depends on #4673

bmarty · 2021-12-13T22:58:05Z

@dependabot rebase

dependabot · 2021-12-13T22:58:07Z

Looks like this PR has been edited by someone other than Dependabot. That means Dependabot can't rebase it - sorry!

If you're happy for Dependabot to recreate it from scratch, overwriting any edits, you can request @dependabot recreate.

github-actions · 2021-12-13T23:08:52Z

Unit Test Results

106 files ±0 106 suites ±0 1m 10s ⏱️ -5s
188 tests ±0 188 ✔️ ±0 0 💤 ±0 0 ❌ ±0
622 runs ±0 622 ✔️ ±0 0 💤 ±0 0 ❌ ±0

Results for commit fdf3cc3. ± Comparison against base commit 0734758.

♻️ This comment has been updated with latest results.

ouchadam · 2021-12-14T10:15:31Z

looks like a jetifier error

'/home/runner/.gradle/caches/modules-2/files-2.1/com.squareup.moshi/moshi/1.13.0/da685586facab9eb5c4fb630ce248be14e7da21b/moshi-1.13.0.jar' using Jetifier. Reason: UnsupportedOperationException, message: Records requires ASM8.

ouchadam · 2022-03-14T13:11:46Z

@dependabot rebase

dependabot · 2022-03-14T13:11:49Z

Looks like this PR has been edited by someone other than Dependabot. That means Dependabot can't rebase it - sorry!

If you're happy for Dependabot to recreate it from scratch, overwriting any edits, you can request @dependabot recreate.

bmarty · 2022-03-22T13:32:59Z

(manual rebase performed)

bmarty · 2022-03-22T15:11:57Z

vector/src/main/java/im/vector/app/features/discovery/DiscoverySettingsController.kt

@@ -209,18 +210,19 @@ class DiscoverySettingsController @Inject constructor(
            titleResId(R.string.settings_discovery_emails_title)
        }
        when (emails) {
-            is Incomplete -> {
+            Uninitialized,
+            is Loading -> {


Sadly, even if is Incomplete is equivalent to Uninitialized, is Loading, the compiler is not clever enough to understand that.

Bumps [kotlin-gradle-plugin](https://github.com/JetBrains/kotlin) from 1.5.31 to 1.6.0. - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/commits) --- updated-dependencies: - dependency-name: org.jetbrains.kotlin:kotlin-gradle-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>

Bumps `moshi` from 1.12.0 to 1.13.0. Updates `moshi-adapters` from 1.12.0 to 1.13.0 - [Release notes](https://github.com/square/moshi/releases) - [Changelog](https://github.com/square/moshi/blob/master/CHANGELOG.md) - [Commits](square/moshi@moshi-parent-1.12.0...moshi-parent-1.13.0) Updates `moshi-kotlin-codegen` from 1.12.0 to 1.13.0 - [Release notes](https://github.com/square/moshi/releases) - [Changelog](https://github.com/square/moshi/blob/master/CHANGELOG.md) - [Commits](square/moshi@moshi-parent-1.12.0...moshi-parent-1.13.0) --- updated-dependencies: - dependency-name: com.squareup.moshi:moshi-adapters dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.squareup.moshi:moshi-kotlin-codegen dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>

https://kotlinlang.org/docs/whatsnew16.html#stable-exhaustive-when-statements-for-enum-sealed-and-boolean-subjects

https://github.com/Kotlin/kotlinx.coroutines/blob/master/kotlinx-coroutines-test/MIGRATION.md

bmarty · 2022-03-22T16:05:37Z

Arg, tests are failing and I cannot push new commits, I got a error 500.
Anyway the test are not passing locally :/

bmarty · 2022-03-22T16:37:00Z

I cannot make the unit tests pass locally. Some useful doc can be found here: https://github.com/Kotlin/kotlinx.coroutines/blob/master/kotlinx-coroutines-test/MIGRATION.md#simplify-code-by-removing-unneeded-entities but I have tested that and it does not work.

- the switch from runBlockingTest to runTest means we need to provide a separate scope from the test in order to asynchronously collect the flow results

ouchadam · 2022-03-22T17:12:33Z

I've pushed fdf3cc3 as a fix for the tests, switching from runBlockingTest to runTest internally switches from TestCoroutineDispatcher to StandardTestDispatcher which means we can't use the original test scope for collecting the results and instead we should use Unconfined (unless we wanted to create a custom runTest which uses the UnconfinedTestDispatcher

ouchadam · 2022-03-22T18:01:57Z

vector/src/main/java/im/vector/app/features/settings/locale/LocalePickerController.kt

@@ -84,6 +90,11 @@ class LocalePickerController @Inject constructor(
                                }
                            }
                }
+            is Fail    ->


was this a missing case? (and the update caught it? 🎉 )

I added the code for the when to be exhaustive, but I think at this place it cannot fail, since we are loading locale data. But who knows?

ouchadam

awesome stuff @bmarty thanks for taking the time to update all the places! 💯

ouchadam · 2022-03-22T18:04:08Z

dependencies.gradle

@@ -9,13 +9,13 @@ ext.versions = [

 def gradle = "7.0.4"
 // Ref: https://kotlinlang.org/releases.html
-def kotlin = "1.5.31"
-def kotlinCoroutines = "1.5.2"
+def kotlin = "1.6.0"


hopefully the update to 1.6.10 will be much simpler

Yes, I have seen that 1.6.10 is available, but I prefer dependabot to do his work :)

bmarty · 2022-03-23T09:08:43Z

awesome stuff @bmarty thanks for taking the time to update all the places! 💯

Thanks to you for fixing the issue with tests. I think I would not be able to fix it by myself, I am a bit lost with all those coroutines stuff :/

Fix regression from #4471

dependabot bot added dependencies Pull requests that update a dependency file java Pull requests that update Java code labels Nov 15, 2021

dependabot bot requested a review from bmarty November 15, 2021 23:08

dependabot bot force-pushed the dependabot/gradle/org.jetbrains.kotlin-kotlin-gradle-plugin-1.6.0 branch from 3f1f542 to 6c241bc Compare November 16, 2021 12:33

bmarty reviewed Nov 16, 2021

View reviewed changes

bmarty changed the title ~~Bump kotlin-gradle-plugin from 1.5.31 to 1.6.0~~ Bump kotlin-gradle-plugin from 1.5.31 to 1.6.0 - BLOCKED Nov 16, 2021

bmarty force-pushed the dependabot/gradle/org.jetbrains.kotlin-kotlin-gradle-plugin-1.6.0 branch from fa71c3b to 3ca37c4 Compare December 13, 2021 22:59

manuroe assigned bmarty Jan 18, 2022

bmarty force-pushed the dependabot/gradle/org.jetbrains.kotlin-kotlin-gradle-plugin-1.6.0 branch from 3ca37c4 to 1cc83cd Compare March 22, 2022 13:32

bmarty reviewed Mar 22, 2022

View reviewed changes

dependabot bot and others added 5 commits March 22, 2022 16:13

Fix compilation warning (exhaustive when)

f07c9bf

Format file (no other change)

ed62a2f

Fix compilation warning (exhaustive when)

7502158

bmarty added 4 commits March 22, 2022 16:13

Fix compilation warning (exhaustive when)

57bee40

Also upgrade the coroutine lib

97bb5a9

The .exhaustive trick is not needed anymore in Kotlin 1.6.0

03fee2a

https://kotlinlang.org/docs/whatsnew16.html#stable-exhaustive-when-statements-for-enum-sealed-and-boolean-subjects

Small cleanup

f791ddb

bmarty force-pushed the dependabot/gradle/org.jetbrains.kotlin-kotlin-gradle-plugin-1.6.0 branch from abbed22 to f791ddb Compare March 22, 2022 15:14

bmarty requested review from a team and bmarty and removed request for a team and bmarty March 22, 2022 15:14

bmarty added 2 commits March 22, 2022 16:39

runBlockingTest -> runTest

8682900

https://github.com/Kotlin/kotlinx.coroutines/blob/master/kotlinx-coroutines-test/MIGRATION.md

runBlocking -> runTest

012cdf4

https://github.com/Kotlin/kotlinx.coroutines/blob/master/kotlinx-coroutines-test/MIGRATION.md

fixing view model tests not collecting flow results

fdf3cc3

- the switch from runBlockingTest to runTest means we need to provide a separate scope from the test in order to asynchronously collect the flow results

ouchadam reviewed Mar 22, 2022

View reviewed changes

ouchadam approved these changes Mar 22, 2022

View reviewed changes

ouchadam reviewed Mar 22, 2022

View reviewed changes

bmarty merged commit c6fe084 into develop Mar 23, 2022

bmarty deleted the dependabot/gradle/org.jetbrains.kotlin-kotlin-gradle-plugin-1.6.0 branch March 23, 2022 09:08

This was referenced Mar 23, 2022

[IGNORE] Bump moshi from 1.12.0 to 1.13.0 - CHANGE NOW INCLUDED IN #4471 #4673

Closed

Fix regression from #4471 #5645

Merged

bmarty added a commit that referenced this pull request Mar 29, 2022

Merge pull request #5645 from vector-im/feature/bma/fix_create_room

539d198

Fix regression from #4471

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Bump kotlin-gradle-plugin from 1.5.31 to 1.6.0 - BLOCKED #4471

Bump kotlin-gradle-plugin from 1.5.31 to 1.6.0 - BLOCKED #4471

dependabot bot commented on behalf of github Nov 15, 2021 •

edited by bmarty

Loading

bmarty commented Nov 16, 2021

bmarty left a comment

bmarty commented Dec 2, 2021

bmarty commented Dec 13, 2021

bmarty commented Dec 13, 2021

dependabot bot commented on behalf of github Dec 13, 2021

github-actions bot commented Dec 13, 2021 •

edited

Loading

ouchadam commented Dec 14, 2021

ouchadam commented Mar 14, 2022

dependabot bot commented on behalf of github Mar 14, 2022

bmarty commented Mar 22, 2022

bmarty Mar 22, 2022

bmarty commented Mar 22, 2022

bmarty commented Mar 22, 2022

ouchadam commented Mar 22, 2022

ouchadam Mar 22, 2022

bmarty Mar 23, 2022

ouchadam left a comment

ouchadam Mar 22, 2022

bmarty Mar 23, 2022

bmarty commented Mar 23, 2022

Bump kotlin-gradle-plugin from 1.5.31 to 1.6.0 - BLOCKED #4471

Bump kotlin-gradle-plugin from 1.5.31 to 1.6.0 - BLOCKED #4471

Conversation

dependabot bot commented on behalf of github Nov 15, 2021 • edited by bmarty Loading

EDIT @bmarty

End of EDIT

Kotlin 1.6.0-RC2

Learn how to install Kotlin 1.6.0-RC2 plugin and how to configure build with 1.6.0-RC2

Changelog

Compiler

New Features

Performance Improvements

Fixes

CHANGELOG

bmarty commented Nov 16, 2021

bmarty left a comment

Choose a reason for hiding this comment

bmarty commented Dec 2, 2021

bmarty commented Dec 13, 2021

bmarty commented Dec 13, 2021

dependabot bot commented on behalf of github Dec 13, 2021

github-actions bot commented Dec 13, 2021 • edited Loading

Unit Test Results

ouchadam commented Dec 14, 2021

ouchadam commented Mar 14, 2022

dependabot bot commented on behalf of github Mar 14, 2022

bmarty commented Mar 22, 2022

bmarty Mar 22, 2022

Choose a reason for hiding this comment

bmarty commented Mar 22, 2022

bmarty commented Mar 22, 2022

ouchadam commented Mar 22, 2022

ouchadam Mar 22, 2022

Choose a reason for hiding this comment

bmarty Mar 23, 2022

Choose a reason for hiding this comment

ouchadam left a comment

Choose a reason for hiding this comment

ouchadam Mar 22, 2022

Choose a reason for hiding this comment

bmarty Mar 23, 2022

Choose a reason for hiding this comment

bmarty commented Mar 23, 2022

dependabot bot commented on behalf of github Nov 15, 2021 •

edited by bmarty

Loading

github-actions bot commented Dec 13, 2021 •

edited

Loading