root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Simplify Gradle's build settings 

See gh-19619
This commit is contained in:
Vedran Pavic 2020-01-10 20:08:31 +01:00 committed by Andy Wilkinson
parent e8c4a8590f
commit 57b7dfc730
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buildSrc/settings.gradle
View File

@ -13,4 +13,4 @@ pluginManagement {
} }
} }
apply from: new File(settingsDir, '../gradle/build-cache-settings.gradle') apply from: "$settingsDir/../gradle/build-cache-settings.gradle"

6
settings.gradle
View File

@ -32,7 +32,7 @@ gradleEnterprise {
} }
} }
apply from: new File(settingsDir, 'gradle/build-cache-settings.gradle') apply from: "$settingsDir/gradle/build-cache-settings.gradle"
rootProject.name='spring-boot-build' rootProject.name='spring-boot-build'
@ -62,10 +62,10 @@ include 'spring-boot-tests:spring-boot-integration-tests:spring-boot-configurati
include 'spring-boot-tests:spring-boot-integration-tests:spring-boot-launch-script-tests' include 'spring-boot-tests:spring-boot-integration-tests:spring-boot-launch-script-tests'
include 'spring-boot-tests:spring-boot-integration-tests:spring-boot-server-tests' include 'spring-boot-tests:spring-boot-integration-tests:spring-boot-server-tests'
new File("$rootDir/spring-boot-project/spring-boot-starters").eachFileMatch(groovy.io.FileType.DIRECTORIES, ~/spring-boot-starter.*/) { file("$rootDir/spring-boot-project/spring-boot-starters").eachDirMatch(~/spring-boot-starter.*/) {
include "spring-boot-project:spring-boot-starters:$it.name" include "spring-boot-project:spring-boot-starters:$it.name"
} }
new File("$rootDir/spring-boot-tests/spring-boot-smoke-tests").eachFileMatch(groovy.io.FileType.DIRECTORIES, ~/spring-boot-smoke-test.*/) { file("$rootDir/spring-boot-tests/spring-boot-smoke-tests").eachDirMatch(~/spring-boot-smoke-test.*/) {
include "spring-boot-tests:spring-boot-smoke-tests:$it.name" include "spring-boot-tests:spring-boot-smoke-tests:$it.name"
} }