MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-16 14:23:28 +07:00
Code Issues Packages Projects Releases Wiki Activity

do not export kotlinx-coroutines-jdk8 and module statistics from platform-impl

Browse Source 
GitOrigin-RevId: 1e0f98fedd06dc7789d808025d53b2424141adca
This commit is contained in:
Vladimir Krivosheev
2020-02-16 16:13:21 +01:00
committed by intellij-monorepo-bot
parent 6ae9af85cb
commit 3deee4e14b
40 changed files with 49 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
java/compiler/impl/intellij.java.compiler.impl.iml
View File

@@ -32,6 +32,7 @@
<orderEntry type="module" module-name="intellij.platform.vcs.impl" />
<orderEntry type="module" module-name="intellij.platform.externalSystem" />
<orderEntry type="library" name="StreamEx" level="project" />
<orderEntry type="module" module-name="intellij.platform.statistics" />
</component>
<component name="copyright">
<Base>

1
java/debugger/impl/intellij.java.debugger.impl.iml
View File

@@ -36,6 +36,7 @@
</orderEntry>
<orderEntry type="library" name="jb-jdi" level="project" />
<orderEntry type="library" name="StreamEx" level="project" />
<orderEntry type="module" module-name="intellij.platform.statistics" />
</component>
<component name="copyright">
<Base>

2
java/idea-ui/intellij.java.ui.iml
View File

@@ -24,5 +24,7 @@
<orderEntry type="library" name="jackson-module-kotlin" level="project" />
<orderEntry type="library" name="xz" level="project" />
<orderEntry type="library" name="StreamEx" level="project" />
<orderEntry type="library" name="kotlinx-coroutines-jdk8" level="project" />
<orderEntry type="module" module-name="intellij.platform.statistics" />
</component>
</module>

1
java/java-impl/intellij.java.impl.iml
View File

@@ -71,6 +71,7 @@
</orderEntry>
<orderEntry type="module" module-name="intellij.copyright" />
<orderEntry type="library" name="StreamEx" level="project" />
<orderEntry type="module" module-name="intellij.platform.statistics" />
</component>
<component name="copyright">
<Base>

1
java/java-tests/intellij.java.tests.iml
View File

@@ -66,5 +66,6 @@
<orderEntry type="library" scope="TEST" name="jackson-databind" level="project" />
<orderEntry type="library" scope="TEST" name="jackson-module-kotlin" level="project" />
<orderEntry type="library" name="StreamEx" level="project" />
<orderEntry type="library" scope="TEST" name="kotlinx-coroutines-jdk8" level="project" />
</component>
</module>

1
json/intellij.json.iml
View File

@@ -16,5 +16,6 @@
<orderEntry type="library" name="Guava" level="project" />
<orderEntry type="library" name="gson" level="project" />
<orderEntry type="module" module-name="intellij.regexp" />
<orderEntry type="module" module-name="intellij.platform.statistics" />
</component>
</module>

4
json/src/com/jetbrains/jsonSchema/impl/JsonSchemaUsageTriggerCollector.java
View File

@@ -1,10 +1,10 @@
// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.jetbrains.jsonSchema.impl;
import com.intellij.internal.statistic.eventLog.FeatureUsageData;
import com.intellij.internal.statistic.service.fus.collectors.FUCounterUsageLogger;
public class JsonSchemaUsageTriggerCollector {
public final class JsonSchemaUsageTriggerCollector {
public static void trigger(String feature) {
FUCounterUsageLogger.getInstance().logEvent("json.schema", "completion.by.schema.invoked",
new FeatureUsageData().addData("schemaKind", feature));

1
platform/built-in-server/intellij.platform.builtInServer.tests.iml
View File

@@ -23,5 +23,6 @@
<orderEntry type="library" scope="TEST" name="assertJ" level="project" />
<orderEntry type="module" module-name="intellij.platform.builtInServer.impl" />
<orderEntry type="library" scope="TEST" name="netty-codec-http" level="project" />
<orderEntry type="library" name="kotlinx-coroutines-jdk8" level="project" />
</component>
</module>

1
platform/configuration-store-impl/intellij.platform.configurationStore.impl.iml
View File

@@ -21,5 +21,6 @@
<orderEntry type="module" module-name="intellij.platform.objectSerializer" />
<orderEntry type="module" module-name="intellij.platform.serviceContainer" />
<orderEntry type="library" name="snakeyaml-engine" level="project" />
<orderEntry type="module" module-name="intellij.platform.statistics" />
</component>
</module>

2
platform/configuration-store-impl/intellij.platform.configurationStore.tests.iml
View File

@@ -14,6 +14,8 @@
<orderEntry type="module" module-name="intellij.platform.configurationStore.impl" scope="TEST" />
<orderEntry type="module" module-name="intellij.platform.objectSerializer" scope="TEST" />
<orderEntry type="module" module-name="intellij.platform.serviceContainer" scope="TEST" />
<orderEntry type="library" name="kotlinx-coroutines-jdk8" level="project" />
<orderEntry type="module" module-name="intellij.platform.statistics" scope="TEST" />
</component>
<component name="TestModuleProperties" production-module="intellij.platform.configurationStore.impl" />
</module>

3
platform/configuration-store-impl/testSrc/DoNotSaveDefaultsTest.kt
View File

@@ -2,7 +2,6 @@
package com.intellij.configurationStore
import com.intellij.ide.util.PropertiesComponent
import com.intellij.internal.statistic.persistence.UsageStatisticsPersistenceComponent
import com.intellij.openapi.application.AppUIExecutor
import com.intellij.openapi.application.ApplicationManager
import com.intellij.openapi.application.impl.coroutineDispatchingContext
@@ -98,7 +97,7 @@ internal class DoNotSaveDefaultsTest {
val directoryTree = Paths.get(componentManager.stateStore.storageManager.expandMacros(APP_CONFIG)).getDirectoryTree(hashSetOf(
"path.macros.xml" /* todo EP to register (provide) macro dynamically */,
"stubIndex.xml" /* low-level non-roamable stuff */,
UsageStatisticsPersistenceComponent.USAGE_STATISTICS_XML /* SHOW_NOTIFICATION_ATTR in internal mode */,
"usage.statistics.xml" /* SHOW_NOTIFICATION_ATTR in internal mode */,
"tomee.extensions.xml", "jboss.extensions.xml",
"glassfish.extensions.xml" /* javaee non-roamable stuff, it will be better to fix it */,
"dimensions.xml" /* non-roamable sizes of window, dialogs, etc. */,

1
platform/diff-impl/intellij.platform.diff.impl.iml
View File

@@ -16,5 +16,6 @@
<orderEntry type="module" module-name="intellij.platform.lang" />
<orderEntry type="library" name="Guava" level="project" />
<orderEntry type="library" name="miglayout-swing" level="project" />
<orderEntry type="module" module-name="intellij.platform.statistics" />
</component>
</module>

1
platform/external-system-impl/intellij.platform.externalSystem.impl.iml
View File

@@ -21,5 +21,6 @@
<orderEntry type="module" module-name="intellij.platform.objectSerializer" />
<orderEntry type="module" module-name="intellij.platform.objectSerializer.annotations" />
<orderEntry type="module" module-name="intellij.platform.debugger" />
<orderEntry type="module" module-name="intellij.platform.statistics" />
</component>
</module>

1
platform/external-system-impl/intellij.platform.externalSystem.tests.iml
View File

@@ -23,5 +23,6 @@
<orderEntry type="library" scope="TEST" name="assertJ" level="project" />
<orderEntry type="library" scope="TEST" name="mockito" level="project" />
<orderEntry type="module" module-name="intellij.platform.lang.tests" scope="TEST" />
<orderEntry type="library" scope="TEST" name="kotlinx-coroutines-jdk8" level="project" />
</component>
</module>

1
platform/lang-impl/intellij.platform.lang.impl.iml
View File

@@ -44,5 +44,6 @@
<orderEntry type="library" name="jackson-module-kotlin" level="project" />
<orderEntry type="library" name="xz" level="project" />
<orderEntry type="library" name="StreamEx" level="project" />
<orderEntry type="module" module-name="intellij.platform.statistics" />
</component>
</module>

2
platform/lang-impl/intellij.platform.lang.tests.iml
View File

@@ -35,5 +35,7 @@
<orderEntry type="library" name="jackson-module-kotlin" level="project" />
<orderEntry type="library" name="xz" level="project" />
<orderEntry type="library" scope="TEST" name="StreamEx" level="project" />
<orderEntry type="library" name="kotlinx-coroutines-jdk8" level="project" />
<orderEntry type="module" module-name="intellij.platform.statistics" scope="TEST" />
</component>
</module>

4
platform/platform-impl/intellij.platform.ide.impl.iml
View File

@@ -45,7 +45,7 @@
<orderEntry type="library" name="StreamEx" level="project" />
<orderEntry type="library" name="jediterm-pty" level="project" />
<orderEntry type="module" module-name="intellij.platform.tasks.impl" scope="RUNTIME" />
<orderEntry type="library" exported="" name="kotlinx-coroutines-jdk8" level="project" />
<orderEntry type="library" name="kotlinx-coroutines-jdk8" level="project" />
<orderEntry type="library" name="fluent-hc" level="project" />
<orderEntry type="library" name="netty-codec-http" level="project" />
<orderEntry type="library" scope="RUNTIME" name="error-prone-annotations" level="project" />
@@ -65,7 +65,7 @@
<orderEntry type="module" module-name="intellij.platform.serviceContainer" />
<orderEntry type="library" name="jcef" level="project" />
<orderEntry type="module" module-name="intellij.platform.diagnostic" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.platform.statistics" exported="" />
<orderEntry type="module" module-name="intellij.platform.statistics" />
<orderEntry type="module" module-name="intellij.platform.statistics.devkit" scope="RUNTIME" />
<orderEntry type="module-library">
<library name="byte-buddy-agent" type="repository">

2
platform/platform-tests/intellij.platform.tests.iml
View File

@@ -44,5 +44,7 @@
<orderEntry type="module" module-name="intellij.platform.serviceContainer" />
<orderEntry type="library" scope="TEST" name="StreamEx" level="project" />
<orderEntry type="library" scope="TEST" name="StreamEx" level="project" />
<orderEntry type="module" module-name="intellij.platform.statistics" scope="TEST" />
<orderEntry type="library" scope="TEST" name="kotlinx-coroutines-jdk8" level="project" />
</component>
</module>

1
platform/statistics/devkit/intellij.platform.statistics.devkit.iml
View File

@@ -17,5 +17,6 @@
<orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
<orderEntry type="library" name="gson" level="project" />
<orderEntry type="library" name="Guava" level="project" />
<orderEntry type="module" module-name="intellij.platform.statistics" />
</component>
</module>

1
platform/testFramework/intellij.platform.testFramework.iml
View File

@@ -33,5 +33,6 @@
<orderEntry type="module" module-name="intellij.platform.workspaceModel.ide" />
<orderEntry type="module" module-name="intellij.platform.workspaceModel.core" />
<orderEntry type="library" name="StreamEx" level="project" />
<orderEntry type="library" name="kotlinx-coroutines-jdk8" level="project" />
</component>
</module>

1
platform/vcs-impl/intellij.platform.vcs.impl.iml
View File

@@ -25,5 +25,6 @@
<orderEntry type="library" name="swingx" level="project" />
<orderEntry type="library" name="miglayout-swing" level="project" />
<orderEntry type="library" name="StreamEx" level="project" />
<orderEntry type="module" module-name="intellij.platform.statistics" />
</component>
</module>

1
platform/vcs-log/impl/intellij.platform.vcs.log.impl.iml
View File

@@ -29,5 +29,6 @@
<orderEntry type="library" name="miglayout-swing" level="project" />
<orderEntry type="module" module-name="intellij.platform.diff.impl" />
<orderEntry type="library" name="StreamEx" level="project" />
<orderEntry type="module" module-name="intellij.platform.statistics" />
</component>
</module>

1
platform/xdebugger-impl/intellij.platform.debugger.impl.iml
View File

@@ -18,5 +18,6 @@
<orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
<orderEntry type="module" module-name="intellij.platform.testExtensions" scope="TEST" />
<orderEntry type="library" name="StreamEx" level="project" />
<orderEntry type="module" module-name="intellij.platform.statistics" />
</component>
</module>

1
plugins/ant/intellij.ant.iml
View File

@@ -31,6 +31,7 @@
<orderEntry type="module" module-name="intellij.properties.psi" />
<orderEntry type="library" name="NanoXML" level="project" />
<orderEntry type="library" name="StreamEx" level="project" />
<orderEntry type="module" module-name="intellij.platform.statistics" />
</component>
<component name="copyright">
<Base>

1
plugins/changeReminder/intellij.vcs.changeReminder.iml
View File

@@ -27,5 +27,6 @@
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module" module-name="intellij.platform.statistics" />
</component>
</module>

1
plugins/filePrediction/intellij.filePrediction.iml
View File

@@ -20,5 +20,6 @@
<orderEntry type="module" module-name="intellij.platform.uast" />
<orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
<orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
<orderEntry type="module" module-name="intellij.platform.statistics" />
</component>
</module>

1
plugins/git4idea/intellij.vcs.git.iml
View File

@@ -48,5 +48,6 @@
<orderEntry type="library" name="jackson-databind" level="project" />
<orderEntry type="library" name="xz" level="project" />
<orderEntry type="library" name="StreamEx" level="project" />
<orderEntry type="module" module-name="intellij.platform.statistics" />
</component>
</module>

1
plugins/github/intellij.vcs.github.iml
View File

@@ -37,5 +37,6 @@
<orderEntry type="module" module-name="intellij.platform.editor" />
<orderEntry type="module" module-name="intellij.platform.diff.impl" />
<orderEntry type="library" name="StreamEx" level="project" />
<orderEntry type="module" module-name="intellij.platform.statistics" />
</component>
</module>

1
plugins/gradle/intellij.gradle.common.iml
View File

@@ -25,5 +25,6 @@
<orderEntry type="module" module-name="intellij.gradle.toolingLoaderRt" />
<orderEntry type="library" name="ion" level="project" />
<orderEntry type="library" name="StreamEx" level="project" />
<orderEntry type="module" module-name="intellij.platform.statistics" />
</component>
</module>

1
plugins/gradle/java/intellij.gradle.java.iml
View File

@@ -36,5 +36,6 @@
<orderEntry type="module" module-name="intellij.platform.objectSerializer.annotations" />
<orderEntry type="module" module-name="intellij.platform.jps.model.impl" />
<orderEntry type="module" module-name="intellij.properties.psi" />
<orderEntry type="module" module-name="intellij.platform.statistics" />
</component>
</module>

1
plugins/maven/intellij.maven.iml
View File

@@ -84,6 +84,7 @@
<orderEntry type="module" module-name="intellij.repository.search" />
<orderEntry type="module" module-name="intellij.groovy.jps" scope="TEST" />
<orderEntry type="library" name="StreamEx" level="project" />
<orderEntry type="module" module-name="intellij.platform.statistics" />
</component>
<component name="copyright">
<Base>

2
plugins/settings-repository/intellij.settingsRepository.iml
View File

@@ -36,5 +36,7 @@
<orderEntry type="library" name="Guava" level="project" />
<orderEntry type="library" name="jackson" level="project" />
<orderEntry type="library" name="jackson-databind" level="project" />
<orderEntry type="library" name="kotlinx-coroutines-jdk8" level="project" />
<orderEntry type="module" module-name="intellij.platform.statistics" />
</component>
</module>

1
plugins/settings-repository/intellij.settingsRepository.tests.iml
View File

@@ -25,5 +25,6 @@
<orderEntry type="module" module-name="intellij.platform.credentialStore" scope="TEST" />
<orderEntry type="module" module-name="intellij.platform.testExtensions" scope="TEST" />
<orderEntry type="module" module-name="intellij.platform.configurationStore.tests" scope="TEST" />
<orderEntry type="library" scope="TEST" name="kotlinx-coroutines-jdk8" level="project" />
</component>
</module>

4
plugins/settings-repository/src/IcsActionsLogger.kt
View File

@@ -1,4 +1,4 @@
// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package org.jetbrains.settingsRepository.org.jetbrains.settingsRepository
import com.intellij.internal.statistic.eventLog.FeatureUsageData
@@ -7,7 +7,7 @@ import com.intellij.openapi.project.Project
import com.intellij.openapi.util.text.StringUtil
import org.jetbrains.settingsRepository.SyncType
object IcsActionsLogger {
internal object IcsActionsLogger {
fun logSettingsSync(project: Project?, type: SyncType) {
val data = FeatureUsageData().addData("sync_type", StringUtil.toLowerCase(type.name))
FUCounterUsageLogger.getInstance().logEvent(project, "settings.repository", "sync.settings", data)

1
plugins/sh/intellij.sh.iml
View File

@@ -21,5 +21,6 @@
<orderEntry type="library" name="jediterm-pty" level="project" />
<orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
<orderEntry type="module" module-name="intellij.spellchecker" />
<orderEntry type="module" module-name="intellij.platform.statistics" />
</component>
</module>

1
plugins/stats-collector/intellij.statsCollector.iml
View File

@@ -29,5 +29,6 @@
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module" module-name="intellij.platform.statistics" />
</component>
</module>

1
plugins/svn4idea/intellij.vcs.svn.iml
View File

@@ -36,5 +36,6 @@
<orderEntry type="library" name="javax.activation" level="project" />
<orderEntry type="library" scope="RUNTIME" name="jaxb-runtime" level="project" />
<orderEntry type="library" name="StreamEx" level="project" />
<orderEntry type="module" module-name="intellij.platform.statistics" />
</component>
</module>

4
plugins/svn4idea/src/org/jetbrains/idea/svn/statistics/SvnStatisticsCollector.kt
View File

@@ -1,4 +1,4 @@
// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package org.jetbrains.idea.svn.statistics
import com.intellij.internal.statistic.beans.MetricEvent
@@ -9,7 +9,7 @@ import com.intellij.openapi.project.Project
import org.jetbrains.idea.svn.NestedCopyType
import org.jetbrains.idea.svn.SvnVcs
class SvnStatisticsCollector : ProjectUsagesCollector() {
private class SvnStatisticsCollector : ProjectUsagesCollector() {
override fun getGroupId() = "svn.configuration"
override fun getMetrics(project: Project): Set<MetricEvent> {

1
plugins/terminal/intellij.terminal.iml
View File

@@ -22,5 +22,6 @@
<orderEntry type="module" module-name="intellij.platform.execution.impl" />
<orderEntry type="module" module-name="intellij.platform.configurationStore.tests" scope="TEST" />
<orderEntry type="library" name="winp" level="project" />
<orderEntry type="module" module-name="intellij.platform.statistics" />
</component>
</module>

1
python/intellij.python.community.impl.iml
View File

@@ -50,5 +50,6 @@
</library>
</orderEntry>
<orderEntry type="library" name="StreamEx" level="project" />
<orderEntry type="module" module-name="intellij.platform.statistics" />
</component>
</module>