More fixes in version regexp and move override-version call to the place where compiler is downloaded

update_dependencies.xml

@@ -123,7 +123,7 @@
         </sequential>
     </macrodef>
    
-    <target name="make-native-platform-uberjar" depends="override-version">
+    <target name="make-native-platform-uberjar">
         <property name="dependencies" value="dependencies"/>
         <property name="download" value="${dependencies}/download"/>
         <property name="server" value="${gradle.libs.repo}"/>
@@ -165,7 +165,7 @@
         
     </target>
     
-    <target name="fetch-third-party" depends="override-version,make-native-platform-uberjar">
+    <target name="fetch-third-party" depends="make-native-platform-uberjar">
         <mkdir dir="dependencies"/>
         <mkdir dir="dependencies/download"/>
 
@@ -276,7 +276,7 @@
                 build.locator.request="${kotlin.bootstrap.locator}"
                 artifact.path="kotlin-plugin-{build.number}.zip"
                 dest="dependencies/download/bootstrap-compiler.zip"
-                build.number.pattern="[0-9a-z-+\.]+"
+                build.number.pattern="[\w-+\.]+"
                 usetimestamp="true"/>
 
             <delete dir="dependencies/bootstrap-compiler" failonerror="false"/>
@@ -304,6 +304,8 @@
             <arg line="-name 'kotlin*' ! -name '*.bat' -exec chmod a+x '{}' ;"/>
         </exec>
 
+        <antcall target="override-version"/>
+
         <download-or-build-markdown-parser/>
     </target>
 
@@ -381,7 +383,7 @@
                 artifact.path="markdown_jar/markdown.jar"
                 dest="dependencies/markdown.jar"
                 usetimestamp="true"
-                build.number.pattern="\d+\s-\sKotlin\s[\d\.]+"
+                build.number.pattern="\d+\s-\sKotlin\s[\w-+\.]+"
                 />
 
             <!-- When ABI version changes, the second build should compile markdown-parser manually instead of using the old version -->
@@ -497,7 +499,7 @@
         <attribute name="artifact.path"/>
         <attribute name="dest"/>
         <attribute name="usetimestamp"/>
-        <attribute name="build.number.pattern" default="[\d\.]+"/>
+        <attribute name="build.number.pattern" default="[\w-+\.]+"/>
 
         <sequential>
             <local name="artifact.build.id"/>
@@ -861,11 +863,13 @@
                 <filterchain>
                     <tokenfilter>
                         <filetokenizer/>
-                        <replaceregex pattern="^(.*)\snumber=&quot;([.\d]+)&quot;(.*)$" replace="\2" flags="s"/>
+                        <replaceregex pattern="^(.*)\snumber=&quot;([\w-+\.]+)&quot;(.*)$" replace="\2" flags="s"/>
                     </tokenfilter>
                 </filterchain>
             </loadresource>
 
+            <echo message="URL: ${override.version.url} Version: ${override.version.build.number}"/>
+
             <exec executable="dependencies/bootstrap-compiler/Kotlin/kotlinc/bin/${kotlinc.executable.path}" failonerror="false">
                 <arg value="-cp"/>
                 <arg value="dependencies/bootstrap-compiler/Kotlin/kotlinc/lib/kotlin-compiler.jar"/>