82 lines
3.2 KiB
Diff
82 lines
3.2 KiB
Diff
From d4c851fb400e9c1f7077c32bd80c943f80eed828 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/17] 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 | 3 +--
|
|
5 files changed, 2 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/build.gradle b/build.gradle
|
|
index dc302c5fccf..0eb2008a845 100644
|
|
--- a/build.gradle
|
|
+++ b/build.gradle
|
|
@@ -151,7 +151,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 00282e6f0f2..f23610aa754 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 c388099a3d3..4e7164fb71c 100644
|
|
--- a/subprojects/testing-native/testing-native.gradle
|
|
+++ b/subprojects/testing-native/testing-native.gradle
|
|
@@ -19,8 +19,7 @@ dependencies {
|
|
compile project(':platformNative')
|
|
compile project(':languageNative')
|
|
compile project(':testingBase')
|
|
-
|
|
- integTestRuntime project(':ideNative')
|
|
+ compile project(':testingJvm')
|
|
}
|
|
|
|
useTestFixtures()
|
|
--
|
|
2.17.2
|
|
|