MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

code cleanup by review IDEA-CR-44495

Browse Source
This commit is contained in:
Nikita Skvortsov
2019-03-06 13:57:29 +03:00
parent f00e91891f
commit 768fcde6f1
3 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleCompositeImportingTest.java
-7
View File
@@ -391,7 +391,6 @@ public class GradleCompositeImportingTest extends GradleImportingTestCase {
createProjectSubFile("project-a/build.gradle", "");
importProject(new GradleBuildScriptBuilderEx()
.withIdeaPlugin()
.addPostfix("apply plugin: 'java-library'",
"group = 'myGroup'",
"version = '1.0-SNAPSHOT'",
@@ -425,9 +424,6 @@ public class GradleCompositeImportingTest extends GradleImportingTestCase {
.addPostfix(
"group = 'myGroup'",
"version = '1.0-SNAPSHOT'",
"repositories {",
" mavenCentral()",
"}",
"sourceSets {",
" util {",
" java.srcDir 'src/util/java'",
@@ -457,9 +453,6 @@ public class GradleCompositeImportingTest extends GradleImportingTestCase {
.withJavaPlugin()
.addPostfix("group = 'myGroup'",
"version = '1.0-SNAPSHOT'",
"repositories {",
" mavenCentral()",
"}",
"dependencies {",
" compile group: 'myGroup', name: 'project-a', version: '1.0-SNAPSHOT'",
"}"
plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleDependenciesImportingTest.java
-2
View File
@@ -885,9 +885,7 @@ public class GradleDependenciesImportingTest extends GradleImportingTestCase {
}
@Test
//@TargetVersions("5.2+")
public void testDependencyOnDefaultConfigurationWithAdditionalArtifact() throws Exception {
//GradleSystemSettings.getInstance().setGradleVmOptions("-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005");
createSettingsFile("include 'project1', 'project2'");
createProjectSubFile("project1/build.gradle",
new GradleBuildScriptBuilderEx()
plugins/gradle/tooling-extension-impl/testSources/org/jetbrains/plugins/gradle/tooling/builder/AbstractModelBuilderTest.java
+2 -6
View File
@@ -32,12 +32,8 @@ import org.gradle.tooling.model.DomainObjectSet;
import org.gradle.tooling.model.idea.IdeaModule;
import org.gradle.util.GradleVersion;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.plugins.gradle.model.BuildScriptClasspathModel;
import org.jetbrains.plugins.gradle.model.ClasspathEntryModel;
import org.jetbrains.plugins.gradle.model.ExternalProject;
import org.jetbrains.plugins.gradle.model.ProjectImportAction;
import org.jetbrains.plugins.gradle.model.*;
import org.jetbrains.plugins.gradle.service.execution.GradleExecutionHelper;
import org.jetbrains.plugins.gradle.model.ClassSetProjectImportExtraModelProvider;
import org.jetbrains.plugins.gradle.tooling.VersionMatcherRule;
import org.jetbrains.plugins.gradle.util.GradleConstants;
import org.junit.After;
@@ -72,7 +68,7 @@ public abstract class AbstractModelBuilderTest {
{"2.6"}, /*{"2.7"}, {"2.8"}, {"2.9"}, {"2.10"}, {"2.11"}, {"2.12"}, {"2.13"}, */{"2.14.1"},
{"3.0"}, /*{"3.1"}, {"3.2"}, {"3.3"}, {"3.4"},*/ {"3.5"},
{"4.0"}, /*{"4.1"}, {"4.2"}, {"4.3"}, {"4.4"}, {"4.5.1"}, {"4.6"}, {"4.7"}, {"4.8"}, {"4.9"},*/ {"4.10.3"},
{"5.0"}, /*{"5.1"},*/ {"5.2.1"}
{"5.0"}, /*{"5.1"},*/ {"5.2.1"}, {"5.3-rc-1"}
};
public static final String BASE_GRADLE_VERSION = String.valueOf(SUPPORTED_GRADLE_VERSIONS[SUPPORTED_GRADLE_VERSIONS.length - 1][0]);