mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
Gradle: upgrade Tooling API from 2.13 up to 2.14.1
This commit is contained in:
Vladislav.Soroka
Generated
+26
-22
@@ -1,31 +1,35 @@
|
||||
<component name="libraryTable">
|
||||
<library name="Gradle">
|
||||
<CLASSES>
|
||||
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-tooling-api-2.13.jar!/" />
|
||||
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-core-2.13.jar!/" />
|
||||
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-messaging-2.13.jar!/" />
|
||||
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-model-core-2.13.jar!/" />
|
||||
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-model-groovy-2.13.jar!/" />
|
||||
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-wrapper-2.13.jar!/" />
|
||||
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-base-services-2.13.jar!/" />
|
||||
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-base-services-groovy-2.13.jar!/" />
|
||||
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-native-2.13.jar!/" />
|
||||
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-resources-2.13.jar!/" />
|
||||
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-cli-2.13.jar!/" />
|
||||
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-tooling-api-2.14.1.jar!/" />
|
||||
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-core-2.14.1.jar!/" />
|
||||
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-messaging-2.14.1.jar!/" />
|
||||
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-model-core-2.14.1.jar!/" />
|
||||
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-model-groovy-2.14.1.jar!/" />
|
||||
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-wrapper-2.14.1.jar!/" />
|
||||
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-base-services-2.14.1.jar!/" />
|
||||
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-base-services-groovy-2.14.1.jar!/" />
|
||||
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-process-services-2.14.1.jar!/" />
|
||||
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-native-2.14.1.jar!/" />
|
||||
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-resources-2.14.1.jar!/" />
|
||||
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-cli-2.14.1.jar!/" />
|
||||
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-logging-2.14.1.jar!/" />
|
||||
</CLASSES>
|
||||
<JAVADOC />
|
||||
<SOURCES>
|
||||
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-2.13-src.zip!/gradle-2.13/subprojects/tooling-api/src/main/java" />
|
||||
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-2.13-src.zip!/gradle-2.13/subprojects/core/src/main/groovy" />
|
||||
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-2.13-src.zip!/gradle-2.13/subprojects/model-core/src/main/java" />
|
||||
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-2.13-src.zip!/gradle-2.13/subprojects/model-groovy/src/main/java" />
|
||||
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-2.13-src.zip!/gradle-2.13/subprojects/messaging/src/main/java" />
|
||||
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-2.13-src.zip!/gradle-2.13/subprojects/wrapper/src/main/java" />
|
||||
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-2.13-src.zip!/gradle-2.13/subprojects/base-services/src/main/java" />
|
||||
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-2.13-src.zip!/gradle-2.13/subprojects/base-services-groovy/src/main/groovy" />
|
||||
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-2.13-src.zip!/gradle-2.13/subprojects/native/src/main/java" />
|
||||
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-2.13-src.zip!/gradle-2.13/subprojects/resources/src/main/java" />
|
||||
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-2.13-src.zip!/gradle-2.13/subprojects/cli/src/main/java" />
|
||||
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-2.14.1-src.zip!/gradle-2.14.1/subprojects/tooling-api/src/main/java" />
|
||||
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-2.14.1-src.zip!/gradle-2.14.1/subprojects/core/src/main/java" />
|
||||
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-2.14.1-src.zip!/gradle-2.14.1/subprojects/model-core/src/main/java" />
|
||||
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-2.14.1-src.zip!/gradle-2.14.1/subprojects/model-groovy/src/main/java" />
|
||||
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-2.14.1-src.zip!/gradle-2.14.1/subprojects/messaging/src/main/java" />
|
||||
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-2.14.1-src.zip!/gradle-2.14.1/subprojects/wrapper/src/main/java" />
|
||||
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-2.14.1-src.zip!/gradle-2.14.1/subprojects/base-services/src/main/java" />
|
||||
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-2.14.1-src.zip!/gradle-2.14.1/subprojects/base-services-groovy/src/main/java" />
|
||||
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-2.14.1-src.zip!/gradle-2.14.1/subprojects/process-services/src/main/java" />
|
||||
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-2.14.1-src.zip!/gradle-2.14.1/subprojects/native/src/main/java" />
|
||||
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-2.14.1-src.zip!/gradle-2.14.1/subprojects/resources/src/main/java" />
|
||||
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-2.14.1-src.zip!/gradle-2.14.1/subprojects/cli/src/main/java" />
|
||||
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-2.14.1-src.zip!/gradle-2.14.1/subprojects/logging/src/main/java" />
|
||||
</SOURCES>
|
||||
</library>
|
||||
</component>
|
||||
@@ -125,9 +125,9 @@ class CommunityLibraryLicenses {
|
||||
new LibraryLicense(name: "Gherkin", libraryName: "Gherkin", version: "2.12.2", license: "MIT",
|
||||
licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0.txt", url: "https://github.com/cucumber/gherkin"),
|
||||
new LibraryLicense(name: "Google Feedback", libraryName: "GoogleFeedback.jar", version: "", license: "TBD"),
|
||||
new LibraryLicense(name: "gradle-tooling-api-2.13.jar", version: "2.13", license: "Apache 2.0", url: "http://gradle.org/",
|
||||
new LibraryLicense(name: "gradle-tooling-api-2.14.1.jar", version: "2.14.1", license: "Apache 2.0", url: "http://gradle.org/",
|
||||
licenseUrl: "http://gradle.org/license"),
|
||||
new LibraryLicense(name: "Gradle", version: "2.13", license: "Apache 2.0", url: "http://gradle.org/",
|
||||
new LibraryLicense(name: "Gradle", version: "2.14.1", license: "Apache 2.0", url: "http://gradle.org/",
|
||||
licenseUrl: "http://gradle.org/license"),
|
||||
new LibraryLicense(name: "GradleGuava", version: "14.0.1", license: "Apache 2.0", url: "http://code.google.com/p/guava-libraries/",
|
||||
licenseUrl: "http://apache.org/licenses/LICENSE-2.0"),
|
||||
|
||||
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
+1
-1
@@ -9,7 +9,7 @@ task wrapper(type: Wrapper) {
|
||||
#if (${GRADLE_VERSION} && ${GRADLE_VERSION} != "")
|
||||
gradleVersion = '${GRADLE_VERSION}'
|
||||
#else
|
||||
gradleVersion = '2.3'
|
||||
gradleVersion = '2.14.1'
|
||||
#end
|
||||
distributionUrl = "https://services.gradle.org/distributions/gradle-$gradleVersion-all.zip"
|
||||
}
|
||||
|
||||
+2
-2
@@ -20,8 +20,8 @@ import org.gradle.internal.Factory;
|
||||
import org.gradle.internal.UncheckedException;
|
||||
import org.gradle.internal.classpath.ClassPath;
|
||||
import org.gradle.internal.classpath.DefaultClassPath;
|
||||
import org.gradle.logging.ProgressLogger;
|
||||
import org.gradle.logging.ProgressLoggerFactory;
|
||||
import org.gradle.internal.logging.progress.ProgressLogger;
|
||||
import org.gradle.internal.logging.progress.ProgressLoggerFactory;
|
||||
import org.gradle.tooling.BuildCancelledException;
|
||||
import org.gradle.tooling.GradleConnectionException;
|
||||
import org.gradle.tooling.internal.consumer.Distribution;
|
||||
|
||||
BIN
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
@@ -25,24 +25,24 @@
|
||||
<orderEntry type="module-library" scope="PROVIDED">
|
||||
<library name="GradleToolingExtension">
|
||||
<CLASSES>
|
||||
<root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-build-init-2.13.jar!/" />
|
||||
<root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-ide-2.13.jar!/" />
|
||||
<root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-language-java-2.13.jar!/" />
|
||||
<root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-language-jvm-2.13.jar!/" />
|
||||
<root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-platform-base-2.13.jar!/" />
|
||||
<root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-platform-jvm-2.13.jar!/" />
|
||||
<root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-plugins-2.13.jar!/" />
|
||||
<root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-testing-base-2.13.jar!/" />
|
||||
<root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-testing-jvm-2.13.jar!/" />
|
||||
<root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-scala-2.13.jar!/" />
|
||||
<root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-language-scala-2.13.jar!/" />
|
||||
<root url="jar://$MODULE_DIR$/lib/gradle-reporting-2.13.jar!/" />
|
||||
<root url="jar://$MODULE_DIR$/lib/gradle-ear-2.13.jar!/" />
|
||||
<root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-build-init-2.14.1.jar!/" />
|
||||
<root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-ide-2.14.1.jar!/" />
|
||||
<root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-language-java-2.14.1.jar!/" />
|
||||
<root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-language-jvm-2.14.1.jar!/" />
|
||||
<root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-platform-base-2.14.1.jar!/" />
|
||||
<root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-platform-jvm-2.14.1.jar!/" />
|
||||
<root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-plugins-2.14.1.jar!/" />
|
||||
<root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-testing-base-2.14.1.jar!/" />
|
||||
<root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-testing-jvm-2.14.1.jar!/" />
|
||||
<root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-scala-2.14.1.jar!/" />
|
||||
<root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-language-scala-2.14.1.jar!/" />
|
||||
<root url="jar://$MODULE_DIR$/lib/gradle-reporting-2.14.1.jar!/" />
|
||||
<root url="jar://$MODULE_DIR$/lib/gradle-ear-2.14.1.jar!/" />
|
||||
</CLASSES>
|
||||
<JAVADOC />
|
||||
<SOURCES>
|
||||
<root url="jar://$MODULE_DIR$/../lib/gradle-2.13-src.zip!/gradle-2.13/subprojects/tooling-api/src/main/java" />
|
||||
<root url="jar://$MODULE_DIR$/../lib/gradle-2.13-src.zip!/gradle-2.13/subprojects/ear/src/main/groovy" />
|
||||
<root url="jar://$MODULE_DIR$/../lib/gradle-2.14.1-src.zip!/gradle-2.14.1/subprojects/tooling-api/src/main/java" />
|
||||
<root url="jar://$MODULE_DIR$/../lib/gradle-2.14.1-src.zip!/gradle-2.14.1/subprojects/ear/src/main/groovy" />
|
||||
</SOURCES>
|
||||
</library>
|
||||
</orderEntry>
|
||||
|
||||
Binary file not shown.
Binary file not shown.
BIN
Binary file not shown.
-87
@@ -1,87 +0,0 @@
|
||||
/*
|
||||
* Copyright 2000-2014 JetBrains s.r.o.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package org.jetbrains.plugins.gradle.tooling.internal;
|
||||
|
||||
import org.gradle.tooling.model.DomainObjectSet;
|
||||
import org.gradle.tooling.model.GradleProject;
|
||||
import org.gradle.tooling.model.HierarchicalElement;
|
||||
import org.gradle.tooling.model.UnsupportedMethodException;
|
||||
import org.gradle.tooling.model.idea.*;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* @author Vladislav.Soroka
|
||||
* @since 11/25/13
|
||||
*/
|
||||
public class StubIdeaModule implements IdeaModule, Serializable {
|
||||
|
||||
private final String name;
|
||||
|
||||
public StubIdeaModule(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
@Override
|
||||
public IdeaJavaLanguageSettings getJavaLanguageSettings() throws UnsupportedMethodException {
|
||||
throw new UnsupportedOperationException();
|
||||
}
|
||||
|
||||
@Override
|
||||
public DomainObjectSet<? extends IdeaContentRoot> getContentRoots() {
|
||||
throw new UnsupportedOperationException();
|
||||
}
|
||||
|
||||
@Override
|
||||
public GradleProject getGradleProject() {
|
||||
throw new UnsupportedOperationException();
|
||||
}
|
||||
|
||||
@Override
|
||||
public IdeaProject getParent() {
|
||||
throw new UnsupportedOperationException();
|
||||
}
|
||||
|
||||
@Override
|
||||
public DomainObjectSet<? extends HierarchicalElement> getChildren() {
|
||||
throw new UnsupportedOperationException();
|
||||
}
|
||||
|
||||
@Override
|
||||
public IdeaProject getProject() {
|
||||
throw new UnsupportedOperationException();
|
||||
}
|
||||
|
||||
@Override
|
||||
public IdeaCompilerOutput getCompilerOutput() {
|
||||
throw new UnsupportedOperationException();
|
||||
}
|
||||
|
||||
@Override
|
||||
public DomainObjectSet<? extends IdeaDependency> getDependencies() {
|
||||
throw new UnsupportedOperationException();
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getDescription() {
|
||||
throw new UnsupportedOperationException();
|
||||
}
|
||||
}
|
||||
+1
-1
@@ -69,7 +69,7 @@ public abstract class AbstractModelBuilderTest {
|
||||
|
||||
public static final Object[][] SUPPORTED_GRADLE_VERSIONS = {
|
||||
{"1.9"}, /*{"1.10"}, {"1.11"},*/ {"1.12"},
|
||||
{"2.0"}, /*{"2.1"}, {"2.2"} , {"2.3"}, {"2.4"}, */{"2.5"}, /*{"2.6"}, {"2.7"}, {"2.8"},*/ {"2.9"}, /*{"2.10"}, {"2.11"}, {"2.12"},*/ {"2.13"}
|
||||
{"2.0"}, /*{"2.1"}, {"2.2"} , {"2.3"}, {"2.4"}, */{"2.5"}, /*{"2.6"}, {"2.7"}, {"2.8"},*/ {"2.9"}, /*{"2.10"}, {"2.11"}, {"2.12"}, {"2.13"}, */{"2.14.1"}
|
||||
};
|
||||
public static final String BASE_GRADLE_VERSION = String.valueOf(SUPPORTED_GRADLE_VERSIONS[SUPPORTED_GRADLE_VERSIONS.length - 1][0]);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user