Sync with JOSM 15697, update preset utils

build.gradle

@@ -1,7 +1,10 @@
 /*
  */
 
-version = '1.6.0'
+version = '1.7.0'
+
+//for Ant filter
+import org.apache.tools.ant.filters.ReplaceTokens
 
 apply plugin: 'java'
 
@@ -28,13 +31,13 @@ ext {
     josm_preset_file = 'josm_preset.xml'
     vespucci_preset_file = 'vespucci_preset.xml'
     vespucci_preset_build_file = 'vespucci_preset_build.xml'
-    vespucci_preset_version = '1.6'
+    vespucci_preset_version = '1.8'
     generated = 'build/gen/'
     github_token = System.getenv('GITHUB_TOKEN')
 }
 
 dependencies {
-    runtime 'ch.poole:preset-utils:0.10.0'
+    runtime 'ch.poole:preset-utils:0.12.0'
 }
 
 task copyCss(type: Copy) {
@@ -105,10 +108,7 @@ task josmIcons(dependsOn: ["replaceVersion"], type: Copy) {
     into 'build/temp'
     filteringCharset = 'UTF-8'
     rename preset_file, josm_preset_file
-    expand([
-        ICONPATH: '',
-        ICONTYPE: 'png'
-    ])
+    filter(ReplaceTokens, beginToken : '${', endToken : '}', tokens: [ICONPATH: '', ICONTYPE: 'png'])
 }
 
 task transformToJosm(dependsOn: ["josmIcons", "copyResources"], type: Exec) {
@@ -169,10 +169,7 @@ task vespucciIcons(type: Copy) {
     into 'build/gen'
     filteringCharset = 'UTF-8'
     rename (preset_file, vespucci_preset_file)
-    expand([
-        ICONPATH: '',
-        ICONTYPE: 'png'
-    ])
+    filter(ReplaceTokens, beginToken : '${', endToken : '}', tokens: [ICONPATH: '', ICONTYPE: 'png'])
 }
 
 task generateAndValidateVespucci(dependsOn: ["vespucciIcons", "copyResources"], type: Exec) {
@@ -193,10 +190,7 @@ task vespucciBuild(dependsOn: ["replaceVersion"], type: Copy) {
     into 'build/gen'
     filteringCharset = 'UTF-8'
     rename (preset_file, vespucci_preset_build_file)
-    expand([
-        ICONPATH: 'icons/png/',
-        ICONTYPE: 'png'
-    ])
+    filter(ReplaceTokens, beginToken : '${', endToken : '}', tokens: [ICONPATH: 'icons/png/', ICONTYPE: 'png'])
 }
 
 task generateAndValidateVespucciBuild(dependsOn: ["vespucciBuild", "copyResources"], type: Exec) {