gradle/0012-Disable-patching-of-external-modules.patch

55 lines
1.9 KiB
Diff
Raw Normal View History

2020-09-04 14:41:37 +08:00
From cfdfdb199a7a72b8ca83d76ddc7241b34c1e9d05 Mon Sep 17 00:00:00 2001
2020-03-10 17:42:39 +08:00
From: Michael Simacek <msimacek@redhat.com>
Date: Mon, 2 Oct 2017 17:31:44 +0300
2020-09-04 14:41:37 +08:00
Subject: [PATCH 12/17] Disable patching of external modules
2020-03-10 17:42:39 +08:00
---
build.gradle | 15 ---------------
1 file changed, 15 deletions(-)
diff --git a/build.gradle b/build.gradle
2020-09-04 14:41:37 +08:00
index 92233aef8c9..dc302c5fccf 100644
2020-03-10 17:42:39 +08:00
--- a/build.gradle
+++ b/build.gradle
2020-09-04 14:41:37 +08:00
@@ -252,18 +252,11 @@ configurations {
2020-03-10 17:42:39 +08:00
}
}
-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')
2020-09-04 14:41:37 +08:00
@@ -273,18 +266,10 @@ dependencies {
2020-03-10 17:42:39 +08:00
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 {
2020-09-04 14:41:37 +08:00
assert javaVersion.java8:
2020-03-10 17:42:39 +08:00
--
2020-09-04 14:41:37 +08:00
2.17.2
2020-03-10 17:42:39 +08:00