From 8e5eb0ca25f752920721894fbfeaa17702d71181 Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Fri, 4 Feb 2022 10:40:43 +0100 Subject: [PATCH] [java] don't override user options especially important for not yet supported language levels GitOrigin-RevId: 6274806e3ee49092ee71849f3a8aba13c63d9787 --- .../src/org/jetbrains/jps/incremental/java/JavaBuilder.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/java/JavaBuilder.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/java/JavaBuilder.java index 43f83cd8ad71..70fdb13084a2 100644 --- a/jps/jps-builders/src/org/jetbrains/jps/incremental/java/JavaBuilder.java +++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/java/JavaBuilder.java @@ -1,4 +1,4 @@ -// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package org.jetbrains.jps.incremental.java; import com.intellij.openapi.diagnostic.Logger; @@ -1038,7 +1038,7 @@ public final class JavaBuilder extends ModuleLevelBuilder { } // using older -source, -target and -bootclasspath options - if (languageLevel > 0) { + if (languageLevel > 0 && !options.contains(SOURCE_OPTION)) { options.add(SOURCE_OPTION); options.add(complianceOption(languageLevel)); }