IJI-3418 build scripts: fix Bazel utils namespace

GitOrigin-RevId: 63da2304cc3c72072616fd101b31a77fbd0931f1
This commit is contained in:
Leonid Shalupov
2026-01-05 02:37:39 +00:00
committed by intellij-monorepo-bot
parent 8a4d4e0a09
commit 3e4eb1d7dc
12 changed files with 14 additions and 14 deletions
@@ -2,7 +2,7 @@
package com.intellij.debugger.artifacts;
import com.intellij.debugger.testFramework.TestDebuggerAgentArtifactsProvider;
import org.jetbrains.intellij.build.org.jetbrains.intellij.bazelEnvironment.BazelLabel;
import org.jetbrains.intellij.bazelEnvironment.BazelLabel;
import com.intellij.testFramework.common.BazelTestUtil;
import java.nio.file.Path;
@@ -1,5 +1,5 @@
// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.intellij.build.org.jetbrains.intellij.bazelEnvironment
package org.jetbrains.intellij.bazelEnvironment
import org.jetbrains.annotations.ApiStatus
@@ -1,5 +1,5 @@
// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.intellij.build.org.jetbrains.intellij.bazelEnvironment
package org.jetbrains.intellij.bazelEnvironment
import java.nio.file.Path
import kotlin.io.path.absolute
@@ -1,5 +1,5 @@
// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.intellij.build.org.jetbrains.intellij.bazelEnvironment
package org.jetbrains.intellij.bazelEnvironment
import java.nio.file.Path
import kotlin.io.path.exists
@@ -8,8 +8,8 @@ import kotlinx.coroutines.CoroutineScope
import org.jetbrains.intellij.build.ModuleOutputProvider
import org.jetbrains.intellij.build.io.ZipEntryProcessorResult
import org.jetbrains.intellij.build.io.readZipFile
import org.jetbrains.intellij.build.org.jetbrains.intellij.bazelEnvironment.BazelLabel
import org.jetbrains.intellij.build.org.jetbrains.intellij.bazelEnvironment.BazelRunfiles
import org.jetbrains.intellij.bazelEnvironment.BazelLabel
import org.jetbrains.intellij.bazelEnvironment.BazelRunfiles
import org.jetbrains.jps.model.module.JpsModule
import org.jetbrains.jps.model.serialization.JpsModelSerializationDataService
import java.nio.file.Files
@@ -7,7 +7,7 @@ import kotlinx.coroutines.Dispatchers
import org.jetbrains.intellij.build.BuildOptions
import org.jetbrains.intellij.build.CompilationContext
import org.jetbrains.intellij.build.impl.logging.jps.withJpsLogging
import org.jetbrains.intellij.build.org.jetbrains.intellij.bazelEnvironment.BazelRunfiles
import org.jetbrains.intellij.bazelEnvironment.BazelRunfiles
import org.jetbrains.intellij.build.telemetry.TraceManager
import org.jetbrains.intellij.build.telemetry.TraceManager.spanBuilder
import org.jetbrains.intellij.build.telemetry.use
@@ -6,7 +6,7 @@ import kotlinx.collections.immutable.persistentListOf
import org.jetbrains.annotations.ApiStatus
import org.jetbrains.intellij.build.dependencies.BuildDependenciesCommunityRoot
import org.jetbrains.intellij.build.impl.addToClasspathAgent.AddToClasspathUtil
import org.jetbrains.intellij.build.org.jetbrains.intellij.bazelEnvironment.BazelRunfiles
import org.jetbrains.intellij.bazelEnvironment.BazelRunfiles
import java.nio.file.Files
import java.nio.file.Path
@@ -1,7 +1,7 @@
// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.intellij.bazelEnvironment
import org.jetbrains.intellij.build.org.jetbrains.intellij.bazelEnvironment.BazelLabel
import org.jetbrains.intellij.bazelEnvironment.BazelLabel
import org.junit.Test
import org.junit.jupiter.api.Assertions
@@ -2,8 +2,8 @@
package com.intellij.testFramework.common
import org.jetbrains.annotations.ApiStatus
import org.jetbrains.intellij.build.org.jetbrains.intellij.bazelEnvironment.BazelLabel
import org.jetbrains.intellij.build.org.jetbrains.intellij.bazelEnvironment.BazelRunfiles
import org.jetbrains.intellij.bazelEnvironment.BazelLabel
import org.jetbrains.intellij.bazelEnvironment.BazelRunfiles
import java.nio.file.Path
import kotlin.io.path.*
@@ -6,7 +6,7 @@ import com.intellij.testFramework.common.BazelTestUtil
import org.jetbrains.intellij.build.dependencies.BuildDependenciesCommunityRoot
import org.jetbrains.intellij.build.dependencies.BuildDependenciesDownloader.extractFileToCacheLocation
import org.jetbrains.intellij.build.dependencies.BuildDependenciesUtil.extractZip
import org.jetbrains.intellij.build.org.jetbrains.intellij.bazelEnvironment.BazelLabel
import org.jetbrains.intellij.bazelEnvironment.BazelLabel
import java.nio.file.Path
data class BazelLabelArchiveProjectInfo(
@@ -8,7 +8,7 @@ import com.intellij.testFramework.common.BazelTestUtil.getFileFromBazelRuntime
import com.intellij.util.io.DigestUtil
import org.jetbrains.intellij.build.dependencies.BuildDependenciesCommunityRoot
import org.jetbrains.intellij.build.dependencies.BuildDependenciesDownloader
import org.jetbrains.intellij.build.org.jetbrains.intellij.bazelEnvironment.BazelLabel
import org.jetbrains.intellij.bazelEnvironment.BazelLabel
import java.net.URI
import java.nio.file.Files
import java.nio.file.Path
@@ -9,7 +9,7 @@ import com.intellij.openapi.vfs.VfsUtil
import com.intellij.openapi.vfs.VirtualFileManager
import com.intellij.testFramework.common.BazelTestUtil
import com.intellij.testFramework.common.BazelTestUtil.getFileFromBazelRuntime
import org.jetbrains.intellij.build.org.jetbrains.intellij.bazelEnvironment.BazelLabel
import org.jetbrains.intellij.bazelEnvironment.BazelLabel
import com.intellij.util.io.DigestUtil
import com.intellij.util.io.createParentDirectories
import kotlinx.coroutines.Dispatchers