Merge remote-tracking branch 'origin/feature/10.0' into feature/10.0

7 years ago · 270fad7e89
4 changed files with 4 additions and 4 deletions
--- a/build.report-designer.gradle
+++ b/build.report-designer.gradle
@ -4,7 +4,7 @@ tasks.withType(JavaCompile){
 		options.encoding = 'UTF-8'
 }
 //指定构建的jdk版本
-sourceCompatibility=1.6
+sourceCompatibility=1.8
 //jar包版本
 version='10.0'
--- a/designer_base/build.base.gradle
+++ b/designer_base/build.base.gradle
@ -25,7 +25,7 @@ project.ext {
 apply plugin: 'aspectj'
 //指定构建的jdk版本
-sourceCompatibility=1.7
+sourceCompatibility=1.8
 //指定生成jar包版本
 version='10.0'
 //生成jar包重命名
--- a/designer_chart/build.chart.gradle
+++ b/designer_chart/build.chart.gradle
@ -25,7 +25,7 @@ project.ext {
 apply plugin: 'aspectj'
 //指定构建的jdk版本
-sourceCompatibility=1.7
+sourceCompatibility=1.8
 //指定生成jar包版本
 version='10.0'
 //生成jar包重命名
--- a/designer_form/build.form.gradle
+++ b/designer_form/build.form.gradle
@ -25,7 +25,7 @@ project.ext {
 apply plugin: 'aspectj'
 //指定构建的jdk版本
-sourceCompatibility=1.7
+sourceCompatibility=1.8
 //指定生成jar包版本
 version='10.0'
 //生成jar包重命名