From c956428d96ee5c4712612dc94230fe65f88b2de0 Mon Sep 17 00:00:00 2001
From: Mikhail Zarechenskiy <mikhail.zarechenskiy@jetbrains.com>
Date: Mon, 7 Nov 2016 15:37:01 +0300
Subject: [PATCH] Update JFlex to 1.7.0

 Previous patched version (1.4.3) from Itellij was dropped. As we are using skeleton from Intellij, we should update our jflex version accordingly
---
 compiler/frontend/buildLexer.xml | 3 +--
 update_dependencies.xml          | 6 ++----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/compiler/frontend/buildLexer.xml b/compiler/frontend/buildLexer.xml
index a8f2f62805d..503faa25e9a 100644
--- a/compiler/frontend/buildLexer.xml
+++ b/compiler/frontend/buildLexer.xml
@@ -10,11 +10,10 @@
       <sequential>
         <delete dir="${out.dir}"/>
         <mkdir dir="${out.dir}"/>
-        <java classname="JFlex.Main"
+        <java classname="jflex.Main"
               jvmargs="-Xmx512M"
               fork="true"
               failonerror="true">
-          <arg value="-sliceandcharat"/>
           <arg value="-skel"/>
           <arg value="@{skeleton}"/>
           <arg value="-d"/>
diff --git a/update_dependencies.xml b/update_dependencies.xml
index 3ea76867f74..932751f59f1 100644
--- a/update_dependencies.xml
+++ b/update_dependencies.xml
@@ -199,11 +199,9 @@
         <delete dir="${dependencies}/dx-src" failonerror="false"/>
         <untar src="${dependencies}/download/${android-sources.tgz}" dest="${dependencies}/dx-src" compression="gzip"/>
 
-        <!-- jflex 1.4 -->
         <mkdir dir="${dependencies}/jflex"/>
-        <get-maven-library prefix="de/jflex" lib="jflex" version="1.4.3" src="false"
-                           target.jar.name.base="JFlex"
-                           dependencies="${dependencies}/jflex"/>
+        <get src="https://raw.github.com/JetBrains/intellij-community/master/tools/lexer/jflex-1.7.0-SNAPSHOT.jar"
+             dest="${dependencies}/jflex/JFlex.jar" usetimestamp="true"/>
         <get src="https://raw.github.com/JetBrains/intellij-community/master/tools/lexer/idea-flex.skeleton"
              dest="${dependencies}/jflex/idea-flex.skeleton" usetimestamp="true"/>