MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-15 11:53:49 +07:00
Code Issues Packages Projects Releases Wiki Activity

KTIJ-27910 Remove workaround after updating kotlinc version

Browse Source 
Revert 5f2b9463

GitOrigin-RevId: ebec4fc3cb47ed5694fe057257d08bfc68a373c1
This commit is contained in:
Aleksei.Cherepanov
2024-01-31 18:38:51 +08:00
committed by intellij-monorepo-bot
parent b55b2a9d85
commit 85c63396fd
4 changed files with 1 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
jps/jps-builders/src/org/jetbrains/jps/builders/java/dependencyView/DumbMappings.java
View File

@@ -1,16 +0,0 @@
// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.jps.builders.java.dependencyView;
import java.io.File;
import java.io.PrintStream;
public final class DumbMappings extends Mappings {
@Override
public void flush(boolean memoryCachesOnly) {}
@Override
public void toStream(File outputRoot) {}
@Override
public void toStream(PrintStream stream) {}
}

14
jps/jps-builders/src/org/jetbrains/jps/builders/java/dependencyView/Mappings.java
View File

@@ -128,20 +128,6 @@ public class Mappings {
myObjectClassName = myContext.get("java/lang/Object");
}
public Mappings() {
myLock = new Object();
myIsDelta = false;
myChangedClasses = null;
myChangedFiles = null;
myDeletedClasses = null;
myAddedClasses = null;
myRootDir = null;
myRelativizer = null;
myInitName = 1;
myEmptyName = 0;
myObjectClassName = -1;
}
private void createImplementation() throws IOException {
try {
if (!myIsDelta) {

8
jps/jps-builders/src/org/jetbrains/jps/incremental/storage/BuildDataManager.java
View File

@@ -11,7 +11,6 @@ import org.jetbrains.jps.builders.BuildTargetType;
import org.jetbrains.jps.builders.impl.BuildTargetChunk;
import org.jetbrains.jps.builders.impl.storage.BuildTargetStorages;
import org.jetbrains.jps.builders.java.JavaBuilderUtil;
import org.jetbrains.jps.builders.java.dependencyView.DumbMappings;
import org.jetbrains.jps.builders.java.dependencyView.Mappings;
import org.jetbrains.jps.builders.storage.BuildDataCorruptedException;
import org.jetbrains.jps.builders.storage.BuildDataPaths;
@@ -82,12 +81,7 @@ public final class BuildDataManager {
myOutputToTargetRegistry = new OutputToTargetRegistry(new File(getOutputToSourceRegistryRoot(), "data"), relativizer);
File mappingsRoot = getMappingsRoot(myDataPaths.getDataStorageRoot());
if (JavaBuilderUtil.isDepGraphEnabled()) {
if(Boolean.parseBoolean(System.getProperty("kotlin.jps.workaround.tests", "false"))) {
myMappings = new DumbMappings();
}
else {
myMappings = null;
}
myMappings = null;
createDependencyGraph(mappingsRoot, false);
LOG.info("Using DependencyGraph-based build incremental analysis");
}

2
plugins/kotlin/jps/graphImplementationTests/tests/org/jetbrains/kotlin/jpsGraph/test/IncrementalK2JvmJpsTestGenerated.java
View File

@@ -25,8 +25,6 @@ import static org.jetbrains.kotlin.config.IncrementalCompilation.INCREMENTAL_COM
@TestRoot("jps/graphImplementationTests/testData/incremental")
public class IncrementalK2JvmJpsTestGenerated extends AbstractIncrementalK2JvmJpsTest {
static void setUpTests() {
System.setProperty("kotlin.jps.workaround.tests", "true");
//// Use custom compiler for tests
//File distJar = KotlinArtifactsDownloader.INSTANCE.downloadArtifactForIdeFromSources(
// "kotlin-dist-for-ide",