From cfdfdb199a7a72b8ca83d76ddc7241b34c1e9d05 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Mon, 2 Oct 2017 17:31:44 +0300 Subject: [PATCH 12/17] Disable patching of external modules --- build.gradle | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/build.gradle b/build.gradle index 92233aef8c9..dc302c5fccf 100644 --- a/build.gradle +++ b/build.gradle @@ -252,18 +252,11 @@ configurations { } } -def patchedExternalModulesDir = new File(buildDir, "external/files") -def patchedExternalModules = files({ -> fileTree(patchedExternalModulesDir).files.sort() }) -patchedExternalModules.builtBy 'patchExternalModules' - dependencies { - externalModules "org.gradle:gradle-kotlin-dsl:${versions.gradle_kotlin_dsl}" - externalModules "org.gradle:gradle-kotlin-dsl-tooling-builders:${versions.gradle_kotlin_dsl}" coreRuntime project(':launcher') coreRuntime project(':runtimeApiInfo') runtime project(':wrapper') runtime project(":installationBeacon") - runtime patchedExternalModules gradlePlugins pluginProjects gradlePlugins implementationPluginProjects gradlePlugins project(':workers') @@ -273,18 +266,10 @@ dependencies { coreRuntimeExtensions project(':dependencyManagement') //See: DynamicModulesClassPathProvider.GRADLE_EXTENSION_MODULES coreRuntimeExtensions project(':pluginUse') coreRuntimeExtensions project(':workers') - coreRuntimeExtensions patchedExternalModules } import org.gradle.modules.PatchExternalModules -task patchExternalModules(type: PatchExternalModules) { - allModules = configurations.externalModulesRuntime - coreModules = configurations.coreRuntime - modulesToPatch = configurations.externalModules - destination = patchedExternalModulesDir -} - task verifyIsProductionBuildEnvironment { doLast { assert javaVersion.java8: -- 2.17.2