Commit Graph

188 Commits

Author SHA1 Message Date
Ilya Kirillov
1abfed2c2a [kotlin] fix kotlin version retrieval for test after snapshot stdlib removal
^KT-62510

GitOrigin-RevId: 631ad75487c82b7218e1fc01c4f454529e08e763
2023-10-20 20:53:10 +00:00
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
Andrew Kozlov
42cb8648b4 [devkit] IDEA-236032 getInstance call simplified
GitOrigin-RevId: 3ebd035a96c478a9eece1a3013941ff0c5106f03
2023-10-12 21:46:35 +00:00
Ilya Gorbunov
de9cd871f5 [Kotlin] KT-62004, KT-62067 Use kotlin-test-js.klib instead of .jar
Also extract getKlib helper function

GitOrigin-RevId: 423327a33a114d33adfef44068301c62bdd45799
2023-10-06 00:56:51 +00:00
Sebastian Sellmair
e64b0fea7d [KTIJ-27131] Update the Kotlin Gradle Plugin version for import tests to 1.9.30-dev-2548
GitOrigin-RevId: 359ae79794e7ee83823ca0ea4789b4673c13b1af
2023-09-22 12:31:47 +00:00
aleksandrina-streltsova
6d6d4a6d65 [kotlin] Add declarations from dom to project descriptor for JS tests after they were extracted to separate library
KT-35973

GitOrigin-RevId: cdac8a81de25aa8261f90d37bd8f45e4de726256
2023-08-18 14:50:43 +00:00
Ilya Kirillov
8b5db2e6d0 [kotlin] add information about kotlin plugin kind to about dialog
^KTIJ-26642 fixed

GitOrigin-RevId: ba2bafb25c7e6196a5d6e72d567c9cf3867b9f75
2023-08-18 08:51:22 +00:00
Ilya Kirillov
17e47c774b [kotlin] extract KotlinPluginKind description to base module
GitOrigin-RevId: 66760ddb1941b54bcd8a1f5b111dcb1b82e4e779
2023-08-18 08:51:22 +00:00
Anna Kozlova
7f50505a12 Merge branch 'kt-master'
# Conflicts:
#	.idea/libraries/kotlinc_kotlin_stdlib.xml
#	community/.idea/libraries/kotlinc_kotlin_stdlib.xml

GitOrigin-RevId: aa39418f04a5672d55c6fcdb7fa40572c255182c
2023-08-16 12:20:45 +00:00
Sebastian Sellmair
f20291eb62 [KTIJ-26562] Update latest Kotlin Gradle Plugin version to 1.9.30-dev-269
^KTIJ-26562 Verification Pending

GitOrigin-RevId: bc61310392327ab37c6dbc169979de7c0ceeed24
2023-08-14 17:40:33 +00:00
Sebastian Sellmair
7718e17a13 [KTIJ-26562] Update latest Kotlin Gradle Plugin version to 1.9.30-dev-203
^KTIJ-26562 Verification Pending

GitOrigin-RevId: cef717ad8b0380bbc32a344418615ec83f1a6cdd
2023-08-14 17:40:33 +00:00
Sebastian Sellmair
b05fbddb66 [KTIJ-26562] Update latest Kotlin Gradle Plugin version to 1.9.20-dev-9107
^KTIJ-26562 Verification Pending

GitOrigin-RevId: 0437cde9d18eba366b7fba7e5993b3f9630a8efa
2023-08-14 17:40:32 +00:00
Vladimir Krivosheev
9649497aef reduce visibility
GitOrigin-RevId: c44a92db578b68af55eb8a4bcec564a880d91838
2023-08-12 13:14:01 +00:00
Ilya Goncharov
28e997adee [Kotlin] Change coordinates of wasm stdlib
GitOrigin-RevId: 61f8eebd695fa33adbe409f52f0f85983693b560
2023-08-11 21:35:45 +00:00
EgorKulikov
00613b9767 [kotlin] merge kt-master to master
GitOrigin-RevId: ee9a781cd33d36d8479b20d1e7181e916f7f9cfa
2023-08-11 17:14:41 +00:00
Roman Shevchenko
386eee00be [project] replacing custom Path extensions with stdlib/JRE calls
GitOrigin-RevId: 521524062de528211d495d08b32afcd2132d7ebd
2023-08-04 17:11:22 +00:00
Ilya Goncharov
41e443d56c [Kotlin] Use stdlib-js.klib
GitOrigin-RevId: 16395bfba8630bf2aca037985d0e58b48eca82a3
2023-08-03 14:48:18 +00:00
Nikita Bobko
a390652882 Improve assertions in LazyDistDirLayoutProducer.produceOutput
Motivation to make this commit: the discussion with Tagir Valeev in
#ij-dev in Slack.
https://jetbrains.slack.com/archives/CMDBCUBGE/p1690023301163689

Tagir Valeev:
  `check(lib.mkdirs()) { "Can't create $lib directory" }`
  Probably removing this directory completely will help. It looks like,
  the directory was not deleted (probably some files are locked for
  writing). This check is somewhat erroneous, as it fails if directory was
  already existing before (cc @bobko). If directory can't be removed
  (probably opened by some process), but it's perfectly writable, one
  should not stop the build process only due to this

Nikita Bobko:
  > This check is somewhat erroneous, as it fails if directory was
  > already existing before

  If this check is failed then it means that
  `unpackedDistDestination.deleteRecursively()` also failed. If
  `unpackedDistDestination.deleteRecursively()` failed then invalid
  variants of Kotlin compiler jars will be left in `kotlinc/lib`
  directory. It will form the wrong Kotlin compiler classpath

  So this check is actually a fail-fast strategy

  What can be improved here is that
  `unpackedDistDestination.deleteRecursively()` should also be asserted
  to return `true`

GitOrigin-RevId: 0b4181a7813eead7ef047241c376ccb44ed4d7db
2023-07-24 14:12:13 +00:00
Vladimir Krivosheev
920807e07a convert PluginManagerCore to kotlin
GitOrigin-RevId: 623c6539d672489b0f42182e2e8866deae0ff4c2
2023-07-20 19:29:30 +00:00
Sebastian Sellmair
7bcb1b593d [KTIJ-26340] Bump Kotlin Gradle Plugin version latest to '1.9.20-dev-6845'
GitOrigin-RevId: 02a4ab28b7f9275df83d9cd83e6dfd508236c2ea
2023-07-20 17:58:15 +00:00
Ilya Kirillov
7b01c8c339 [kotlin] allow switching between K1/K2 plugins by UI setting
^KTIJ-25184 fixed

GitOrigin-RevId: a56e9a0fdc257e67faedb2b4734148d764d211c6
2023-07-18 13:57:56 +00:00
Pavel Kirpichenkov
a1449ccfc3 [MPP, tests] Update test KGP version to 1.9.20-dev-4459
KTIJ-26026

GitOrigin-RevId: 7b3d2dc1585f980cd4f8fa774592b54e350f4551
2023-06-27 11:09:58 +00:00
Frederik Haselmeier
779da34aab [kotlin] Use Kotlin version of bundled compiler in non-release mode in wizard and never include build numbers
This functionality was partially disabled by KTIJ-15746 but should be re-enabled to allow generation projects with Beta/RC Kotlin versions

^KTIJ-25904 fixed

Merge-request: IJ-MR-108524
Merged-by: Frederik Haselmeier <Frederik.Haselmeier@jetbrains.com>

GitOrigin-RevId: 4f45399c51b78f109471a7abf2011c5d1836969c
2023-06-21 12:32:36 +00:00
Pavel Kirpichenkov
88bfd73cf2 [MPP, tests] Update test KGP version to 1.9.20-dev-3234
KTIJ-25808

GitOrigin-RevId: 520b94b6fba91e26f141eeb1f05ee8df2ebdfd72
2023-06-19 09:55:11 +00:00
Alex Plate
01173d5105 [Workspace Model] [IDEA-320676] Move several classes to the new module
GitOrigin-RevId: b86ef15549fdef4e408943fb47b6e1c1d7a9b1ea
2023-06-19 09:35:22 +00:00
Alex Plate
e18c7d8a5f [Workspace Model] Move sources of the storage under workspace package
GitOrigin-RevId: 013ce64337fe7b3637d731c1093a2337bbe71f22
2023-06-19 09:35:08 +00:00
Alex Plate
c3b791a11a [Workspace Model] [IDEA-320676] Rename module intellij.platform.workspaceModel.storage to intellij.platform.workspace.storage
GitOrigin-RevId: f3d3180c7e8aa2b0a339acaf94dae4e2c90da12b
2023-06-19 09:35:06 +00:00
Alex Plate
37c54118b9 [Workspace Model] [IDEA-320676] Rename base packages of the workspace model: com.intellij.workspaceModel
The rename of the packages is needed to follow the naming convention. See the attached ticket for the details.

GitOrigin-RevId: 24b2328e572efa23d67133fc495855cf662ea795
2023-06-19 09:34:30 +00:00
Yan Zhulanow
b58ced47d0 Merge commit '318eb2b6c15ce28128fa3359f5ff893ca1e8edfd'
GitOrigin-RevId: 9fa6ec111423874267f744abf738b20d613285e7
2023-06-08 11:02:37 +00:00
Ilya Goncharov
6939ed5ae6 [Kotlin] Add wasm platform kind
^KTIJ-25583 fixed

GitOrigin-RevId: 032671a2e18e0d36336f2fec2bc500ab9b55a923
2023-06-01 14:00:15 +00:00
Pavel Kirpichenkov
71608e3d58 [MPP, tests] Update test KGP version to 1.9.20-dev-2357
KTIJ-25668

GitOrigin-RevId: 61f91fdf6effc64b0d31ec16d4a4a36880ae2ba5
2023-05-31 11:18:39 +00:00
Yan Zhulanow
ba2f6ac561 [kotlin] Use platform baseline version for compatibility check (KTIJ-25650)
GitOrigin-RevId: 27a375f827902c89bcd7c922a897f2184ec6ac73
2023-05-25 19:21:57 +00:00
Vladimir Dolzhenko
1b8600cc21 [kotlin] Uncomment incorrectly commented condition check
#KTIJ-25468

GitOrigin-RevId: c97761d2f983f2cf7d93ad62e3338cea2128f0ef
2023-05-17 07:36:49 +00:00
Vladimir Dolzhenko
5138f70c0d [kotlin] Set version should be done under writeAction
#KTIJ-25468 Fixed

GitOrigin-RevId: 52854843733971b1681f41b46fddc190895fad8d
2023-05-15 13:28:51 +00:00
Vyacheslav Karpukhin
5a316ac555 Kotlin: Use the VFS-based JarVersionDetectionUtil instead of the JarUtil in IdeKotlinVersion
GitOrigin-RevId: 3bffe014ab540e9d23403d1ffe4984a878a12bc1
2023-05-14 21:50:56 +00:00
Vladimir Krivosheev
05424b239c Revert "Kotlin: Use the VFS-based JarVersionDetectionUtil instead of the JarUtil in IdeKotlinVersion"
This reverts commit 3139a02f7efe742514e8a198e78db95df99a3e48.

GitOrigin-RevId: 9d588779bb909619e68412373d86f239bcdd47f3
2023-05-14 17:43:01 +00:00
Vyacheslav Karpukhin
650f5073c6 Kotlin: Use the VFS-based JarVersionDetectionUtil instead of the JarUtil in IdeKotlinVersion
GitOrigin-RevId: 3139a02f7efe742514e8a198e78db95df99a3e48
2023-05-12 18:09:25 +00:00
Yahor Berdnikau
f70ad39640 Update logic to download dist
New logic considers 'kotlin-serialization-compiler-plugin' publication', creates 'kotlinx-serialization-compiler-plugin.jar' from maven serialization plugin jar and ignores all other maven plugins.

^KT-58530 In Progress

GitOrigin-RevId: 318491418626ace0dca4f9b68193e0d3d2506ea7
2023-05-12 10:57:31 +00:00
Yahor Berdnikau
2cd07393b4 Update downloaded Kotlin dist on download algorithm change
This will ensure correct 'dist' content after Kotlin Plugin update.

^KT-58530 In Progress

GitOrigin-RevId: 77b318a4bfa9f9c468693d6131b8e62d8d3e3ef4
2023-05-12 10:57:31 +00:00
Sebastian Sellmair
05d5a166f5 [KTIJ-25507] Advance test KGP version to 1.9.20-dev-1095
GitOrigin-RevId: 7997e934baa4b5c496de51d732701913af187112
2023-05-10 17:07:23 +00:00
Anna Kozlova
f0323143a1 Merge commit '9894dedb5fb206e1e7c9a8e27455b89845a2a9e4'
GitOrigin-RevId: acd87ce2cccfa36e2541d1b859aaf97feb8e1a6b
2023-05-10 08:00:21 +00:00
Roman Golyshev
3a57ef2981 [kotlin] KTIJ-23339 Add dedicated suppressAndroidPlugin function
GitOrigin-RevId: 9ff919289706b863769fb074e50b85b119ba3e68
2023-05-09 16:04:05 +00:00
Nikita Bobko
de1d03a388 Make "Path exists" check atomic
Review: https://jetbrains.team/p/ij/reviews/107079

This commit fixes flaky:
  java.util.concurrent.ExecutionException: java.nio.file.NoSuchFileException: /mnt/agent/temp/buildTmp/startupPerformanceTests14887929589063980070/perf-startup/cache/projects/unpacked/spring-petclinic-kotlin-master/.idea/kotlinc.xml
    at java.base/java.util.concurrent.CompletableFuture.reportGet(CompletableFuture.java:396)
    at java.base/java.util.concurrent.CompletableFuture.get(CompletableFuture.java:2096)
    at com.intellij.openapi.progress.util.BackgroundTaskUtil.lambda$createBackgroundTask$10(BackgroundTaskUtil.java:293)
    at com.intellij.openapi.util.ObjectTree.runWithTrace(ObjectTree.java:127)
    at com.intellij.openapi.util.ObjectTree.executeAll(ObjectTree.java:159)
    at com.intellij.openapi.util.Disposer.dispose(Disposer.java:264)
    at com.intellij.openapi.util.Disposer.dispose(Disposer.java:252)
    at com.intellij.openapi.progress.util.BackgroundTaskUtil.lambda$createBackgroundTask$11(BackgroundTaskUtil.java:315)
    at java.base/java.util.concurrent.CompletableFuture.uniWhenComplete(CompletableFuture.java:863)
    at java.base/java.util.concurrent.CompletableFuture$UniWhenComplete.tryFire(CompletableFuture.java:841)
    at java.base/java.util.concurrent.CompletableFuture.postComplete(CompletableFuture.java:510)
    at java.base/java.util.concurrent.CompletableFuture$AsyncRun.run(CompletableFuture.java:1810)
    at com.intellij.util.concurrency.BoundedTaskExecutor.doRun(BoundedTaskExecutor.java:248)
    at com.intellij.util.concurrency.BoundedTaskExecutor.access$200(BoundedTaskExecutor.java:28)
    at com.intellij.util.concurrency.BoundedTaskExecutor$1.executeFirstTaskAndHelpQueue(BoundedTaskExecutor.java:221)
    at com.intellij.util.ConcurrencyUtil.runUnderThreadName(ConcurrencyUtil.java:227)
    at com.intellij.util.concurrency.BoundedTaskExecutor$1.run(BoundedTaskExecutor.java:210)
    at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1136)
    at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:635)
    at java.base/java.util.concurrent.Executors$PrivilegedThreadFactory$1$1.run(Executors.java:702)
    at java.base/java.util.concurrent.Executors$PrivilegedThreadFactory$1$1.run(Executors.java:699)
    at java.base/java.security.AccessController.doPrivileged(AccessController.java:399)
    at java.base/java.util.concurrent.Executors$PrivilegedThreadFactory$1.run(Executors.java:699)
    at java.base/java.lang.Thread.run(Thread.java:833)
  Caused by: java.nio.file.NoSuchFileException: /mnt/agent/temp/buildTmp/startupPerformanceTests14887929589063980070/perf-startup/cache/projects/unpacked/spring-petclinic-kotlin-master/.idea/kotlinc.xml
    at java.base/sun.nio.fs.UnixException.translateToIOException(UnixException.java:92)
    at java.base/sun.nio.fs.UnixException.rethrowAsIOException(UnixException.java:106)
    at java.base/sun.nio.fs.UnixException.rethrowAsIOException(UnixException.java:111)
    at java.base/sun.nio.fs.UnixFileSystemProvider.newByteChannel(UnixFileSystemProvider.java:218)
    at java.base/java.nio.file.Files.newByteChannel(Files.java:380)
    at java.base/java.nio.file.Files.newByteChannel(Files.java:432)
    at java.base/java.nio.file.spi.FileSystemProvider.newInputStream(FileSystemProvider.java:422)
    at java.base/java.nio.file.Files.newInputStream(Files.java:160)
    at org.jetbrains.kotlin.idea.compiler.configuration.KotlinJpsPluginSettingsKt.fileIsNotEmpty(KotlinJpsPluginSettings.kt:271)
    at org.jetbrains.kotlin.idea.compiler.configuration.KotlinJpsPluginSettings$Companion.readFromKotlincXmlOrIpr(KotlinJpsPluginSettings.kt:129)
    at org.jetbrains.kotlin.idea.macros.KotlinBundledPathMacroContributor.getProjectPathMacros(KotlinBundledPathMacroContributor.kt:26)
    at com.intellij.openapi.components.impl.ProjectWidePathMacroContributor.getAllMacros(ProjectWidePathMacroContributor.java:38)
    at com.intellij.openapi.components.impl.ProjectPathMacroManager.getExpandMacroMap(ProjectPathMacroManager.java:49)
    at com.intellij.openapi.components.PathMacroManager.expandPath(PathMacroManager.java:120)
    at com.intellij.openapi.externalSystem.service.project.autoimport.ProjectAware.getSettingsFiles(ProjectAware.kt:40)
    at com.intellij.openapi.externalSystem.autoimport.ProjectSettingsTracker$SettingsFilesAsyncSupplier$cachingAsyncSupplier$1.get(ProjectSettingsTracker.kt:345)
    at kotlin.jvm.internal.PropertyReference0.invoke(PropertyReference0.java:35)
    at com.intellij.openapi.externalSystem.autoimport.settings.AsyncSupplier$Companion$blocking$1.supply(AsyncSupplier.kt:19)
    at com.intellij.openapi.externalSystem.autoimport.settings.BackgroundAsyncSupplier.supply$lambda$0(BackgroundAsyncSupplier.kt:18)
    at com.intellij.openapi.progress.impl.CoreProgressManager.lambda$runProcess$2(CoreProgressManager.java:186)
    at com.intellij.openapi.progress.impl.CoreProgressManager.lambda$executeProcessUnderProgress$13(CoreProgressManager.java:604)
    at com.intellij.openapi.progress.impl.CoreProgressManager.registerIndicatorAndRun(CoreProgressManager.java:679)
    at com.intellij.openapi.progress.impl.CoreProgressManager.computeUnderProgress(CoreProgressManager.java:635)
    at com.intellij.openapi.progress.impl.CoreProgressManager.executeProcessUnderProgress(CoreProgressManager.java:603)
    at com.intellij.openapi.progress.impl.ProgressManagerImpl.executeProcessUnderProgress(ProgressManagerImpl.java:60)
    at com.intellij.openapi.progress.impl.CoreProgressManager.runProcess(CoreProgressManager.java:173)
    at com.intellij.openapi.progress.util.BackgroundTaskUtil.lambda$submitTask$8(BackgroundTaskUtil.java:271)
    at java.base/java.util.concurrent.CompletableFuture$AsyncRun.run(CompletableFuture.java:1804)
    ... 12 more

This flaky failure is reported to be observable from time to time in
ijplatform_IjPlatform231_IntegrationPerformanceTestsKotlinEAPLinux

GitOrigin-RevId: c9f96f1fd279c93cdfaba2c4121acefefc4af464
2023-05-05 16:28:20 +00:00
Yahor Berdnikau
0d8b01a20d [Kotlin][Gradle] Update Kotlin dist downloader to use unbundled compiler plugins
Since Kotlin 1.9.0 we started to publish unbundled compiler plugins which should end up in the 'kotlin-dist-for-ide' cache. Now logic was updated to use newly published plugins.

^KTIJ-25384

GitOrigin-RevId: a242c71a2d83fcfad8a7881fa626d792f4d2f89e
2023-05-04 13:20:41 +00:00
Yahor Berdnikau
8f4235f079 [Kotlin][Gradle] Update Kotlin dist downloader to use unbundled compiler plugins
Since Kotlin 1.9.0 we started to publish unbundled compiler plugins which should end up in the 'kotlin-dist-for-ide' cache. Now logic was updated to use newly published plugins.

^KTIJ-25384

GitOrigin-RevId: 0b5fd82a4a688b7cd42f0cb048dd0cb4baa69311
2023-05-04 10:55:45 +00:00
Sebastian Sellmair
dabce8eeec [KTIJ-25223] Advance test KGP version to 1.9.20-dev-293
This build enables Multiplatform/Android SourceSetLayout V2 by default

GitOrigin-RevId: 322d3dbd521f5894fd400689a98e74edfee6a696
2023-05-03 14:18:47 +00:00
Pavel Kirpichenkov
0265609e7f [KTIJ-25223] Advance test KGP version to 1.9.0-dev-6976
GitOrigin-RevId: 3c61b9f9a1642f269b9aff5b3fa530202f6bc233
2023-05-03 14:18:46 +00:00
Vladimir Krivosheev
edfd1540a1 prefer sha3
GitOrigin-RevId: 31c3110fbab2fdca5a08d25c49481f322d533708
2023-05-02 19:58:23 +00:00
Pavel Kirpichenkov
2837588831 [KTIJ-25099] Advance test KGP version to 1.9.0-dev-4392
GitOrigin-RevId: 6535d1b14df6530a4f1875640a3456883b9e18d0
2023-03-30 16:21:14 +00:00
Pavel Kirpichenkov
31eab10f86 [KTIJ-25003] Advance test KGP version to 1.9.0-dev-3768
GitOrigin-RevId: 759ee48b90ecb6458dacf57764cda58488e4fe4e
2023-03-22 16:30:10 +00:00