Commit Graph

36 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
Daniil Ovchinnikov
27e155fc21 IJPL-167 bump language and API version 1.8 -> 1.9
GitOrigin-RevId: 5204df1784bbbba550476415e4ceff7368ab5fd4
2023-09-19 19:52:47 +00:00
Daniil Ovchinnikov
30fa6f95fa Kotlin 1.8 language and API versions
GitOrigin-RevId: d019dab5535d6f9405514bb0efb7ffa6cd27f5b0
2023-01-07 13:16:21 +00:00
Daniil Ovchinnikov
45d44ea146 @JvmDefault: use -Xjvm-default=all
GitOrigin-RevId: 461876a557e97c9fd17fe5324c38ea268d18162e
2022-10-13 14:13:50 +00:00
Nikolay Chashnikov
ed40abaffe [intellij project configuration] remove useless '-version' argument from Kotlin compiler configuration in Kotlin facets
It does nothing and just occupies space in UI and in memory.

GitOrigin-RevId: 8977857c42dd8711ba91c7de6e819dd356b0f4cb
2022-08-15 12:42:16 +00:00
Nikolay Chashnikov
96437153d5 [intellij project configuration] use JVM Target 17 for Kotlin compiler in modules where the language level is 17
...to have same bytecode versions for Java and Kotlin files.

GitOrigin-RevId: 4552bd1cb37f83860f3ba5cab5e85a5108036c12
2022-08-15 10:24:00 +00:00
Nikolay Chashnikov
8e590ad3d7 [intellij project configuration] convert all Kotlin facets to the latest version
This will make it simpler to modify their configuration in a batch and avoid unnecessary conversion at runtime.

GitOrigin-RevId: 8097b723d18faa2cd47b9e4c401e20b3ee43569e
2022-08-11 18:34:29 +00:00
Nikita Bobko
8f4c254770 Replace deprecated '-Xopt-in' with '-opt-in'
KT-47099

This commit fixes: "Kotlin: Argument -Xopt-in is deprecated. Please use
-opt-in instead" compiler warning.

GitOrigin-RevId: 9bf9b57f795b445fb7a33035ef153123bd217f29
2022-08-04 12:56:01 +00:00
Yan Zhulanow
c2dc67b115 [kotlin] Ensure all Kotlin modules are present in meta-modules
There are several meta-modules:
- 'kotlin.all-tests' and 'kotlin.fir.all-tests'. Used as a test classpath on CI.
- 'kotlin.plugin' and 'kotlin.plugin-fir'. Used mainly for XML plugin descriptor resolution.
- 'intellij.kotlin.plugin.community.main' and 'intellij.kotlin.plugin.community.fir.main'. Used for running IDEA from sources.

All relevant Kotlin IDE plugin modules should be present in each of these meta-modules. In addition, there is 'KotlinPluginBuilder', a Groovy script which assembles plugin artifact JARs.

It is easy to forget putting newly created modules in each of these locations, so here is the consistency test.

GitOrigin-RevId: 990dfb1c5447e22ab89fb4aeb2cd3d8e937aa110
2022-06-24 14:36:44 +00:00
Daniil Ovchinnikov
e7d6d7cde9 clean up: remove obsolete -Xopt-in=kotlin.io.path.ExperimentalPathApi from Kotlin compiler args
GitOrigin-RevId: 7b1a429cd2cba37e73fd8b58733c9e814efd3da0
2022-06-20 12:00:54 +00:00
Daniil Ovchinnikov
7c41943321 clean up: remove obsolete -Xstrict-java-nullability-assertions from Kotlin compiler args
GitOrigin-RevId: 066ae98971c8c2881e7ca1b05a5ee0bdf210faf9
2022-06-19 21:26:47 +00:00
Daniil Ovchinnikov
049bee70d4 bump Kotlin language/API level to 1.7
GitOrigin-RevId: 2e37f419cfe40bd1e50fc336a78f6216685430f9
2022-06-19 17:31:54 +00:00
Daniil Ovchinnikov
04f9d02c33 bump Kotlin language/API level to 1.6
GitOrigin-RevId: 7ad42488cff8cd096f9da056b6dfc131aee6f0e5
2022-06-18 19:31:16 +00:00
Daniil Ovchinnikov
5b496d84f6 remove -Xuse-old-backend from Kotlin compiler settings
GitOrigin-RevId: 357d7ccec6683358134bd51b43b81f05e4796ce0
2022-06-18 17:03:29 +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
Nikita Bobko
488691eaf5 Fix compilation after initial assembly of kt-212-master branch
GitOrigin-RevId: 5b7c8497b8a91909aaa8e14b5743f0d628ea9320
2022-01-22 11:07:09 +00:00
Vladimir Krivosheev
38feff2a2a update JVM target for kotlin
GitOrigin-RevId: 23d7b97d65a4246f5503592c1887ed26238cf260
2022-01-08 18:48:29 +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
Nikolay Chashnikov
f92dd9c12d [IntelliJ project configuration] switch to the old backend for Kotlin compiler
The new JVM IR backend used by default when language version is 1.5 makes 'Rebuild Project' longer by 15% (see KT-48233).

GitOrigin-RevId: d03c12d2d6272278fe401acf8d19ea7191ee09c9
2021-08-12 14:48:02 +00:00
Nikolay Chashnikov
954a649f0f [intellij project configuration] set Kotlin language/API version to 1.5
GitOrigin-RevId: 9ec9aa30ff5b79256ea3de70e226ada57dd099dd
2021-08-10 10:14:43 +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
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
Mikhail Zarechenskiy
2279b8f76d [kotlin] Use kotlin-scripting-compiler instead of outdate common version
GitOrigin-RevId: 1ceef46bfff611166bc94bab6824f9ff04a83f21
2021-06-30 09:06:11 +00:00
Mikhail Zarechenskiy
f50b5bdecc [kotlin] Use correct library to kotlin-stdlib-jdk8
GitOrigin-RevId: 9dc28804cc40be617238de594f82d1b6a8f78f06
2021-06-30 09:06:09 +00:00
Nikita Bobko
f9a5c10088 Move 'intellij.platform.core' higher than 'kotlinc.kotlin-compiler' in classpath 2
GitOrigin-RevId: 7bb2c3b5dce66115015d53b89fc0db4b26de55f7
2021-06-30 09:05:45 +00:00
Dmitry Gridin
ba350fffd0 [kotlin] merge kotlinc.kotlin-scripting-common library to kotlinc.kotlin-scripting-compiler
KTIJ-10035

GitOrigin-RevId: 94e3e6587f68ff631d02b90e7cca10ae434e2db4
2021-04-29 07:29:40 +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
2589f04725 Replace 'kotlinc.kotlin-scripting-common' project library with 'kotlinc-delegator.kotlin-scripting-common' 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: 9df0b6f705426f753307a05fe7c701b1c981772f
2020-11-16 14:55:22 +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
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
685a72300a Fix scripting-common dependency in kotlin.scripting module
GitOrigin-RevId: adab710fc5ecf12ac702ace7c2fb0cddb6cdfda7
2020-06-03 18:56:01 +03:00
Yan Zhulanow
7ee9feb28a Migrate project to JPS
GitOrigin-RevId: d427a3c45fc6cc9033e28b220a98bb1b60ccf8c8
2021-02-07 21:43:29 +03:00