From b5357d873809c4ff25925a2d0c2e9e46d0382952 Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <nikolay.krasko@jetbrains.com>
Date: Tue, 14 Aug 2012 13:17:32 +0400
Subject: [PATCH] Compile against 122.29 idea eap

---
 .../jetbrains/jet/asJava/ClsWrapperStubPsiFactory.java   | 9 +++++++++
 idea/src/META-INF/plugin.xml                             | 2 +-
 update_dependencies.xml                                  | 8 ++++----
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/ClsWrapperStubPsiFactory.java b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/ClsWrapperStubPsiFactory.java
index f53ee42206d..dbe6cb7dbdb 100644
--- a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/ClsWrapperStubPsiFactory.java
+++ b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/ClsWrapperStubPsiFactory.java
@@ -140,4 +140,13 @@ class ClsWrapperStubPsiFactory extends StubPsiFactory {
         return delegate.createTypeParameterList(stub);
     }
 
+    @Override
+    public PsiAnnotationParameterList createAnnotationParameterList(PsiAnnotationParameterListStub stub) {
+        return delegate.createAnnotationParameterList(stub);
+    }
+
+    @Override
+    public PsiNameValuePair createNameValuePair(PsiNameValuePairStub stub) {
+        return delegate.createNameValuePair(stub);
+    }
 }
diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index 08a696aa051..9b243c61055 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -6,7 +6,7 @@
   <version>@snapshot@</version>
   <vendor url="http://www.jetbrains.com">JetBrains Inc.</vendor>
 
-  <idea-version since-build="ideaIC-120.305" until-build="ideaIC-120.9999" />
+  <idea-version since-build="ideaIC-120.305" until-build="ideaIC-122.9999" />
 
   <depends optional="true">JUnit</depends>
 
diff --git a/update_dependencies.xml b/update_dependencies.xml
index d0177c9f883..7cd49c0e8a0 100644
--- a/update_dependencies.xml
+++ b/update_dependencies.xml
@@ -3,15 +3,15 @@
 
     <target name="update" depends="fetch-third-party">
         <execute_update
-            base.url="http://teamcity.jetbrains.com/guestAuth/repository/download/bt343/67709:id"
-            build.zip="ideaIC-120.SNAPSHOT.win.zip"
+            base.url="http://teamcity.jetbrains.com/guestAuth/repository/download/bt343/68192:id"
+            build.zip="ideaIC-122.SNAPSHOT.win.zip"
         />
     </target>
 
     <target name="jb_update" depends="fetch-third-party">
         <execute_update
-            base.url="http://buildserver.labs.intellij.net/guestAuth/repository/download/bt662/1492288:id"
-            build.zip="ideaIC-120.SNAPSHOT.win.zip"
+            base.url="http://buildserver.labs.intellij.net/guestAuth/repository/download/bt662/1501032:id"
+            build.zip="ideaIC-122.SNAPSHOT.win.zip"
         />
     </target>