Restore buildSrc in jb-main (merge commit)#2740
Merged
Igor Demin (igordmn) merged 33 commits intoFeb 2, 2026
Merged
Conversation
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
just copy-paste without changes jb-main is 628cf66
For each project in JetBrainsPublication copy commonMain without changes
Because now it applies Compose Compiler
# Conflicts: # .github/integration-patches/README.md # .github/workflows/ksp-snapshot-integration.yml
Restoring jb-main state after copying integration branch
…torState.jb.kt ``` > Task FAILED e: file:///home/runner/work/compose-multiplatform-core/compose-multiplatform-core/navigation/navigation-testing/src/jbMain/kotlin/androidx/navigation/testing/TestNavigatorState.jb.kt:46:32 Return type must be specified in explicit API mode. ```
buildSrc in jb-main" (merge commit)
buildSrc in jb-main" (merge commit)buildSrc in jb-main (merge commit)
Igor Demin (igordmn)
added a commit
that referenced
this pull request
Feb 10, 2026
[BuildSrc PR](#2740) overwrote some depdendencies introduced in the previous between a4732ff (2026-01-15, the commit on which commonMain.dependencies where based) and 9760ecf (2026-02-02, the PR merge commit): 8a04251, 75127ab. Also verified by comparing build.gradle in the merge commit (9760ecf) ## Release Notes N/A
Igor Demin (igordmn)
added a commit
that referenced
this pull request
Feb 11, 2026
[BuildSrc PR](#2740) overwrote some dependencies introduced in the previous PRs. Between: - a4732ff (2026-01-15, the commit on which commonMain.dependencies where based) - and 9760ecf (2026-02-02, the PR merge commit) The list of overwritten changes: 8a04251, 75127ab. I also verified it again by comparing `build.gradle` in the merge commit (9760ecf) ## Release Notes N/A
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Make a merge commit for #2709
Release Notes
N/A