buildSrc restoration in integration #2609
Draft
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
MatkovIvan
reviewed
Dec 1, 2025
| includeProject(":navigation:navigation-runtime-ktx", [BuildType.MAIN, BuildType.FLAN, BuildType.COMPOSE, BuildType.KMP]) | ||
| includeProject(":navigation:navigation-safe-args-generator", [BuildType.MAIN, BuildType.FLAN]) | ||
| includeProject(":navigation:navigation-safe-args-gradle-plugin", [BuildType.MAIN, BuildType.FLAN]) | ||
| //includeProject(":navigation:navigation-safe-args-generator", [BuildType.MAIN, BuildType.FLAN]) |
Member
There was a problem hiding this comment.
Modify shouldIncludeInJetBrainsFork instead
|
|
||
| private String getRequestedProjectSubsetName() { | ||
| return "COMPOSE" | ||
| /* In JetBrains Fork only COMPOSE subset is supported. |
Member
There was a problem hiding this comment.
no-repo changes are not supposed to be merged into the integration branch
| # artifactRedirection.version.<redirectionGroup>.<redirectionModule> | ||
| # covers all sub-module projects | ||
| # (artifactRedirection.version.androidx.compose covers androidx.compose.*:*) | ||
| artifactRedirection.version.androidx.compose=1.10.0-beta02 |
Member
There was a problem hiding this comment.
Can we move it into a separate file to reduce conflicts?
| } | ||
|
|
||
| @Test | ||
| fun handleEncodedValues() { |
| internal expect class NoNameNavigator() : Navigator<NavDestination> { | ||
| override fun createDestination(): NavDestination | ||
|
|
||
| override fun navigate( |
| mac() | ||
| ios() | ||
| js() | ||
| wasmJs() |
Member
There was a problem hiding this comment.
Let's merge these changes into integration branch separately
|
|
||
| afterEvaluate { | ||
| tasks.withType(Test) { t -> | ||
| t.jvmArgs += ["--add-opens=java.desktop/sun.font=ALL-UNNAMED"] |
Member
There was a problem hiding this comment.
What's the context around it? Do we have some references/commits with explanation?
| WasmJs("Web"), | ||
| MacosX64("Macos"), | ||
| MacosArm64("Macos"), | ||
| UikitX64("UiKit"), // TODO: Align with AOSP: rename to iOS |
Collaborator
Author
|
@MatkovIvan, it is not ready for review yet (this code is just to make it work, and will be refactored) |
Partially adresses [CMP-1036](https://youtrack.jetbrains.com/issue/CMP-1036) Align custom source set names simplify build by unifying targets ## Testing [snapshot build](https://teamcity.jetbrains.com/buildConfiguration/JetBrainsPublicProjects_Compose_AllPersonalBuild/5717244) ## Release Notes N/A # Conflicts: # buildSrc/private/src/main/kotlin/org/jetbrains/androidx/build/AndroidXComposeMultiplatformExtensionImpl.kt # buildSrc/public/src/main/kotlin/org/jetbrains/androidx/build/ComposePlatforms.kt # buildSrc/public/src/main/kotlin/org/jetbrains/androidx/build/JetBrainsPublication.kt # compose/foundation/foundation-layout/build.gradle # compose/foundation/foundation/build.gradle # compose/material3/material3/build.gradle # compose/mpp/demo-swiftui/build.gradle.kts # compose/ui/ui-test/build.gradle # compose/ui/ui-text/build.gradle # compose/ui/ui-uikit/build.gradle # compose/ui/ui-util/build.gradle # compose/ui/ui/build.gradle # navigation/navigation-compose/build.gradle # navigation3/navigation3-ui/build.gradle # testutils/testutils-xctest/build.gradle
igordmn
changed the base branch from
integration
to
igor.demin/integration-c49f30
igordmn
force-pushed
the
igor.demin/no-repo2
branch
from
e4a1f63 to
5dbc3a8
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.
Release Notes
N/A