Restore buildSrc in jb-main
#2709
Open
+312,089
−59,162
Conversation
This file contains hidden or 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
igordmn
force-pushed
the
igor.demin/restore-buildSrc-in-jbmain
branch
from
e2758f0 to
412620a
Compare
igordmn
force-pushed
the
igor.demin/restore-buildSrc-in-jbmain
branch
from
454c005 to
b3ef65d
Compare
igordmn
force-pushed
the
igor.demin/restore-buildSrc-in-jbmain
branch
10 times, most recently
from
1ef8c8f to
81aebd3
Compare
igordmn
changed the base branch from
jb-main
to
igor.demin/jb-main-21-01-2026
igordmn
force-pushed
the
igor.demin/restore-buildSrc-in-jbmain
branch
3 times, most recently
from
dfa3bb5 to
74258e9
Compare
igordmn
changed the base branch from
igor.demin/jb-main-21-01-2026
to
jb-main
igordmn
force-pushed
the
igor.demin/restore-buildSrc-in-jbmain
branch
4 times, most recently
from
8acc5c6 to
b11912c
Compare
just delete-copy-paste without changes integration is 53a7a70
git checkout --no-overlay integration -- buildSrc gradle .idea .run .github placeholder mpp compose/mpp compose/ui/ui/src/uikitInstrumentedTest/launcher integration is 53a7a70
git checkout --no-overlay integration -- benchmark binarycompatibilityvalidator glance inspection room3 stableaidl lint-checks androidx-settings-plugins integration is 53a7a70
git checkout --no-overlay integration -- annotation/**build.gradle** collection/**build.gradle** lifecycle/**build.gradle** savedstate/**build.gradle** window/**build.gradle** compose/**build.gradle** kruth/**build.gradle** navigation/**build.gradle** navigation3/**build.gradle** navigationevent/**build.gradle** testutils/**build.gradle** mpp/**build.gradle** integration is 53a7a70
igordmn
force-pushed
the
igor.demin/restore-buildSrc-in-jbmain
branch
from
73a0663 to
e8efdc9
Compare
For each project in JetBrainsPublication copy commonMain without changes
Because now it applies Compose Compiler
igordmn
force-pushed
the
igor.demin/restore-buildSrc-in-jbmain
branch
2 times, most recently
from
6529395 to
36d333a
Compare
# Conflicts: # .github/integration-patches/README.md # .github/workflows/ksp-snapshot-integration.yml
Restoring jb-main state after copying integration branch
igordmn
force-pushed
the
igor.demin/restore-buildSrc-in-jbmain
branch
from
36d333a to
e7cebbd
Compare
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.
Fixes https://youtrack.jetbrains.com/issue/CMP-9523/Copy-new-buildSrc-to-jb-main
Restore buildSrc and related files/projects by copying them from
integrationand applying additional fixes.Partially fixes https://youtrack.jetbrains.com/issue/CMP-3282/Prevent-possible-version-mismatch-between-artifacts
Should be:
Other PRs:
https://github.com/JetBrains/compose-multiplatform/pull/5525/changes
https://jetbrains.team/p/ui/reviews/101/timeline
CI:
https://teamcity.jetbrains.com/buildConfiguration/JetBrainsPublicProjects_Compose_AllPersonalBuild/5840268
Release Notes
Fixes - Multiple Platforms
org.jetbrains.compose.foundationhas the same version asorg.jetbrains.compose.ui