IU-2021.1.3 <wangwei-202@KANE_DELL5050 Merge branch 'master'
This commit is contained in:
commit
8b39fc1427
|
@ -1,6 +1,6 @@
|
||||||
<application>
|
<application>
|
||||||
<component name="PathMacrosImpl">
|
<component name="PathMacrosImpl">
|
||||||
<macro name="MAVEN_REPOSITORY" value="C:\Users\wangk\.m2\repository" />
|
<macro name="MAVEN_REPOSITORY" value="C:\Users\wangk\.m2\repository" />
|
||||||
<macro name="KOTLIN_BUNDLED" value="C:\Users\wangk\AppData\Roaming\JetBrains\IntelliJIdea2021.1\plugins\Kotlin\kotlinc" />
|
<macro name="KOTLIN_BUNDLED" value="C:\Program Files\JetBrains\IntelliJ IDEA 2021.1.2\plugins\Kotlin\kotlinc" />
|
||||||
</component>
|
</component>
|
||||||
</application>
|
</application>
|
|
@ -159,7 +159,7 @@
|
||||||
</entry>
|
</entry>
|
||||||
<entry key="JetRunConfigurationType">
|
<entry key="JetRunConfigurationType">
|
||||||
<value>
|
<value>
|
||||||
<FeaturePluginData displayName="Kotlin" pluginName="Kotlin" pluginId="org.jetbrains.kotlin" />
|
<FeaturePluginData displayName="Kotlin" pluginName="Kotlin" pluginId="org.jetbrains.kotlin" bundled="true" />
|
||||||
</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" />
|
<FeaturePluginData displayName="Protractor (Kotlin)" pluginName="org.jetbrains.kotlin" pluginId="org.jetbrains.kotlin" bundled="true" />
|
||||||
</value>
|
</value>
|
||||||
</entry>
|
</entry>
|
||||||
<entry key="KotlinStandaloneScriptRunConfigurationType">
|
<entry key="KotlinStandaloneScriptRunConfigurationType">
|
||||||
<value>
|
<value>
|
||||||
<FeaturePluginData displayName="Kotlin script" pluginName="Kotlin" pluginId="org.jetbrains.kotlin" />
|
<FeaturePluginData displayName="Kotlin script" pluginName="Kotlin" pluginId="org.jetbrains.kotlin" bundled="true" />
|
||||||
</value>
|
</value>
|
||||||
</entry>
|
</entry>
|
||||||
<entry key="MavenRunConfiguration">
|
<entry key="MavenRunConfiguration">
|
||||||
|
@ -364,7 +364,7 @@
|
||||||
</entry>
|
</entry>
|
||||||
<entry key="kotlin-language">
|
<entry key="kotlin-language">
|
||||||
<value>
|
<value>
|
||||||
<FeaturePluginData displayName="Kotlin" pluginName="Kotlin" pluginId="org.jetbrains.kotlin" />
|
<FeaturePluginData displayName="Kotlin" pluginName="Kotlin" pluginId="org.jetbrains.kotlin" bundled="true" />
|
||||||
</value>
|
</value>
|
||||||
</entry>
|
</entry>
|
||||||
<entry key="native-android-gradle">
|
<entry key="native-android-gradle">
|
||||||
|
|
Loading…
Reference in New Issue