Skip to content

Restore buildSrc in jb-main. Changes in Gradle plugin#5525

Merged
Igor Demin (igordmn) merged 3 commits into
masterfrom
igor.demin/restore-buildSrc-in-jbmain
Feb 2, 2026
Merged

Restore buildSrc in jb-main. Changes in Gradle plugin#5525
Igor Demin (igordmn) merged 3 commits into
masterfrom
igor.demin/restore-buildSrc-in-jbmain

Conversation

@igordmn

@igordmn Igor Demin (igordmn) commented Jan 30, 2026 •
edited
Loading

Copy link
Copy Markdown
Collaborator

Fixes https://youtrack.jetbrains.com/issue/CMP-9523/Copy-new-buildSrc-to-jb-main

Other PRs:
JetBrains/compose-multiplatform-core#2709
https://jetbrains.team/p/ui/reviews/101/timeline

This test fails after JetBrains/compose-multiplatform-core#2709 because of new constraints in ui-uikit

// ./gradlew dependencyInsight --configuration iosArm64CompileKlibraries --dependency org.jetbrains.compose.ui:ui
org.jetbrains.compose.ui:ui:1.9.3 FAILED
   Failures:
      - Could not resolve org.jetbrains.compose.ui:ui:{strictly 1.9.3}.
          - Cannot find a version of 'org.jetbrains.compose.ui:ui' that satisfies the version constraints:
          Dependency path: 'root project :' (iosArm64CompileKlibraries) --> 'org.jetbrains.compose.ui:ui:{strictly 1.9.3}'
          ...
          Constraint path: ... 'org.jetbrains.compose.foundation:foundation:9999.0.0-SNAPSHOT' ... --> 'org.jetbrains.compose.ui:ui-uikit:9999.0.0-SNAPSHOT' ... --> 'org.jetbrains.compose.ui:ui:9999.0.0-SNAPSHOT'
          ...

(it theoretically should be not resolved with any explicit dependency of "foundation" on "ui-something", but I couldn't reproduce it, might be a bug/peculiarity of Gradle)

Instead of downgrading a middle-level dependency, we downgrade high-level dependencies. We downgrade both ui/foundation because we will add a constraint for them in CMP-9710 Prevent possible version mismatch between ui and foundation

Release Notes

N/A

@igordmn Igor Demin (igordmn) marked this pull request as ready for review January 30, 2026 06:41
@igordmn

Igor Demin (igordmn) commented Jan 30, 2026 •
edited
Loading

Copy link
Copy Markdown
Collaborator Author

Should be merged with JetBrains/compose-multiplatform-core#2709

MatkovIvan
Ivan Matkov (MatkovIvan) requested changes Jan 30, 2026
View reviewed changes

@MatkovIvan Ivan Matkov (MatkovIvan) left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That constraint doesn't solve runtime libraries (foundation/ui) <-> plugin mismatch

@igordmn Igor Demin (igordmn) force-pushed the igor.demin/restore-buildSrc-in-jbmain branch from 2fbc674 to 9a09f96 Compare January 30, 2026 15:49
@igordmn Igor Demin (igordmn) force-pushed the igor.demin/restore-buildSrc-in-jbmain branch from 2b61239 to c192367 Compare January 30, 2026 16:30
@igordmn Igor Demin (igordmn) force-pushed the igor.demin/restore-buildSrc-in-jbmain branch from c192367 to df22fba Compare January 30, 2026 19:44
@igordmn Igor Demin (igordmn) merged commit 29f3511 into master Feb 2, 2026
13 checks passed
@igordmn Igor Demin (igordmn) deleted the igor.demin/restore-buildSrc-in-jbmain branch February 2, 2026 11:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@MatkovIvan Ivan Matkov (MatkovIvan) MatkovIvan approved these changes

@terrakok Konstantin (terrakok) terrakok approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@igordmn @MatkovIvan @terrakok