Compare commits

..

No commits in common. "main" and "v2.8" have entirely different histories.
main ... v2.8

4 changed files with 3 additions and 6 deletions

View File

@ -11,4 +11,4 @@ global:
repository: null repository: null
sc: git sc: git
deploy: deploy:
artifact: service/build/ROOT.war artifact: build/ROOT.war

View File

@ -12,8 +12,6 @@ buildscript {
} }
} }
import static com.jdbernard.gradle.ExecUtil.*
dependencies { dependencies {
compile localGroovy() compile localGroovy()
compile 'ch.qos.logback:logback-classic:1.1.8' compile 'ch.qos.logback:logback-classic:1.1.8'

View File

@ -11,8 +11,7 @@ public class NLSongsContext {
public static String mediaBaseUrl public static String mediaBaseUrl
public static String makeUrl(Service service, Song song) { public static String makeUrl(Service service, Song song) {
return mediaBaseUrl + '/' + service.localDate.toString('yyyy') + "/" + return mediaBaseUrl + '/' + service.localDate.toString('yyyy-MM-dd') + '_' +
service.localDate.toString('yyyy-MM-dd') + '_' +
service.serviceType.name().toLowerCase() + '_' + service.serviceType.name().toLowerCase() + '_' +
song.name.replaceAll(/[\s'"\\\/\?!]/, '') + '.mp3' } song.name.replaceAll(/[\s'"\\\/\?!]/, '') + '.mp3' }
} }

View File

@ -18,7 +18,7 @@ task writeVersionFile(
group: 'build', group: 'build',
description: 'Write the version to VERSION.txt') { doLast { description: 'Write the version to VERSION.txt') { doLast {
(new File("${buildDir}/classes/main/VERSION.txt")).text = version (new File('build/classes/main/VERSION.txt')).text = version
} } } }
build.dependsOn writeVersionFile build.dependsOn writeVersionFile