From 10254ef5ab73b0c5a94d561bc17a2a11c702d5e2 Mon Sep 17 00:00:00 2001
From: Maciej Matys <metyl@users.noreply.github.com>
Date: Wed, 6 Jul 2016 13:39:31 +0200
Subject: [PATCH] IntelliJ IDEA 2016.2 RC (#2302)

---
 Casks/intellij-idea-ce-eap.rb | 7 ++++---
 Casks/intellij-idea-ce.rb     | 1 +
 Casks/intellij-idea-eap.rb    | 7 ++++---
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/Casks/intellij-idea-ce-eap.rb b/Casks/intellij-idea-ce-eap.rb
index 9fc51b681..61789513a 100644
--- a/Casks/intellij-idea-ce-eap.rb
+++ b/Casks/intellij-idea-ce-eap.rb
@@ -1,6 +1,6 @@
 cask 'intellij-idea-ce-eap' do
-  version '2016.2-162.1120.6'
-  sha256 'b1c0eb8f0acbe03251c26b7a03f91f181884524676cee1cfcdab8ae10a57a9df'
+  version '2016.2-162.1121.10'
+  sha256 '05bd129750eb872f279390a75df04b3c3bcba912e0e68fae86fddb0484623bfc'
 
   url "https://download.jetbrains.com/idea/ideaIC-#{version.sub(%r{.*?-}, '')}.dmg"
   name 'IntelliJ IDEA Community Edition EAP'
@@ -9,8 +9,9 @@ cask 'intellij-idea-ce-eap' do
   license :apache
 
   auto_updates true
+  conflicts_with cask: 'intellij-idea-ce'
 
-  app 'IntelliJ IDEA 2016.2 CE EAP.app'
+  app 'IntelliJ IDEA CE.app'
 
   uninstall delete: '/usr/local/bin/idea'
 
diff --git a/Casks/intellij-idea-ce.rb b/Casks/intellij-idea-ce.rb
index a2d59e861..a634e7678 100644
--- a/Casks/intellij-idea-ce.rb
+++ b/Casks/intellij-idea-ce.rb
@@ -9,6 +9,7 @@ cask 'intellij-idea-ce' do
   license :apache
 
   auto_updates true
+  conflicts_with cask: 'intellij-idea-ce-eap'
 
   app 'IntelliJ IDEA CE.app'
 
diff --git a/Casks/intellij-idea-eap.rb b/Casks/intellij-idea-eap.rb
index 5cc92ec87..e9c8a3a32 100644
--- a/Casks/intellij-idea-eap.rb
+++ b/Casks/intellij-idea-eap.rb
@@ -1,6 +1,6 @@
 cask 'intellij-idea-eap' do
-  version '2016.2-162.1120.6'
-  sha256 '427c9601a113de3dd90dd50e02ba915b3c1b4216df5fa56fd63a9e997191bc61'
+  version '2016.2-162.1121.10'
+  sha256 'a43b15066be7e13d16ccc429d8ae7f7ba9ca4bd1e80da4687e22d7fb8c842588'
 
   url "https://download.jetbrains.com/idea/ideaIU-#{version.sub(%r{.*?-}, '')}.dmg"
   name 'IntelliJ IDEA EAP'
@@ -8,8 +8,9 @@ cask 'intellij-idea-eap' do
   license :commercial
 
   auto_updates true
+  conflicts_with cask: 'intellij-idea'
 
-  app 'IntelliJ IDEA 2016.2 EAP.app'
+  app 'IntelliJ IDEA.app'
 
   uninstall delete: '/usr/local/bin/idea'