Skip to content

Commit

Permalink
fix: remove invalid checks for composite mode
Browse files Browse the repository at this point in the history
Signed-off-by: Art Shendrik <[email protected]>
  • Loading branch information
amal committed Feb 22, 2024
1 parent d37b823 commit 2454a3c
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 5 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
### Fixed
- don't run in-memory shrinking if there is not enough memory available.
- don't mark the project as in IDE sync mode when no tasks where called and no composite build detected.
- remove invalid checks for composite mode.
- improve and document composite builds detection.
- properly quote and escape CLI arguments for external tool runner.
- fix R8 external run for Ubuntu and macOS (non-Windows systems).
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -200,9 +200,7 @@ internal abstract class FluxoKmpConfContext
// Disable all tests if:
// - `DISABLE_TESTS` is enabled;
// - `check` or `test` tasks are excluded from the build;
// - the project is in a composite build.
testsDisabled = isInCompositeBuild ||
project.disableTests().get() ||
testsDisabled = project.disableTests().get() ||
start.excludedTaskNames.let { CHECK_TASK_NAME in it || TEST_TASK_NAME in it }

if (testsDisabled) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public class FluxoKmpConfPlugin : Plugin<Project> {
ctx.prepareBuildScanPlugin()
ctx.ensureUnreachableTasksDisabled()

if (ctx.testsDisabled || ctx.isInCompositeBuild) {
if (ctx.testsDisabled) {
return
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,6 @@ internal fun FluxoConfigurationExtensionImpl.KotlinConfig(
// TODO: Add env flag for dynamic switch-on when needed
// (and enable by a task name if called directly)
val latestCompilation = canUseLatestSettings &&
!context.isInCompositeBuild &&
!context.testsDisabled &&
experimentalLatestCompilation == true

Expand Down

0 comments on commit 2454a3c

Please sign in to comment.