From 57b7dfc730fbbe8c3019ac7563b51dcd06738580 Mon Sep 17 00:00:00 2001 From: Vedran Pavic Date: Fri, 10 Jan 2020 20:08:31 +0100 Subject: [PATCH] Simplify Gradle's build settings See gh-19619 --- buildSrc/settings.gradle | 2 +- settings.gradle | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/buildSrc/settings.gradle b/buildSrc/settings.gradle index ce6d3a43da..af53b4e9c6 100644 --- a/buildSrc/settings.gradle +++ b/buildSrc/settings.gradle @@ -13,4 +13,4 @@ pluginManagement { } } -apply from: new File(settingsDir, '../gradle/build-cache-settings.gradle') +apply from: "$settingsDir/../gradle/build-cache-settings.gradle" diff --git a/settings.gradle b/settings.gradle index 43d7fd1cfb..84838efc30 100644 --- a/settings.gradle +++ b/settings.gradle @@ -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' @@ -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-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" } -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" }