Commit Graph

22 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
Alexey Belkov
cd8f011109 [git] Explicit rename commit: save issue links from original commit message
* Revert public API changes (introduced in previous commit)
* Make it work not only for converting from Java to Kotlin
* Add a test

^KTIJ-26829

GitOrigin-RevId: 16560480542e6a060f4936475a7ff1d440a18cc5
2023-09-20 10:06:39 +00:00
Alexey Belkov
caae8f4d8e [kotlin] J2K: "Rename .java to .kt" commit: save link to YouTrack issue from original commit message
^KTIJ-26829 Fixed

GitOrigin-RevId: 7ec060cf57dac3b731e21145730f0de41dab1223
2023-09-19 14:21:11 +00:00
Yan Zhulanow
cadc916025 [kotlin] Untie 'kotlin.git' from FE10 (KTIJ-21699)
GitOrigin-RevId: 326c80b5ca92390612c2d400b2074548f3854d10
2022-06-24 14:37:04 +00:00
Yan Zhulanow
a9de3e25f1 [kotlin] Remove 'kotlin.common' module (KTIJ-21699)
GitOrigin-RevId: 4ab36f052c63b9b37bd114b07f69b985a9472360
2022-06-14 06:27:51 +00:00
Yan Zhulanow
c4574efb8a [kotlin] Move KotlinAbstractBundle to the 'kotlin.base.util' module
GitOrigin-RevId: 0e332f89b67355de18201242fccd6d90d28d2845
2022-04-15 19:39:01 +00:00
Nikita Bobko
e804f942c4 Fix compilation after cherry-pick from Kotlin repo
GitOrigin-RevId: 08e4f90681d654466f68233039dce8381504d04d
2022-01-22 10:51:02 +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
Alexander Zolotov
2717578468 [kotlin] make git-related module compile-only
otherwise, it loads `intellij.git` plugin even if it's not needed

GitOrigin-RevId: 11766cefec36c8b77518ccf17ddf47dbfa900068
2021-08-30 20:49:23 +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
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
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
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
Nikita Bobko
c68eb9ea8f Fix compilation
GitOrigin-RevId: 3a599d2fd98e115fde16f87f4893d7247572d0cd
2021-02-07 21:44:25 +03:00
Yan Zhulanow
7ee9feb28a Migrate project to JPS
GitOrigin-RevId: d427a3c45fc6cc9033e28b220a98bb1b60ccf8c8
2021-02-07 21:43:29 +03:00