81 lines
3.1 KiB
Diff
81 lines
3.1 KiB
Diff
|
From bdc6523581ec8cd0653924b60365f38cb858887b Mon Sep 17 00:00:00 2001
|
||
|
|
From: Michael Simacek <msimacek@redhat.com>
|
||
|
|
Date: Mon, 2 Oct 2017 17:34:01 +0300
|
||
|
|
Subject: [PATCH 14/18] Disable ideNative module
|
||
|
|
|
||
|
|
---
|
||
|
|
build.gradle | 2 +-
|
||
|
|
settings.gradle | 1 -
|
||
|
|
subprojects/language-native/language-native.gradle | 2 --
|
||
|
|
subprojects/platform-native/platform-native.gradle | 2 --
|
||
|
|
subprojects/testing-native/testing-native.gradle | 2 --
|
||
|
|
5 files changed, 1 insertion(+), 8 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/build.gradle b/build.gradle
|
||
|
|
index 6fcefe67b8f..cc2ce3412ef 100644
|
||
|
|
--- a/build.gradle
|
||
|
|
+++ b/build.gradle
|
||
|
|
@@ -148,7 +148,7 @@ ext {
|
||
|
|
'ide', 'announce', 'scala', 'signing', 'ear', 'javascript', 'buildComparison',
|
||
|
|
'diagnostics', 'reporting', 'publish', 'ivy', 'jacoco', 'buildInit', 'platformBase',
|
||
|
|
'platformJvm', 'languageJvm', 'languageJava', 'languageGroovy', 'languageScala',
|
||
|
|
- 'platformNative', 'platformPlay', 'idePlay', 'languageNative', 'ideNative', 'testingBase',
|
||
|
|
+ 'platformNative', 'platformPlay', 'idePlay', 'languageNative', 'testingBase',
|
||
|
|
'testingNative', 'testingJvm', 'pluginDevelopment', 'pluginUse', 'resourcesHttp',
|
||
|
|
'resourcesSftp', 'resourcesS3', 'resourcesGcs', 'compositeBuilds', 'buildCacheHttp'
|
||
|
|
].collect { project(it) }
|
||
|
|
diff --git a/settings.gradle b/settings.gradle
|
||
|
|
index ab5013aa5fc..3178a38aba9 100644
|
||
|
|
--- a/settings.gradle
|
||
|
|
+++ b/settings.gradle
|
||
|
|
@@ -36,7 +36,6 @@ include 'resourcesSftp'
|
||
|
|
include 'plugins'
|
||
|
|
include 'scala'
|
||
|
|
include 'ide'
|
||
|
|
-include 'ideNative'
|
||
|
|
include 'idePlay'
|
||
|
|
include 'osgi'
|
||
|
|
include 'maven'
|
||
|
|
diff --git a/subprojects/language-native/language-native.gradle b/subprojects/language-native/language-native.gradle
|
||
|
|
index 10b75863c5c..0a9b6507160 100644
|
||
|
|
--- a/subprojects/language-native/language-native.gradle
|
||
|
|
+++ b/subprojects/language-native/language-native.gradle
|
||
|
|
@@ -18,8 +18,6 @@ dependencies {
|
||
|
|
compile project(':core')
|
||
|
|
compile project(':platformNative')
|
||
|
|
compile project(':maven')
|
||
|
|
-
|
||
|
|
- integTestRuntime project(":ideNative")
|
||
|
|
}
|
||
|
|
|
||
|
|
useTestFixtures()
|
||
|
|
diff --git a/subprojects/platform-native/platform-native.gradle b/subprojects/platform-native/platform-native.gradle
|
||
|
|
index 63231a88d6c..236deeeda87 100644
|
||
|
|
--- a/subprojects/platform-native/platform-native.gradle
|
||
|
|
+++ b/subprojects/platform-native/platform-native.gradle
|
||
|
|
@@ -22,8 +22,6 @@ dependencies {
|
||
|
|
compile project(':diagnostics')
|
||
|
|
|
||
|
|
integTestRuntime project(':maven')
|
||
|
|
- // Required to test visual studio project file generation for generated sources
|
||
|
|
- integTestRuntime project(':ideNative')
|
||
|
|
|
||
|
|
testFixturesCompile project(':internalIntegTesting')
|
||
|
|
}
|
||
|
|
diff --git a/subprojects/testing-native/testing-native.gradle b/subprojects/testing-native/testing-native.gradle
|
||
|
|
index 3741f03b555..ba8c94af684 100644
|
||
|
|
--- a/subprojects/testing-native/testing-native.gradle
|
||
|
|
+++ b/subprojects/testing-native/testing-native.gradle
|
||
|
|
@@ -20,8 +20,6 @@ dependencies {
|
||
|
|
compile project(':languageNative')
|
||
|
|
compile project(':testingBase')
|
||
|
|
compile project(':testingJvm')
|
||
|
|
-
|
||
|
|
- integTestRuntime project(':ideNative')
|
||
|
|
}
|
||
|
|
|
||
|
|
useTestFixtures()
|
||
|
|
--
|
||
|
|
2.20.1
|
||
|
|
|