diff options
| author | Vadim Mishenev <vad-mishenev@yandex.ru> | 2022-05-31 23:57:28 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-31 23:57:28 +0300 |
| commit | 73f78dc34bbcb683f345192629bdbc631035887e (patch) | |
| tree | 1ebdd3d0312c3742cfcfc0b199b26fb0d5a57f47 /kotlin-analysis/intellij-dependency | |
| parent | 623cf222ca2ac5e8b9628af5927956ecb6d44d1e (diff) | |
| download | dokka-73f78dc34bbcb683f345192629bdbc631035887e.tar.gz dokka-73f78dc34bbcb683f345192629bdbc631035887e.tar.bz2 dokka-73f78dc34bbcb683f345192629bdbc631035887e.zip | |
Bump Kotlin to 1.7.0-RC (#2508)
* `UnresolvedType` is replaced with `ErrorType` in https://github.com/JetBrains/kotlin/commit/b5933c70e20a0dfd788d8d4a6c04ca0d16f7c731
* Support `sig` files in https://github.com/JetBrains/kotlin/commit/22b368849338cae684601c9b1ead31ebb1fd81cf
* `org.jetbrains.kotlin.idea.kdoc.resolveKDocSampleLink` is removed in https://github.com/JetBrains/intellij-community/commit/e4af6f96c8d4e2318d04eddf658a4c4e8c60b2e6
* `org.jetbrains.kotlin.idea.refactoring.fqName.getKotlinFqName` is deprecated
* `org.codehaus.plexus.archiver.AbstractArchiver.addDirectory` is deprecated https://codehaus-plexus.github.io/plexus-archiver/apidocs/org/codehaus/plexus/archiver/Archiver.html#addDirectory-java.io.File-java.lang.String:A-java.lang.String:A-
* Make `clean` independent from `setupMaven`
* Set up JDK classpath roots explicitly
because of https://github.com/JetBrains/kotlin/commit/f89765eb33dd95c8de33a919cca83651b326b246
* Add JPS model and faxml dependencies
* Fix test
* Exclude compiler from buildscript in integration test
* Exclude `com.intellij` package from compiler
* Update kotlin version in integration tests
Diffstat (limited to 'kotlin-analysis/intellij-dependency')
| -rw-r--r-- | kotlin-analysis/intellij-dependency/build.gradle.kts | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/kotlin-analysis/intellij-dependency/build.gradle.kts b/kotlin-analysis/intellij-dependency/build.gradle.kts index b2ee35e1..09c47ef5 100644 --- a/kotlin-analysis/intellij-dependency/build.gradle.kts +++ b/kotlin-analysis/intellij-dependency/build.gradle.kts @@ -19,7 +19,14 @@ repositories { val intellijCore: Configuration by configurations.creating fun intellijCoreAnalysis() = zipTree(intellijCore.singleFile).matching { - include("intellij-core-analysis-deprecated.jar") + include("intellij-core.jar") +} + +val jpsStandalone: Configuration by configurations.creating + +fun jpsModel() = zipTree(jpsStandalone.singleFile).matching { + include("jps-model.jar") + include("aalto-xml-*.jar") } dependencies { @@ -34,6 +41,9 @@ dependencies { val idea_version: String by project intellijCore("com.jetbrains.intellij.idea:intellij-core:$idea_version") implementation(intellijCoreAnalysis()) + + jpsStandalone("com.jetbrains.intellij.idea:jps-standalone:$idea_version") + implementation(jpsModel()) } tasks { |