Browse Source

更改jdk版本1.8->1.7

master
fangdong sun 8 years ago
parent
commit
1201193874
  1. 2
      designer_base/build.gradle
  2. 2
      designer_chart/build.gradle
  3. 2
      designer_chart/build.gradle.bak
  4. 2
      designer_form/build.gradle
  5. 18
      designer_form/build.gradle.bak

2
designer_base/build.gradle

@ -4,7 +4,7 @@ tasks.withType(JavaCompile){
options.encoding = 'UTF-8' options.encoding = 'UTF-8'
} }
//jdk版本 //jdk版本
sourceCompatibility=1.8 sourceCompatibility=1.7
//jar包版本 //jar包版本
version='8.0' version='8.0'
//jar包重命名 //jar包重命名

2
designer_chart/build.gradle

@ -4,7 +4,7 @@ tasks.withType(JavaCompile){
options.encoding = 'UTF-8' options.encoding = 'UTF-8'
} }
//jdk版本 //jdk版本
sourceCompatibility=1.8 sourceCompatibility=1.7
//jar包的版本 //jar包的版本
version='8.0' version='8.0'

2
designer_chart/build.gradle.bak

@ -54,7 +54,7 @@ task compressJS{
fileset(dir:'../../../finereport-lib4build-stable',includes:'**/*.jar') fileset(dir:'../../../finereport-lib4build-stable',includes:'**/*.jar')
} }
} }
ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false", , charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){ ant.yuicompress(linebreak:"500",warn:"false", munge:"yes",preserveallsemicolons:"false",charset:"utf-8",encoding:"utf-8",outputfolder:'build/classes/main'){
fileset (dir:"${srcDir}/src"){ fileset (dir:"${srcDir}/src"){
include (name:'**/*.js') include (name:'**/*.js')
include (name:'**/*.css') include (name:'**/*.css')

2
designer_form/build.gradle

@ -4,7 +4,7 @@ tasks.withType(JavaCompile){
options.encoding = 'UTF-8' options.encoding = 'UTF-8'
} }
//jdk版本 //jdk版本
sourceCompatibility=1.8 sourceCompatibility=1.7
//jar包版本 //jar包版本
version='8.0' version='8.0'

18
designer_form/build.gradle.bak

@ -3,19 +3,19 @@ apply plugin: 'java'
tasks.withType(JavaCompile){ tasks.withType(JavaCompile){
options.encoding = 'UTF-8' options.encoding = 'UTF-8'
} }
//jdk版本 //jdk版本
sourceCompatibility=1.8 sourceCompatibility=1.8
//jar包版本 //jar包版本
version='8.0' version='8.0'
def srcDir="." def srcDir="."
//jar包的名字 //jar包的名字
jar{ jar{
baseName='fr-designer-report' baseName='fr-designer-report'
} }
// //
sourceSets{ sourceSets{
main{ main{
java{ java{
@ -25,13 +25,13 @@ sourceSets{
} }
} }
// //
FileTree files =fileTree(dir:'./',include:'build.gradle') 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)
// //
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") compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/*.jar")
@ -39,7 +39,7 @@ compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/*
testCompile 'junit:junit:4.12' testCompile 'junit:junit:4.12'
} }
// //
def dataContent ={def dir -> def dataContent ={def dir ->
copySpec{ copySpec{
from ("${dir}"){ from ("${dir}"){
@ -48,7 +48,7 @@ def dataContent ={def dir ->
} }
} }
//.java文件复制到classes文件夹下 //.java文件复制到classes文件夹下
task copyFile(type:Copy,dependsOn:compileJava){ task copyFile(type:Copy,dependsOn:compileJava){
copy{ copy{
with dataContent.call("${srcDir}/src") with dataContent.call("${srcDir}/src")
@ -59,7 +59,7 @@ task copyFile(type:Copy,dependsOn:compileJava){
} }
//js文件 //js文件
task compressJS{ task compressJS{
ant.taskdef(name:'yuicompress',classname:'com.yahoo.platform.yui.compressor.YUICompressTask'){ ant.taskdef(name:'yuicompress',classname:'com.yahoo.platform.yui.compressor.YUICompressTask'){
classpath { classpath {

Loading…
Cancel
Save