From 01da6565e17d449173fb38b63c3251650ce74171 Mon Sep 17 00:00:00 2001 From: zhouping Date: Tue, 7 Jan 2020 11:58:08 +0800 Subject: [PATCH] =?UTF-8?q?KERNEL-1298=20FineThird=E6=94=AF=E6=8C=81JDK11?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.third_step1-jdk11.gradle | 17 +++++++---------- build.third_step2-jdk11.gradle | 17 +++++++---------- build.third_step3-jdk11.gradle | 17 +++++++---------- build.third_step4-jdk11.gradle | 17 +++++++---------- build.third_step5-jdk11.gradle | 17 +++++++---------- build.third_step6-jdk11.gradle | 17 +++++++---------- build.third_step7-jdk11.gradle | 17 +++++++---------- build.third_step8-jdk11.gradle | 17 +++++++---------- 8 files changed, 56 insertions(+), 80 deletions(-) diff --git a/build.third_step1-jdk11.gradle b/build.third_step1-jdk11.gradle index 7960c9573..aa8a583ef 100644 --- a/build.third_step1-jdk11.gradle +++ b/build.third_step1-jdk11.gradle @@ -125,16 +125,13 @@ dependencies{ } //指明无法编译文件所在路径 -def dataContent ={def dir -> - copySpec{ - from ("${dir}"){ - exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html' - } - } - -} - - +def dataContent = { def dir -> + copySpec{ + from ("${dir}"){ + exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html' + } + } +} as Object task copyFiles(type:Copy,dependsOn:'compileJava'){ copy{ diff --git a/build.third_step2-jdk11.gradle b/build.third_step2-jdk11.gradle index 11e68a307..208907707 100644 --- a/build.third_step2-jdk11.gradle +++ b/build.third_step2-jdk11.gradle @@ -90,16 +90,13 @@ dependencies{ } //指明无法编译文件所在路径 -def dataContent ={def dir -> - copySpec{ - from ("${dir}"){ - exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html' - } - } - -} - - +def dataContent = { def dir -> + copySpec{ + from ("${dir}"){ + exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html' + } + } +} as Object task copyFiles(type:Copy,dependsOn:'compileJava'){ copy{ diff --git a/build.third_step3-jdk11.gradle b/build.third_step3-jdk11.gradle index 52dbef22a..b1d488c7c 100644 --- a/build.third_step3-jdk11.gradle +++ b/build.third_step3-jdk11.gradle @@ -62,16 +62,13 @@ dependencies{ } //指明无法编译文件所在路径 -def dataContent ={def dir -> - copySpec{ - from ("${dir}"){ - exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html' - } - } - -} - - +def dataContent = { def dir -> + copySpec{ + from ("${dir}"){ + exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html' + } + } +} as Object task copyFiles(type:Copy,dependsOn:'compileJava'){ copy{ diff --git a/build.third_step4-jdk11.gradle b/build.third_step4-jdk11.gradle index e1fd70c63..2a8b2c6c2 100644 --- a/build.third_step4-jdk11.gradle +++ b/build.third_step4-jdk11.gradle @@ -65,16 +65,13 @@ dependencies{ //指明无法编译文件所在路径 -def dataContent ={def dir -> - copySpec{ - from ("${dir}"){ - exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html' - } - } - -} - - +def dataContent = { def dir -> + copySpec{ + from ("${dir}"){ + exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html' + } + } +} as Object task copyFiles(type:Copy,dependsOn:'compileJava'){ copy{ diff --git a/build.third_step5-jdk11.gradle b/build.third_step5-jdk11.gradle index c67d666c2..e43f59fa7 100644 --- a/build.third_step5-jdk11.gradle +++ b/build.third_step5-jdk11.gradle @@ -58,16 +58,13 @@ dependencies{ //指明无法编译文件所在路径 -def dataContent ={def dir -> - copySpec{ - from ("${dir}"){ - exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html' - } - } - -} - - +def dataContent = { def dir -> + copySpec{ + from ("${dir}"){ + exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html' + } + } +} as Object task copyFiles(type:Copy,dependsOn:'compileJava'){ copy{ diff --git a/build.third_step6-jdk11.gradle b/build.third_step6-jdk11.gradle index 06b14308f..a26ad4da9 100644 --- a/build.third_step6-jdk11.gradle +++ b/build.third_step6-jdk11.gradle @@ -56,16 +56,13 @@ dependencies{ } //指明无法编译文件所在路径 -def dataContent ={def dir -> - copySpec{ - from ("${dir}"){ - exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html' - } - } - -} - - +def dataContent = { def dir -> + copySpec{ + from ("${dir}"){ + exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html' + } + } +} as Object task copyFiles(type:Copy,dependsOn:'compileJava'){ copy{ diff --git a/build.third_step7-jdk11.gradle b/build.third_step7-jdk11.gradle index f6a9d3a4d..21985c595 100644 --- a/build.third_step7-jdk11.gradle +++ b/build.third_step7-jdk11.gradle @@ -54,16 +54,13 @@ dependencies{ } //指明无法编译文件所在路径 -def dataContent ={def dir -> - copySpec{ - from ("${dir}"){ - exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html' - } - } - -} - - +def dataContent = { def dir -> + copySpec{ + from ("${dir}"){ + exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html' + } + } +} as Object task copyFiles(type:Copy,dependsOn:'compileJava'){ copy{ diff --git a/build.third_step8-jdk11.gradle b/build.third_step8-jdk11.gradle index 290a2341a..5d7d592a0 100644 --- a/build.third_step8-jdk11.gradle +++ b/build.third_step8-jdk11.gradle @@ -54,16 +54,13 @@ dependencies{ } //指明无法编译文件所在路径 -def dataContent ={def dir -> - copySpec{ - from ("${dir}"){ - exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html' - } - } - -} - - +def dataContent = { def dir -> + copySpec{ + from ("${dir}"){ + exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html' + } + } +} as Object task copyFiles(type:Copy,dependsOn:'compileJava'){ copy{