Gradle: upgrade Tooling API from 3.1 up to 3.3

This commit is contained in:
Vladislav.Soroka
2017-02-17 01:10:14 +03:00
parent fe5608addc
commit 9033fb1292
80 changed files with 67 additions and 59 deletions
+25 -26
View File
@@ -1,35 +1,34 @@
<component name="libraryTable">
<library name="Gradle">
<CLASSES>
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-tooling-api-3.1.jar!/" />
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-core-3.1.jar!/" />
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-messaging-3.1.jar!/" />
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-model-core-3.1.jar!/" />
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-model-groovy-3.1.jar!/" />
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-wrapper-3.1.jar!/" />
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-base-services-3.1.jar!/" />
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-base-services-groovy-3.1.jar!/" />
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-process-services-3.1.jar!/" />
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-native-3.1.jar!/" />
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-resources-3.1.jar!/" />
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-cli-3.1.jar!/" />
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-logging-3.1.jar!/" />
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-tooling-api-3.3.jar!/" />
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-core-3.3.jar!/" />
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-messaging-3.3.jar!/" />
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-model-core-3.3.jar!/" />
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-model-groovy-3.3.jar!/" />
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-wrapper-3.3.jar!/" />
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-base-services-3.3.jar!/" />
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-base-services-groovy-3.3.jar!/" />
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-process-services-3.3.jar!/" />
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-resources-3.3.jar!/" />
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-cli-3.3.jar!/" />
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-logging-3.3.jar!/" />
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-version-info-3.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-3.1-src.zip!/gradle-3.1/subprojects/tooling-api/src/main/java" />
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-3.1-src.zip!/gradle-3.1/subprojects/core/src/main/java" />
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-3.1-src.zip!/gradle-3.1/subprojects/model-core/src/main/java" />
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-3.1-src.zip!/gradle-3.1/subprojects/model-groovy/src/main/java" />
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-3.1-src.zip!/gradle-3.1/subprojects/messaging/src/main/java" />
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-3.1-src.zip!/gradle-3.1/subprojects/wrapper/src/main/java" />
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-3.1-src.zip!/gradle-3.1/subprojects/base-services/src/main/java" />
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-3.1-src.zip!/gradle-3.1/subprojects/base-services-groovy/src/main/java" />
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-3.1-src.zip!/gradle-3.1/subprojects/process-services/src/main/java" />
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-3.1-src.zip!/gradle-3.1/subprojects/native/src/main/java" />
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-3.1-src.zip!/gradle-3.1/subprojects/resources/src/main/java" />
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-3.1-src.zip!/gradle-3.1/subprojects/cli/src/main/java" />
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-3.1-src.zip!/gradle-3.1/subprojects/logging/src/main/java" />
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-3.3-src.zip!/gradle-3.3/subprojects/tooling-api/src/main/java" />
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-3.3-src.zip!/gradle-3.3/subprojects/core/src/main/java" />
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-3.3-src.zip!/gradle-3.3/subprojects/model-core/src/main/java" />
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-3.3-src.zip!/gradle-3.3/subprojects/model-groovy/src/main/java" />
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-3.3-src.zip!/gradle-3.3/subprojects/messaging/src/main/java" />
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-3.3-src.zip!/gradle-3.3/subprojects/wrapper/src/main/java" />
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-3.3-src.zip!/gradle-3.3/subprojects/base-services/src/main/java" />
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-3.3-src.zip!/gradle-3.3/subprojects/base-services-groovy/src/main/java" />
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-3.3-src.zip!/gradle-3.3/subprojects/process-services/src/main/java" />
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-3.3-src.zip!/gradle-3.3/subprojects/resources/src/main/java" />
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-3.3-src.zip!/gradle-3.3/subprojects/cli/src/main/java" />
<root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-3.3-src.zip!/gradle-3.3/subprojects/logging/src/main/java" />
</SOURCES>
</library>
</component>
@@ -136,14 +136,13 @@ class CommunityLibraryLicenses {
new LibraryLicense(name: "Gluegen", libraryName: "gluegen-rt", license: "Creative Commons Attribution License",
url: "https://jogamp.org/gluegen/www/", licenseUrl: "http://creativecommons.org/licenses/by/3.0"),
new LibraryLicense(name: "Google Feedback", libraryName: "GoogleFeedback.jar", version: "", license: "TBD"),
new LibraryLicense(name: "gradle-tooling-api-3.1.jar", version: "3.1", license: "Apache 2.0", url: "http://gradle.org/",
new LibraryLicense(name: "gradle-tooling-api-3.3.jar", version: "3.3", license: "Apache 2.0", url: "http://gradle.org/",
licenseUrl: "http://gradle.org/license"),
new LibraryLicense(name: "Gradle", version: "3.1", license: "Apache 2.0", url: "http://gradle.org/",
new LibraryLicense(name: "Gradle", version: "3.3", 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/",
new LibraryLicense(name: "GradleGuava", version: "17.0", license: "Apache 2.0", url: "http://code.google.com/p/guava-libraries/",
licenseUrl: "http://apache.org/licenses/LICENSE-2.0"),
new LibraryLicense(name: "GradleJnaPosix", version: "1.0.3", license: "LGPL 2.1", url: "http://www.jruby.org/",
licenseUrl: "http://www.gnu.org/licenses/lgpl-2.1.txt"),
new LibraryLicense(name: "GradleNative", version: "3.3", license: "Apache 2.0", url: "http://gradle.org/", licenseUrl: "http://gradle.org/license"),
new LibraryLicense(name: "Groovy", version: "2.4.6", license: "Apache 2.0", url: "http://groovy-lang.org/"),
new LibraryLicense(name: "Gson", version: "2.2.4", libraryName: "gson", license: "Apache 2.0", url: "http://code.google.com/p/google-gson/"),
new LibraryLicense(name: "Guava", version: "19.0", license: "Apache 2.0", url: "http://code.google.com/p/guava-libraries/",
@@ -194,15 +194,6 @@ class CommunityRepositoryModules {
withModule("gradle-tooling-extension-impl")
withProjectLibrary("Kryo")
withProjectLibrary("Gradle")
//todo[nik] add these jars to some library instead?
withResource("lib/native-platform-freebsd-amd64-0.11.jar", "lib")
withResource("lib/native-platform-freebsd-i386-0.11.jar", "lib")
withResource("lib/native-platform-linux-amd64-0.11.jar", "lib")
withResource("lib/native-platform-linux-i386-0.11.jar", "lib")
withResource("lib/native-platform-osx-amd64-0.11.jar", "lib")
withResource("lib/native-platform-osx-i386-0.11.jar", "lib")
withResource("lib/native-platform-windows-amd64-0.11.jar", "lib")
withResource("lib/native-platform-windows-i386-0.11.jar", "lib")
},
plugin("junit") {
mainJarName = "idea-junit.jar"
+18 -2
View File
@@ -56,9 +56,25 @@
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="GradleJnaPosix">
<library name="GradleNative">
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/native-platform-0.11.jar!/" />
<root url="jar://$MODULE_DIR$/lib/gradle-native-3.3.jar!/" />
<root url="jar://$MODULE_DIR$/lib/native-platform-0.12.jar!/" />
<root url="jar://$MODULE_DIR$/lib/native-platform-freebsd-amd64-libcpp-0.12.jar!/" />
<root url="jar://$MODULE_DIR$/lib/native-platform-freebsd-amd64-libstdcpp-0.12.jar!/" />
<root url="jar://$MODULE_DIR$/lib/native-platform-freebsd-i386-libcpp-0.12.jar!/" />
<root url="jar://$MODULE_DIR$/lib/native-platform-freebsd-i386-libstdcpp-0.12.jar!/" />
<root url="jar://$MODULE_DIR$/lib/native-platform-linux-amd64-0.12.jar!/" />
<root url="jar://$MODULE_DIR$/lib/native-platform-linux-amd64-ncurses5-0.12.jar!/" />
<root url="jar://$MODULE_DIR$/lib/native-platform-linux-amd64-ncurses6-0.12.jar!/" />
<root url="jar://$MODULE_DIR$/lib/native-platform-linux-i386-0.12.jar!/" />
<root url="jar://$MODULE_DIR$/lib/native-platform-linux-i386-ncurses5-0.12.jar!/" />
<root url="jar://$MODULE_DIR$/lib/native-platform-linux-i386-ncurses6-0.12.jar!/" />
<root url="jar://$MODULE_DIR$/lib/native-platform-osx-amd64-0.12.jar!/" />
<root url="jar://$MODULE_DIR$/lib/native-platform-osx-i386-0.12.jar!/" />
<root url="jar://$MODULE_DIR$/lib/native-platform-windows-amd64-0.12.jar!/" />
<root url="jar://$MODULE_DIR$/lib/native-platform-windows-i386-0.12.jar!/" />
<root url="jar://$MODULE_DIR$/lib/jansi-1.14.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -9,7 +9,7 @@ task wrapper(type: Wrapper) {
#if (${GRADLE_VERSION} && ${GRADLE_VERSION} != "")
gradleVersion = '${GRADLE_VERSION}'
#else
gradleVersion = '2.14.1'
gradleVersion = '3.3'
#end
distributionUrl = "https://services.gradle.org/distributions/gradle-$gradleVersion-all.zip"
}
@@ -25,25 +25,28 @@
<orderEntry type="module-library" scope="PROVIDED">
<library name="GradleToolingExtension">
<CLASSES>
<root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-build-init-3.1.jar!/" />
<root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-ide-3.1.jar!/" />
<root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-dependency-management-3.1.jar!/" />
<root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-language-java-3.1.jar!/" />
<root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-language-jvm-3.1.jar!/" />
<root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-platform-base-3.1.jar!/" />
<root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-platform-jvm-3.1.jar!/" />
<root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-plugins-3.1.jar!/" />
<root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-testing-base-3.1.jar!/" />
<root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-testing-jvm-3.1.jar!/" />
<root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-scala-3.1.jar!/" />
<root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-language-scala-3.1.jar!/" />
<root url="jar://$MODULE_DIR$/lib/gradle-reporting-3.1.jar!/" />
<root url="jar://$MODULE_DIR$/lib/gradle-ear-3.1.jar!/" />
<root url="jar://$MODULE_DIR$/../lib/gradle-native-3.3.jar!/" />
<root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-build-init-3.3.jar!/" />
<root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-ide-3.3.jar!/" />
<root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-dependency-management-3.3.jar!/" />
<root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-language-java-3.3.jar!/" />
<root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-language-jvm-3.3.jar!/" />
<root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-platform-base-3.3.jar!/" />
<root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-platform-jvm-3.3.jar!/" />
<root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-plugins-3.3.jar!/" />
<root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-testing-base-3.3.jar!/" />
<root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-testing-jvm-3.3.jar!/" />
<root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-scala-3.3.jar!/" />
<root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-language-scala-3.3.jar!/" />
<root url="jar://$MODULE_DIR$/lib/gradle-workers-3.3.jar!/" />
<root url="jar://$MODULE_DIR$/lib/gradle-reporting-3.3.jar!/" />
<root url="jar://$MODULE_DIR$/lib/gradle-ear-3.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/../lib/gradle-3.1-src.zip!/gradle-3.1/subprojects/tooling-api/src/main/java" />
<root url="jar://$MODULE_DIR$/../lib/gradle-3.1-src.zip!/gradle-3.1/subprojects/ear/src/main/java" />
<root url="jar://$MODULE_DIR$/../lib/gradle-3.3-src.zip!/gradle-3.3/subprojects/tooling-api/src/main/java" />
<root url="jar://$MODULE_DIR$/../lib/gradle-3.3-src.zip!/gradle-3.3/subprojects/ear/src/main/java" />
<root url="jar://$MODULE_DIR$/../lib/gradle-3.3-src.zip!/gradle-3.3/subprojects/workers/src/main/java" />
</SOURCES>
</library>
</orderEntry>