Browse Source

Merge pull request #353 in CORE/base-third from ~ZHOUPING/base-third:research/10.0 to research/10.0

* commit 'a06c23df11bbcf77ac6ec43c1467f889ba8cd649':
  KERNEL-1298 FineThird支持JDK11
research/10.0
zhouping 5 years ago
parent
commit
7566e9410d
  1. 17
      build.third_step1-jdk11.gradle
  2. 17
      build.third_step2-jdk11.gradle
  3. 17
      build.third_step3-jdk11.gradle
  4. 17
      build.third_step4-jdk11.gradle
  5. 17
      build.third_step5-jdk11.gradle
  6. 17
      build.third_step6-jdk11.gradle
  7. 17
      build.third_step7-jdk11.gradle
  8. 17
      build.third_step8-jdk11.gradle

17
build.third_step1-jdk11.gradle

@ -125,16 +125,13 @@ dependencies{
} }
// //
def dataContent ={def dir -> def dataContent = { def dir ->
copySpec{ copySpec{
from ("${dir}"){ from ("${dir}"){
exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html' exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html'
} }
} }
} as Object
}
task copyFiles(type:Copy,dependsOn:'compileJava'){ task copyFiles(type:Copy,dependsOn:'compileJava'){
copy{ copy{

17
build.third_step2-jdk11.gradle

@ -90,16 +90,13 @@ dependencies{
} }
// //
def dataContent ={def dir -> def dataContent = { def dir ->
copySpec{ copySpec{
from ("${dir}"){ from ("${dir}"){
exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html' exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html'
} }
} }
} as Object
}
task copyFiles(type:Copy,dependsOn:'compileJava'){ task copyFiles(type:Copy,dependsOn:'compileJava'){
copy{ copy{

17
build.third_step3-jdk11.gradle

@ -62,16 +62,13 @@ dependencies{
} }
// //
def dataContent ={def dir -> def dataContent = { def dir ->
copySpec{ copySpec{
from ("${dir}"){ from ("${dir}"){
exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html' exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html'
} }
} }
} as Object
}
task copyFiles(type:Copy,dependsOn:'compileJava'){ task copyFiles(type:Copy,dependsOn:'compileJava'){
copy{ copy{

17
build.third_step4-jdk11.gradle

@ -65,16 +65,13 @@ dependencies{
// //
def dataContent ={def dir -> def dataContent = { def dir ->
copySpec{ copySpec{
from ("${dir}"){ from ("${dir}"){
exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html' exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html'
} }
} }
} as Object
}
task copyFiles(type:Copy,dependsOn:'compileJava'){ task copyFiles(type:Copy,dependsOn:'compileJava'){
copy{ copy{

17
build.third_step5-jdk11.gradle

@ -58,16 +58,13 @@ dependencies{
// //
def dataContent ={def dir -> def dataContent = { def dir ->
copySpec{ copySpec{
from ("${dir}"){ from ("${dir}"){
exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html' exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html'
} }
} }
} as Object
}
task copyFiles(type:Copy,dependsOn:'compileJava'){ task copyFiles(type:Copy,dependsOn:'compileJava'){
copy{ copy{

17
build.third_step6-jdk11.gradle

@ -56,16 +56,13 @@ dependencies{
} }
// //
def dataContent ={def dir -> def dataContent = { def dir ->
copySpec{ copySpec{
from ("${dir}"){ from ("${dir}"){
exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html' exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html'
} }
} }
} as Object
}
task copyFiles(type:Copy,dependsOn:'compileJava'){ task copyFiles(type:Copy,dependsOn:'compileJava'){
copy{ copy{

17
build.third_step7-jdk11.gradle

@ -54,16 +54,13 @@ dependencies{
} }
// //
def dataContent ={def dir -> def dataContent = { def dir ->
copySpec{ copySpec{
from ("${dir}"){ from ("${dir}"){
exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html' exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html'
} }
} }
} as Object
}
task copyFiles(type:Copy,dependsOn:'compileJava'){ task copyFiles(type:Copy,dependsOn:'compileJava'){
copy{ copy{

17
build.third_step8-jdk11.gradle

@ -54,16 +54,13 @@ dependencies{
} }
// //
def dataContent ={def dir -> def dataContent = { def dir ->
copySpec{ copySpec{
from ("${dir}"){ from ("${dir}"){
exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html' exclude '**/.setting/**','.classpath','.project','**/*.java','**/*.db','**/*.g','**/package.html'
} }
} }
} as Object
}
task copyFiles(type:Copy,dependsOn:'compileJava'){ task copyFiles(type:Copy,dependsOn:'compileJava'){
copy{ copy{

Loading…
Cancel
Save