Browse Source

Merge remote-tracking branch 'origin/dev' into dev

master
richie 8 years ago
parent
commit
58c5fd725b
  1. 9
      designer_form/build.gradle

9
designer_form/build.gradle

@ -30,17 +30,10 @@ FileTree files =fileTree(dir:'./',include:'build.gradle')
def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf ('\\')) def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf ('\\'))
buildDir=buildDir.substring(0,buildDir.lastIndexOf ('\\')) buildDir=buildDir.substring(0,buildDir.lastIndexOf ('\\'))
def branchName=buildDir.substring(buildDir.lastIndexOf ('\\')+1) def branchName=buildDir.substring(buildDir.lastIndexOf ('\\')+1)
FileTree jars=fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/*.jar").exclude 'finereport-design-stable/${branchName}/build/libs/*.jar'
jars.each{File file->
println "-----------this jar path is ${file.path}----------"
}
//ÉùÃ÷ÍⲿÒÀÀµ //ÉùÃ÷ÍⲿÒÀÀµ
dependencies{ dependencies{
compile fileTree(dir:'../../../finereport-lib-stable',include:'**/*.jar') compile fileTree(dir:'../../../finereport-lib-stable',include:'**/*.jar')
compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/*.jar").exclude 'finereport-design-stable/${branchName}/build/libs/*.jar' compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/build/libs/*.jar")//,exclude:"finereport-design-stable/${branchName}/build/libs/*.jar")
testCompile 'junit:junit:4.12' testCompile 'junit:junit:4.12'
} }

Loading…
Cancel
Save