Commit Graph

25 Commits

Author SHA1 Message Date
Ilya Kirillov
a2bbe4d318 Remove snapshot kotlin stdlib from Kotlin plugin
^KT-62510
^KTIJ-20529 fixed

GitOrigin-RevId: a49099902566abb23dfb56a578b368b4973e332f
2023-10-20 20:53:09 +00:00
Yan Zhulanow
b6c433c1fa [kotlin] Forbid exporting 'kotlinc.*' dependencies (KTIJ-21699, KTIJ-22014)
As the plugin gradually becomes separated to common and frontend-dependent parts, it is important to understand which modules use the old frontend. Without dependency exporting, figuring it out becomes a trivial task.

GitOrigin-RevId: 6ef2da11b5e6f03b38b325fa0824bd79935eff29
2022-06-15 06:45:43 +00:00
Yan Zhulanow
12c3ad80e9 [kotlin] Extract facet and platform-related classes to kotlin.base.* modules (KTIJ-21699)
GitOrigin-RevId: c2cd56198d67d4a9e28315dd0c115f18d0f1dbd9
2022-06-14 06:27:37 +00:00
Yan Zhulanow
669afc9afa [kotlin] Remove unneeded kotlin.scripting-compiler
The library is not used anywhere in the plugin, it was added by mistake as a (false) counterpart of kotlin-scripting-compiler-impl. See 4a9d4e06b99dbfe794b3072b59aec559381ecdcf for more information.

GitOrigin-RevId: 9bb9579dd02e0e33b42a15ba180102d88d2eee35
2022-02-08 08:52:50 +00:00
Yan Zhulanow
a73802740f Split kotlinc.kotlin-compiler library to common/fe10/fir/ir
GitOrigin-RevId: 6611c04934c6d6623d7a892ed41e957dc90b69fd
2022-02-08 08:51:09 +00:00
Nikita Bobko
b06aade9ba 1/2 Replace source dependency on Kotlin JPS plugin with binary dependency
Kotlin JPS plugin is going to be migrated to Kotlin repo (in scope of KTIJ-11633),
so let's replace all dependencies on sources with dependencies on binaries

GitOrigin-RevId: 83fa7ffc92b40fc9740d103013ef3341068593b5
2021-12-21 22:10:43 +00:00
Nikita Bobko
098573c57c Split kotlin-stdlib-jdk8 and kotlin-reflect libraries
Some facts:
1. Kotlin plugin bundles own version of kotlin-stdlib and reflect (see KotlinPluginBuilder.groovy).
   We bundle own version of stdlib and reflect (but not use the one which comes with IDEA) because
   otherwise we would have runtime errors in compiler frontend which we depend on
   (kotlinc.kotlin-compiler)
2. Kotlin plugin exists in two release cycles. We have special `kt-xxx-[kotlin_compiler_version]`
   branches (e.g. kt-212-1.5.30 branch) in the repository where we put Kotlin plugin fixes which
   should be delivered in KT release cycle.
   2.1 The fact that we publish Kotlin plugin artifacts to marketplace from special kt-branches
       leads to the fact that stdlib may be different in Kotlin plugin and IntelliJ IDEA. By
       separating `kotlin-stdlib-jdk8` and `kotlinc.kotlin-stdlib` we make it obvious that Kotlin
       plugin has it's own stdlib

This commit fixes broken incremental compilation in kt-212-master
on TeamCity because now we have to bootstrap only kotlinc.kotlin-stdlib.
Previously, we had to bootstrap kotlin-stdlib-jdk8 which caused problems
with incremental compilation because whole monorepo depends on this artifact.

Also now during kotlinc updates in `intellij/master` we don't have to update kotlin-stdlib-jdk8
every time to keep kotlinc version the same among different imls/xmls in the monorepo
https://jetbrains.team/im/code/258iod1xjiFZ?message=BK9Aq0SIM1A&channel=152Z1w0RwrFp

(cherry picked from commit 23b2a70604c5c578983b0d76cb8634b9ed301a59)

GitOrigin-RevId: 773c01c405f2eb9db8d88ce3c58e4bdcee66c085
2021-11-10 13:52:22 +00:00
Yan Zhulanow
fd26a67370 [kotlin] Move the rest of components registered in kotlin.gradle.gradle-java to the module
GitOrigin-RevId: 2f11dfd901f391550ebfba2577ec576902b4dcbb
2021-08-30 05:19:40 +00:00
Nikolay Chashnikov
b683746735 get rid of unnecessary Kotlin facets in intellij project
KotlinPluginInternalApi annotation was replaced by generic IntellijInternalApi, which can be used in other plugins as well. So it becomes possible to use Kotlin compiler settings from the project configuration in almost all modules from Kotlin plugin, making Kotlin facets in these modules unnecessary. Removal of Kotlin facets simplifies project configuration and makes it easier to change settings of Kotlin compiler.

GitOrigin-RevId: 17590fab5769e3b79f47adb2af41b1dbcebf6e0a
2021-08-06 12:41:49 +00:00
Yan Zhulanow
f506af77aa [kotlin] Move plugin-specific parts of scripting support to plugin.xml files in respective modules
GitOrigin-RevId: f2cc906d9bf35a3d0f21b313c9595c6bbc1b9e17
2021-07-16 10:33:23 +00:00
Yan Zhulanow
d2e1b4ddfb [kotlin] Allow using @KotlinPluginInternalApi-marked declarations from all Kotlin modules
GitOrigin-RevId: fb56194efbddfba539db6bb33689dbf25d3fcb49
2021-07-16 10:33:22 +00:00
Nikolay Chashnikov
24a1844984 [IntelliJ project configuration] adapt settings of Kotlin facet to Kotlin 1.5 plugin
Kotlin 1.5 doesn't write tag for 'jvmTarget' option if its value is '1.8', and does write it if its value is '1.6', so this change is needed to avoid modified iml files if the project is opened with Kotlin plugin 1.5 (see KTIJ-19019).

GitOrigin-RevId: 8fc21bf185ac8c23675123b904f25af5defcc98e
2021-07-07 10:52:45 +00:00
Dmitry Gridin
74dbe06091 [kotlin] merge kotlinc.kotlin-scripting-compiler-impl library to kotlinc.kotlin-scripting-compiler
KTIJ-10035

GitOrigin-RevId: 2c508ca8189b18a96932d35cec19ae425a43cf03
2021-04-29 07:29:38 +00:00
Dmitry Gridin
38221a7967 [kotlin] replace kotlinc.kotlin-stdlib-jdk8 with kotlin-stdlib-jdk8
^KTIJ-10035

GitOrigin-RevId: 93f6f0e9c0d24459068ae65b4d1263df5e617390
2021-04-23 12:58:37 +03:00
Nikita Bobko
f3f4fbd1f9 Convert all kotlinc-delegator.* modules to kotlinc.* libraries
Cooperative compilation plans changed and we don't need delegator modules anymore

GitOrigin-RevId: c8b8ca7a8bea68ce1bf5fb0425956f5cc0f61d18
2021-04-19 13:39:10 +03:00
Nikita Bobko
6e29578615 Replace dependency on 'kotlinc.kotlin-stdlib-jdk8' with dependency on 'kotlinc-delegator.kotlin-stdlib-jdk8' module delegator
This commit is part of series of project model refactoring commits, look at neighborhood commits.
Check out last commits in this sequence.

These commit are done for sake of unification and making it easier to write cooperative compilation
prototype.

GitOrigin-RevId: 4ec18be4192e6ea9fe93f14e3e9fac83cec68c91
2020-11-16 14:55:23 +03:00
Nikita Bobko
a69ff1ee67 Replace 'kotlinc.kotlin-scripting-compiler-impl' project library with 'kotlinc-delegator.kotlin-scripting-compiler-impl' module delegator
This commit is part of series of project model refactoring commits, look at neighborhood commits.
Check out last commits in this sequence.

These commit are done for sake of unification and making it easier to write cooperative compilation
prototype.

GitOrigin-RevId: 674810b0a5d5624ba381cfbbbe5d8b8b0e5c5cc9
2020-11-16 14:55:22 +03:00
Nikita Bobko
5a8b63741d Replace 'kotlinc.kotlin-scripting-compiler' project library with 'kotlinc-delegator.kotlin-scripting-compiler' module delegator
This commit is part of series of project model refactoring commits, look at neighborhood commits.
Check out last commits in this sequence.

These commit are done for sake of unification and making it easier to write cooperative compilation
prototype.

GitOrigin-RevId: 1792f26440cfac8c3e8e12e1af0fefc38377c818
2020-11-16 14:55:22 +03:00
Nikita Bobko
ab0fa50fcd Replace 'kotlinc.kotlin-compiler' project library with 'kotlinc-delegator.kotlin-compiler' module delegator
This commit is part of series of project model refactoring commits, look at neighborhood commits.
Check out last commits in this sequence.

These commit are done for sake of unification and making it easier to write cooperative compilation
prototype.

GitOrigin-RevId: 341fbb8bc02ad28a7e2113b859fba87756af5c37
2020-11-16 14:55:20 +03:00
Yan Zhulanow
46c7ebf788 Minor: Sort dependencies in Kotlin modules
GitOrigin-RevId: 1a526081215ab0bd4a745626f000c0ed21913e1a
2020-08-21 13:32:47 +03:00
Yan Zhulanow
3a0beb7a21 Revert "fix compilation: explicitly set Java 8 language level"
This reverts commit fcbc8b79

GitOrigin-RevId: f1f7a858b0e12dc16bf84b2a003279c847c3cc1a
2020-08-12 13:02:43 +03:00
Dmitry Gridin
b6eeb7cd28 fix compilation: explicitly set Java 8 language level
GitOrigin-RevId: 2807fc4a4fa13899d7b89de5e0422234b2f9c39b
2020-08-12 09:05:02 +03:00
Alexander Podkhalyuzin
cce7abbcce Removed two unnecessary cycles in modules. One more complicated left in tests
GitOrigin-RevId: 08dc999a419108c9bb3aa2e0696985b4f6c55899
2020-06-29 18:17:15 +03:00
Yan Zhulanow
f4cf9520c3 Replace stdlib/reflect library usages in Kotlin modules to Kotlin-specific ones
GitOrigin-RevId: 12edd441517af8c0665ff682c9a61f77742d34f4
2020-06-24 23:17:38 +03:00
Yan Zhulanow
7ee9feb28a Migrate project to JPS
GitOrigin-RevId: d427a3c45fc6cc9033e28b220a98bb1b60ccf8c8
2021-02-07 21:43:29 +03:00