IU-2021.1.1 <Eroter@DESKTOP-1PPMF59 Merge branch 'master'

This commit is contained in:
Eee 2021-06-04 20:52:06 +08:00
commit 2abf0162bb
3 changed files with 6 additions and 6 deletions

View File

@ -1,6 +1,6 @@
<application> <application>
<component name="PathMacrosImpl"> <component name="PathMacrosImpl">
<macro name="MAVEN_REPOSITORY" value="D:\JavaSpace\maven\repository" /> <macro name="MAVEN_REPOSITORY" value="D:\JavaSpace\maven\repository" />
<macro name="KOTLIN_BUNDLED" value="S:\JavaSpace\Intellij IDEA\IntelliJ IDEA 2021.1.1\plugins\Kotlin\kotlinc" /> <macro name="KOTLIN_BUNDLED" value="C:\Users\Administrator\AppData\Roaming\JetBrains\IntelliJIdea2021.1\plugins\Kotlin\kotlinc" />
</component> </component>
</application> </application>

View File

@ -7,7 +7,7 @@
<entry key="com.zeroturnaround.jrebel.intellij.autocompile.feature-seen" value="true" /> <entry key="com.zeroturnaround.jrebel.intellij.autocompile.feature-seen" value="true" />
<entry key="com.zeroturnaround.jrebel.intellij.autosave.enabled" value="true" /> <entry key="com.zeroturnaround.jrebel.intellij.autosave.enabled" value="true" />
<entry key="com.zeroturnaround.jrebel.intellij.plugin.old-agent-version" value="2021.2.1" /> <entry key="com.zeroturnaround.jrebel.intellij.plugin.old-agent-version" value="2021.2.1" />
<entry key="com.zeroturnaround.jrebel.update.LastKnownVersionOnUpdateSite" value="2021.2.1" /> <entry key="com.zeroturnaround.jrebel.update.LastKnownVersionOnUpdateSite" value="2021.2.2" />
<entry key="com.zeroturnaround.jrebel.update.UpdateNotificationCount" value="2" /> <entry key="com.zeroturnaround.jrebel.update.UpdateNotificationCount" value="2" />
</map> </map>
</option> </option>

View File

@ -159,7 +159,7 @@
</entry> </entry>
<entry key="JetRunConfigurationType"> <entry key="JetRunConfigurationType">
<value> <value>
<FeaturePluginData displayName="Kotlin" pluginName="Kotlin" pluginId="org.jetbrains.kotlin" bundled="true" /> <FeaturePluginData displayName="Kotlin" pluginName="Kotlin" pluginId="org.jetbrains.kotlin" />
</value> </value>
</entry> </entry>
<entry key="JettyConfiguration"> <entry key="JettyConfiguration">
@ -169,12 +169,12 @@
</entry> </entry>
<entry key="KotlinJavaScriptTestRunnerProtractor"> <entry key="KotlinJavaScriptTestRunnerProtractor">
<value> <value>
<FeaturePluginData displayName="Protractor (Kotlin)" pluginName="org.jetbrains.kotlin" pluginId="org.jetbrains.kotlin" bundled="true" /> <FeaturePluginData displayName="Protractor (Kotlin)" pluginName="org.jetbrains.kotlin" pluginId="org.jetbrains.kotlin" />
</value> </value>
</entry> </entry>
<entry key="KotlinStandaloneScriptRunConfigurationType"> <entry key="KotlinStandaloneScriptRunConfigurationType">
<value> <value>
<FeaturePluginData displayName="Kotlin script" pluginName="Kotlin" pluginId="org.jetbrains.kotlin" bundled="true" /> <FeaturePluginData displayName="Kotlin script" pluginName="Kotlin" pluginId="org.jetbrains.kotlin" />
</value> </value>
</entry> </entry>
<entry key="MavenRunConfiguration"> <entry key="MavenRunConfiguration">
@ -369,7 +369,7 @@
</entry> </entry>
<entry key="kotlin-language"> <entry key="kotlin-language">
<value> <value>
<FeaturePluginData displayName="Kotlin" pluginName="Kotlin" pluginId="org.jetbrains.kotlin" bundled="true" /> <FeaturePluginData displayName="Kotlin" pluginName="Kotlin" pluginId="org.jetbrains.kotlin" />
</value> </value>
</entry> </entry>
<entry key="native-android-gradle"> <entry key="native-android-gradle">