From 5a9f7e148836f9306b43735757af01fca4cdc588 Mon Sep 17 00:00:00 2001
From: neil <neil@finereport.com>
Date: Fri, 21 Oct 2016 10:55:11 +0800
Subject: [PATCH] ct

---
 .../{build.dev.gradle => build.master.gradle} |  2 +-
 designer_base/build.release.gradle            | 70 -------------------
 2 files changed, 1 insertion(+), 71 deletions(-)
 rename designer_base/{build.dev.gradle => build.master.gradle} (98%)
 delete mode 100644 designer_base/build.release.gradle

diff --git a/designer_base/build.dev.gradle b/designer_base/build.master.gradle
similarity index 98%
rename from designer_base/build.dev.gradle
rename to designer_base/build.master.gradle
index 7b3bea2ba..b02f751e7 100644
--- a/designer_base/build.dev.gradle
+++ b/designer_base/build.master.gradle
@@ -4,7 +4,7 @@ tasks.withType(JavaCompile){
 	options.encoding = 'UTF-8'
 }
 //指定构建的jdk版本
-sourceCompatibility=1.8
+sourceCompatibility=1.7
 //指定生成jar包版本
 version='8.0'
 //生成jar包重命名
diff --git a/designer_base/build.release.gradle b/designer_base/build.release.gradle
deleted file mode 100644
index 4ed4ba12b..000000000
--- a/designer_base/build.release.gradle
+++ /dev/null
@@ -1,70 +0,0 @@
-
-apply plugin: 'java'
-tasks.withType(JavaCompile){
-	options.encoding = 'UTF-8'
-}
-//指定构建的jdk版本
-sourceCompatibility=1.8
-//指定生成jar包版本
-version='8.0'
-//生成jar包重命名
-jar{
-	baseName='fr-designer-core'
-}
-
-
-def srcDir="."
-
-//指定源码路径
-sourceSets{
-		main{
-			java{
-				srcDirs=["${srcDir}/src"]
-			}
-		}
-}
-//获取什么分支名
-FileTree files =fileTree(dir:'./',include:'build.*.gradle')
-def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf ('\\'))
-buildDir=buildDir.substring(0,buildDir.lastIndexOf ('\\'))
-def branchName=buildDir.substring(buildDir.lastIndexOf ('\\')+1)
-
-//声明外部依赖
-dependencies{
-
-compile fileTree(dir:'../../../finereport-lib-stable/master',include:'**/*.jar')
-compile fileTree(dir:'../../../',include:"finereport-*-stable/${branchName}/**/build/libs/*.jar")
-
- 	testCompile 'junit:junit:4.12'
-}
-//复制非.java文件到classes文件夹下参与打包
-task copyFile(type:Copy,dependsOn:compileJava){
-	copy{
-		from ("${srcDir}/src"){
-			exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html'
-		}
-		into 'build/classes/main'
-	}
-
-}
-
-
-//压缩项目中的js文件
-task compressJS{
-	ant.taskdef(name:'yuicompress',classname:'com.yahoo.platform.yui.compressor.YUICompressTask'){
-		classpath {
-			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'){
-		fileset (dir:"${srcDir}/src"){
-			include (name:'**/*.js')
-			include (name:'**/*.css')
-		}
-
-	}
-}
-jar.dependsOn compressJS
-
-
-