IDEA-89712 Make Github plugin depend on Tasks plugin.
authorKirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Fri, 3 Aug 2012 10:25:02 +0000 (14:25 +0400)
committerKirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Fri, 3 Aug 2012 10:39:02 +0000 (14:39 +0400)
(cherry picked from commit 537a8e108302f4501577e1db71c2405c18695293)

Conflicts:

plugins/github/src/META-INF/plugin.xml

plugins/github/src/META-INF/githubtracker.xml [deleted file]
plugins/github/src/META-INF/plugin.xml

diff --git a/plugins/github/src/META-INF/githubtracker.xml b/plugins/github/src/META-INF/githubtracker.xml
deleted file mode 100644 (file)
index 3f70e9b..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-<idea-plugin>
-  <extensions defaultExtensionNs="com.intellij">
-    <checkoutCompletedListener implementation="org.jetbrains.plugins.github.GithubCheckoutListener" order="after PlatformProjectCheckoutListener"/>
-  </extensions>
-</idea-plugin>
\ No newline at end of file
index 10429730016246d2a30f2f8a5ec9cdf999a45450..e6fa00a6b744c434817e7135f0c9cb2f24a106c6 100644 (file)
@@ -6,7 +6,7 @@
 
   <depends>com.intellij.modules.lang</depends>
   <depends>Git4Idea</depends>
-  <depends optional="true" config-file="githubtracker.xml">com.intellij.tasks</depends>
+  <depends>com.intellij.tasks</depends>
 
   <extensions defaultExtensionNs="com.intellij">
     <errorHandler implementation="com.intellij.diagnostic.ITNReporter"/>
@@ -15,6 +15,7 @@
                         serviceImplementation="org.jetbrains.plugins.github.GithubSettings"/>
     <applicationConfigurable instance="org.jetbrains.plugins.github.ui.GitHubSettingsConfigurable"/>
     <vcsAnnotationGutterActionProvider implementation="org.jetbrains.plugins.github.ui.GithubAnnotationGutterActionProvider" />
+    <checkoutCompletedListener implementation="org.jetbrains.plugins.github.GithubCheckoutListener" order="after PlatformProjectCheckoutListener"/>
   </extensions>
 
   <actions>
@@ -39,4 +40,4 @@
     </action>
     <action id="Github.Rebase.Internal" class="org.jetbrains.plugins.github.GithubRebase"/>
   </actions>
-</idea-plugin>
\ No newline at end of file
+</idea-plugin>