diff --git a/.idea/modules.xml b/.idea/modules.xml index 31cb36cff55d..9b57069e31e0 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -690,7 +690,6 @@ - @@ -896,6 +895,7 @@ + diff --git a/build/src/org/jetbrains/intellij/build/IdeaCommunityProperties.kt b/build/src/org/jetbrains/intellij/build/IdeaCommunityProperties.kt index 8713f228f553..7a8942befbf6 100644 --- a/build/src/org/jetbrains/intellij/build/IdeaCommunityProperties.kt +++ b/build/src/org/jetbrains/intellij/build/IdeaCommunityProperties.kt @@ -32,7 +32,7 @@ open class IdeaCommunityProperties(private val communityHomeDir: Path) : BaseIde "intellij.platform.vcs.testFramework", "intellij.platform.externalSystem.testFramework", "intellij.maven.testFramework", - "intellij.platform.reproducibleBuilds.diffTool", + "intellij.tools.reproducibleBuilds.diff", ) } diff --git a/platform/build-scripts/testFramework/intellij.platform.buildScripts.testFramework.iml b/platform/build-scripts/testFramework/intellij.platform.buildScripts.testFramework.iml index 1591203f9415..01ff2a1cd1ff 100644 --- a/platform/build-scripts/testFramework/intellij.platform.buildScripts.testFramework.iml +++ b/platform/build-scripts/testFramework/intellij.platform.buildScripts.testFramework.iml @@ -27,7 +27,7 @@ - + diff --git a/platform/reproducible-builds/api-dump-unreviewed.txt b/platform/reproducible-builds/api-dump-unreviewed.txt deleted file mode 100644 index dd3695209495..000000000000 --- a/platform/reproducible-builds/api-dump-unreviewed.txt +++ /dev/null @@ -1,12 +0,0 @@ -f:org.jetbrains.intellij.reproducibleBuilds.diffTool.FileTreeContentComparison -- ():V -- (java.nio.file.Path,java.nio.file.Path):V -- b:(java.nio.file.Path,java.nio.file.Path,I,kotlin.jvm.internal.DefaultConstructorMarker):V -- f:assertTheSameDirectoryContent(java.nio.file.Path,java.nio.file.Path,Z):org.jetbrains.intellij.reproducibleBuilds.diffTool.FileTreeContentComparison$ComparisonResult -- f:assertTheSameFile(java.nio.file.Path,java.nio.file.Path,java.lang.String):java.lang.AssertionError -- bs:assertTheSameFile$default(org.jetbrains.intellij.reproducibleBuilds.diffTool.FileTreeContentComparison,java.nio.file.Path,java.nio.file.Path,java.lang.String,I,java.lang.Object):java.lang.AssertionError -- sf:main(java.lang.String[]):V -f:org.jetbrains.intellij.reproducibleBuilds.diffTool.FileTreeContentComparison$ComparisonResult -- (java.util.List,java.lang.AssertionError):V -- f:getComparedFiles():java.util.List -- f:getError():java.lang.AssertionError diff --git a/platform/reproducible-builds/exposed-third-party-api.txt b/platform/reproducible-builds/exposed-third-party-api.txt deleted file mode 100644 index 1ff3abdfef32..000000000000 --- a/platform/reproducible-builds/exposed-third-party-api.txt +++ /dev/null @@ -1 +0,0 @@ -kotlin/jvm/internal/DefaultConstructorMarker diff --git a/platform/reproducible-builds/Dockerfile b/tools/reproducibleBuilds.diff/Dockerfile similarity index 100% rename from platform/reproducible-builds/Dockerfile rename to tools/reproducibleBuilds.diff/Dockerfile diff --git a/platform/reproducible-builds/intellij.platform.reproducibleBuilds.diffTool.iml b/tools/reproducibleBuilds.diff/intellij.tools.reproducibleBuilds.diff.iml similarity index 100% rename from platform/reproducible-builds/intellij.platform.reproducibleBuilds.diffTool.iml rename to tools/reproducibleBuilds.diff/intellij.tools.reproducibleBuilds.diff.iml diff --git a/platform/reproducible-builds/src/FileTreeContentComparison.kt b/tools/reproducibleBuilds.diff/src/FileTreeContentComparison.kt similarity index 100% rename from platform/reproducible-builds/src/FileTreeContentComparison.kt rename to tools/reproducibleBuilds.diff/src/FileTreeContentComparison.kt diff --git a/platform/reproducible-builds/src/META-INF/MANIFEST.MF b/tools/reproducibleBuilds.diff/src/META-INF/MANIFEST.MF similarity index 100% rename from platform/reproducible-builds/src/META-INF/MANIFEST.MF rename to tools/reproducibleBuilds.diff/src/META-INF/MANIFEST.MF