Update to 171.SNAPSHOT to pick up fix for IDEA-169570; fix compilation
This commit is contained in:
Generated
+1
-2
@@ -6,7 +6,6 @@
|
|||||||
</properties>
|
</properties>
|
||||||
</component>
|
</component>
|
||||||
<component name="EntryPointsManager">
|
<component name="EntryPointsManager">
|
||||||
<entry_points version="2.0" />
|
|
||||||
<list size="1">
|
<list size="1">
|
||||||
<item index="0" class="java.lang.String" itemvalue="javax.inject.Inject" />
|
<item index="0" class="java.lang.String" itemvalue="javax.inject.Inject" />
|
||||||
</list>
|
</list>
|
||||||
@@ -49,7 +48,7 @@
|
|||||||
<component name="ProjectResources">
|
<component name="ProjectResources">
|
||||||
<default-html-doctype>http://www.w3.org/1999/xhtml</default-html-doctype>
|
<default-html-doctype>http://www.w3.org/1999/xhtml</default-html-doctype>
|
||||||
</component>
|
</component>
|
||||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" default="false" assert-keyword="true" jdk-15="true" project-jdk-name="1.6" project-jdk-type="JavaSDK">
|
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
|
||||||
<output url="file://$PROJECT_DIR$/out" />
|
<output url="file://$PROJECT_DIR$/out" />
|
||||||
</component>
|
</component>
|
||||||
<component name="SuppressABINotification">
|
<component name="SuppressABINotification">
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
<content url="file://$MODULE_DIR$">
|
<content url="file://$MODULE_DIR$">
|
||||||
<sourceFolder url="file://$MODULE_DIR$" isTestSource="true" />
|
<sourceFolder url="file://$MODULE_DIR$" isTestSource="true" />
|
||||||
</content>
|
</content>
|
||||||
<orderEntry type="jdk" jdkName="1.6" jdkType="JavaSDK" />
|
<orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
|
||||||
<orderEntry type="sourceFolder" forTests="false" />
|
<orderEntry type="sourceFolder" forTests="false" />
|
||||||
<orderEntry type="module" module-name="descriptors" />
|
<orderEntry type="module" module-name="descriptors" />
|
||||||
<orderEntry type="module" module-name="backend" />
|
<orderEntry type="module" module-name="backend" />
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
<content url="file://$MODULE_DIR$">
|
<content url="file://$MODULE_DIR$">
|
||||||
<sourceFolder url="file://$MODULE_DIR$" isTestSource="true" />
|
<sourceFolder url="file://$MODULE_DIR$" isTestSource="true" />
|
||||||
</content>
|
</content>
|
||||||
<orderEntry type="jdk" jdkName="1.6" jdkType="JavaSDK" />
|
<orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
|
||||||
<orderEntry type="sourceFolder" forTests="false" />
|
<orderEntry type="sourceFolder" forTests="false" />
|
||||||
<orderEntry type="module" module-name="tests-common" />
|
<orderEntry type="module" module-name="tests-common" />
|
||||||
<orderEntry type="module" module-name="descriptors" />
|
<orderEntry type="module" module-name="descriptors" />
|
||||||
|
|||||||
@@ -32,5 +32,6 @@ fun PsiElementFactory.createReferenceListWithRole(
|
|||||||
Role.EXTENDS_LIST -> createClassFromText("class Foo extends $refListText {}", null).innerClasses[0].extendsList
|
Role.EXTENDS_LIST -> createClassFromText("class Foo extends $refListText {}", null).innerClasses[0].extendsList
|
||||||
Role.IMPLEMENTS_LIST -> createClassFromText("class Foo implements $refListText {}", null).innerClasses[0].implementsList
|
Role.IMPLEMENTS_LIST -> createClassFromText("class Foo implements $refListText {}", null).innerClasses[0].implementsList
|
||||||
Role.EXTENDS_BOUNDS_LIST -> createTypeParameterFromText("T extends $refListText", null).extendsList
|
Role.EXTENDS_BOUNDS_LIST -> createTypeParameterFromText("T extends $refListText", null).extendsList
|
||||||
|
else -> throw UnsupportedOperationException("Unsupported role $role")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
<content url="file://$MODULE_DIR$">
|
<content url="file://$MODULE_DIR$">
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
|
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
|
||||||
</content>
|
</content>
|
||||||
<orderEntry type="jdk" jdkName="1.6" jdkType="JavaSDK" />
|
<orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
|
||||||
<orderEntry type="sourceFolder" forTests="false" />
|
<orderEntry type="sourceFolder" forTests="false" />
|
||||||
<orderEntry type="module" module-name="idea-jps-common" />
|
<orderEntry type="module" module-name="idea-jps-common" />
|
||||||
<orderEntry type="module" module-name="cli-common" />
|
<orderEntry type="module" module-name="cli-common" />
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
<import file="common.xml" optional="false"/>
|
<import file="common.xml" optional="false"/>
|
||||||
|
|
||||||
<property name="automerge_dummy" value="This property is used to trick git merge. Do not delete empty lines around."/>
|
<property name="automerge_dummy" value="This property is used to trick git merge. Do not delete empty lines around."/>
|
||||||
<property name="ideaVersion" value="171.2613.7"/>
|
<property name="ideaVersion" value="171-SNAPSHOT"/>
|
||||||
<property name="idea.kotlin.branch" value="rc"/>
|
<property name="idea.kotlin.branch" value="rc"/>
|
||||||
|
|
||||||
|
|
||||||
@@ -48,7 +48,7 @@
|
|||||||
|
|
||||||
<target name="update" depends="fetch-third-party,fetch-annotations" description="Update dependencies">
|
<target name="update" depends="fetch-third-party,fetch-annotations" description="Update dependencies">
|
||||||
<execute_update_with_idea_maven_artifacts
|
<execute_update_with_idea_maven_artifacts
|
||||||
base.url="https://www.jetbrains.com/intellij-repository/releases/com/jetbrains/intellij/idea"
|
base.url="https://www.jetbrains.com/intellij-repository/snapshots/com/jetbrains/intellij/idea"
|
||||||
idea.maven.version="${ideaVersion}"/>
|
idea.maven.version="${ideaVersion}"/>
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
@@ -60,7 +60,7 @@
|
|||||||
|
|
||||||
<target name="jb_update" depends="fetch-third-party,fetch-annotations" description="Update dependencies for JB local network">
|
<target name="jb_update" depends="fetch-third-party,fetch-annotations" description="Update dependencies for JB local network">
|
||||||
<execute_update_with_idea_maven_artifacts
|
<execute_update_with_idea_maven_artifacts
|
||||||
base.url="http://jetbrains-com-mirror.labs.intellij.net/intellij-repository/releases/com/jetbrains/intellij/idea"
|
base.url="http://jetbrains-com-mirror.labs.intellij.net/intellij-repository/snapshots/com/jetbrains/intellij/idea"
|
||||||
idea.maven.version="${ideaVersion}"/>
|
idea.maven.version="${ideaVersion}"/>
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user