Open
Conversation
MatkovIvan
reviewed
Mar 18, 2026
| apply from: "settingsScripts/out-setup.groovy" | ||
| getGradle().beforeProject { project -> | ||
| def checkoutRoot = new File("${buildscript.sourceFile.parent}/..") | ||
| def checkoutRoot = new File("${buildscript.sourceFile.parent}/../../..") |
Collaborator
There was a problem hiding this comment.
Needs to be reverted for jb-main
| } | ||
| */ | ||
| if (true /* In JetBrains Fork */) { | ||
| if (System.getenv("ALLOW_PUBLIC_REPOS") != null || System.getProperty("ALLOW_PUBLIC_REPOS") != null) { |
Collaborator
There was a problem hiding this comment.
Needs to be reverted for jb-main
|
|
||
| val JETBRAINS_MINIMAL_JAVA_VERSION = VERSION_11 | ||
| val JETBRAINS_COMPILE_KOTLIN_VERSION = KOTLIN_2_2 | ||
| val JETBRAINS_COMPILE_KOTLIN_VERSION = KOTLIN_2_3 |
Collaborator
There was a problem hiding this comment.
We should not bump it here
| fun Project.getCheckoutRoot(): File { | ||
| if (!ProjectLayoutType.isPlayground(project)) { | ||
| throw IllegalStateException("repo checkout root is not available in playground project layout") | ||
| } |
Collaborator
There was a problem hiding this comment.
This was a valid check. Needs to be restored
| if ( | ||
| ProjectLayoutType.from(project) == ProjectLayoutType.PLAYGROUND || | ||
| System.getenv("COMPOSE_DESKTOP_GITHUB_BUILD") != null | ||
| ) { |
Collaborator
There was a problem hiding this comment.
The previous version was correct
| KOTLIN_2_2(KotlinVersion.KOTLIN_2_2, "kotlin22"), | ||
| KOTLIN_2_3(KotlinVersion.KOTLIN_2_3, "kotlin23"), | ||
| DEFAULT(JETBRAINS_COMPILE_KOTLIN_VERSION), | ||
| DEFAULT(KOTLIN_2_3), |
| if (ProjectLayoutType.isPlayground(project)) { | ||
| // Do not ban calling this because it's used in a lot benchmark projects during the configuration stage. | ||
| return rootProject.projectDir | ||
| } |
Collaborator
There was a problem hiding this comment.
This was a valid check. Needs to be restored
| if (ProjectLayoutType.isPlayground(project)) { | ||
| // In JetBrains Fork required parts of the "external" folder are copied into this repo. | ||
| return File(rootProject.projectDir, "external").canonicalFile | ||
| } |
Collaborator
There was a problem hiding this comment.
This was a valid check. Needs to be restored
| fun Project.getGradlePrebuiltsPath(): File { | ||
| if (ProjectLayoutType.isPlayground(project)) { | ||
| throw IllegalStateException("external projects are not available in playground project layout") | ||
| } |
Collaborator
There was a problem hiding this comment.
This was a valid check. Needs to be restored
eymar
commented
Mar 18, 2026
|
|
||
| // TODO remove it after https://youtrack.jetbrains.com/issue/CMP-9524/Support-the-same-setup-for-integration-and-jb-main-branches | ||
| // This code includes dependencies defined in comments and in "androidMain" that doesn't work in jb-main yet | ||
| return |
Member
Author
There was a problem hiding this comment.
Seems like integration/buildSrc can't be copied to jb-main as is?
Collaborator
There was a problem hiding this comment.
Yes, we have an adopted version here. It's "close enough" now, but still not the same
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.
An attempt to sync buildSrc
Testing
N/A
Release Notes
N/A