azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,238 Commits 1 Branch 0 Tags
21772d2a14b1237e352fe87a8d23a720a65dda43
Commit Graph

1238 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexey Sedunov 21772d2a14 Configuration: Introduce special source roots for non-JVM Kotlin modules 
#KT-5948 Fixed
 #KT-23672 Fixed

Original commit: 9fa26c83b6
 2018-05-18 12:09:40 +03:00
Vyacheslav Gerasimov 45a66c9c48 as32: Update to 181 platform api 
Original commit: 4adc0a94ab
 2018-05-10 23:28:41 +03:00
Vyacheslav Gerasimov a38eb5a483 Build: Extract jps-common ide module from kotlin-plugin.jar to standalone jar 
Original commit: f2b323fbe3
 2018-05-08 21:49:08 +03:00
Sergey Rostov e4d51df269 jps (refactor): reimplement KotlinModuleBuildTarget data binding using CompileContext 
Original commit: 9fafe0473c
 2018-05-04 11:14:45 +03:00
Sergey Rostov 96725b1e36 jps: common modules metadata compiler 
(cherry picked from commit cde333d)

Original commit: 91b703d529
 2018-05-04 11:05:13 +03:00
Sergey Rostov ffd77601ca jps: minor: refine kotlin.jps.model package 
(cherry picked from commit 2a31e78)

Original commit: 41dcc9ad4d
 2018-05-04 11:05:12 +03:00
Sergey Rostov 64afafe65e jps: Refactor module/project settings getters/setters 
(cherry picked from commit d29ffa0)

Original commit: a390fc36e2
 2018-05-04 11:05:12 +03:00
Sergey Rostov ef5d8435b6 jps(refactor): Extract platform related code 
#KT-23656 Fixed

(cherry picked from commit 18a751d)

Original commit: 75e6be7802
 2018-05-04 11:05:12 +03:00
Nikolay Krasko c7fe4c10bf Remove files introduced in 181 from 173 branch 
Original commit: c83ff5e75f
 2018-04-27 19:45:23 +03:00
Vyacheslav Gerasimov e50fca68fb Cleanup .181 bunch files 
Original commit: 8c88ac69df
 2018-04-27 18:25:21 +03:00
Vyacheslav Gerasimov 440d218436 Switch to 181 platform 
Original commit: bc403ce744
 2018-04-27 18:25:17 +03:00
Denis Zharkov f4d5649cd5 Replace default-type dependencies to :kotlin-stdlib with distJar 
Use distJar configuration instead.
It's necessary because currently when using default-type, subproject
starts having a transitive dependency to :kotlin-stdlib-common
and that leads to exception from KT-20897 when building light classes

This change might be reverted once KT-23942 is fixed

 #KT-23942 Submitted

Original commit: 003f381fcd
 2018-04-26 16:11:27 +03:00
Alexey Tsvetkov bdd795200c Make assertion message more readable in JPS test 
The test was failing recently on CI, but assertion message
does not give enough info: arrays' sizes are not equal,
so there were extra warnings, but what they were?

Original commit: adc3e61742
 2018-04-22 23:05:59 +03:00
Zalim Bashorov 1ad96a7db9 Regenerate tests 
Original commit: ab03ab84bb
 2018-04-19 13:17:27 +03:00
Vyacheslav Gerasimov d357b9b008 as32: Remove JavaBuilderExtension from AS 3.2 C10 
Original commit: 16b314f860
 2018-04-13 21:33:16 +03:00
Vyacheslav Gerasimov 589f7c8680 as32: Remove platform-api & platform-impl from build scripts 
since they are not present in AS 3.2 C10

Original commit: a6bd0f618e
 2018-04-13 21:33:14 +03:00
Vyacheslav Gerasimov b4827b5a68 as32: Update to AS 3.2 C10 
Original commit: 4299455dc1
 2018-04-13 21:33:03 +03:00
Alexey Tsvetkov 1ce361e90b Use KotlinCoreEnvironment for parsing Kotlin in IC 
Creating and disposing CoreApplicationEnvironment on each call leads to
problems with parallel builds, while KotlinCoreEnvironment
avoids disposing application environment in case of parallel builds.

    #KT-23694 fixed

Original commit: bd50ad87ba
 2018-04-11 19:56:15 +03:00
Alexey Tsvetkov ca18e9871a 181: Reimplement constant search in JPS 
The API in Intellij have been changed after the PR was merged
(see https://github.com/JetBrains/intellij-community/commit/8227d8e2dd4d98d2ff248a1b193ba31831ddef50)

This commit implements new API.
Also mocked Kotlin constant search is removed from JPS tests.
Mocked Java search is in place, but now
it is does not use hardcoded file and constant names.

   #KT-16091 fixed

Original commit: 39f7ecc9a3
 2018-04-11 16:28:38 +03:00
Vyacheslav Gerasimov 6156064a47 181: Fix dependencies for 181 
Original commit: a0e20eefc6
 2018-04-11 16:28:29 +03:00
Simon Ogorodnik a50245db81 as31: Remove dependencies on jps/test 
Original commit: e9caa54afa
 2018-04-11 16:28:18 +03:00
Nikolay Krasko 0e3c3859e9 172: [Tests] Revert "Modify incremental test in 173 branch - files are not create anymore" 
This reverts commit 0cc5d163d7d620565a28681dab31f3d3061a1324.

Original commit: 4c8f366e46
 2018-04-11 16:27:56 +03:00
Vyacheslav Gerasimov 9164f7d2cb Remove explicit jar specification from ide modules build scripts 
They often change between ide versions and difficult to maintain

Original commit: 7c02d55b23
 2018-04-09 21:47:48 +03:00
Alexander Udalov 1fa4171942 Enable all Java 9 tests 
Original commit: d2ed73eb78
 2018-04-05 12:38:48 +02:00
Alexey Tsvetkov a47d5434f3 Use daemon if available for parsing files in JPS 
Original commit: 6f59b6da8e
 2018-04-03 21:11:12 +03:00
Alexey Tsvetkov 88c4f73e3c Invalidate usages of removed classes before round 
#KT-23165 fixed

Original commit: 3eb968807e
 2018-04-03 21:11:12 +03:00
Alexey Tsvetkov 3174c9b05e Convert KotlinSourceFileCollector: simplify after conversion 
Original commit: 8cd0f13f2b
 2018-04-03 21:11:11 +03:00
Alexey Tsvetkov 4cd2068ebc Convert KotlinSourceFileCollector: actual conversion 
Original commit: 3f36f472b3
 2018-04-03 21:11:11 +03:00
Alexey Tsvetkov fbe7dc02f6 Convert KotlinSourceFileCollector: rename file 
Original commit: 336d63c0a3
 2018-04-03 21:11:11 +03:00
Alexey Tsvetkov a4a45b59df Remove usages of deprecated API 
Original commit: bd779cb26e
 2018-04-03 21:11:11 +03:00
Alexey Tsvetkov 5159795c48 Replace reflection with direct call 
Original commit: 58e4b704c6
 2018-04-03 21:11:11 +03:00
Alexey Tsvetkov 06044f0100 Convert CompilerRunnerUtil: actual conversion 
Original commit: fa9c80e05c
 2018-04-03 21:11:11 +03:00
Alexey Tsvetkov 90920f9b7a Convert CompilerRunnerUtil: rename file 
Original commit: f27b6c0d8d
 2018-04-03 21:11:11 +03:00
Alexey Tsvetkov d849d47e22 Reformat jps-plugin module 
Original commit: 455fe7fe61
 2018-04-03 21:11:11 +03:00
Alexey Sedunov 78ee6ba693 JS: Use the same output paths for JPS and Maven-based builds 
#KT-22586 Fixed

Original commit: ae37cc30a1
 2018-04-02 15:28:35 +03:00
Anton Bannykh a4fd51a823 Merge kotlin-experimental into kotlin standard library (KT-23055 fixed) 
* kotlin-experimental.js has been already merged into kotlin.js
* change library name to kotlin in kotlin-experimental.meta.js in order to produce correct require calls
* concatenate kotlin-experimental.meta.js with kotlin.meta.js
* suppress multiple module declaration warning for such use case

Original commit: 7b860eab36
 2018-03-26 23:13:28 +03:00
Alexey Tsvetkov 8a9c76588d Use Plugins DSL in Kotlin Gradle scripts 
When plugins DSL is used, there is no need to
manually generate typesafe accessors for extensions and
conventions (by running `./gradlew kotlinDslAccessorsSnapshot`).

Original commit: 8a82c1618c
 2018-03-26 16:09:29 +03:00
Mikhail Zarechenskiy f7d30600a1 Refactoring: rename parameter to argument for annotation diagnostics 
Original commit: 4ebd11a7ae
 2018-03-22 03:59:55 +03:00
Alexey Tsvetkov 9a0b91ef31 IC: add destination dir to start of classpath instead of end 
Otherwise IC fails when a project declares a class with the same name
as in one of its dependencies.
The issue is relevant only for non-JPS IC (Gradle, Maven, etc.),
but I added the test for JPS too.

  #KT-20516 fixed

Original commit: 605bcc66a1
 2018-03-21 18:44:42 +03:00
Alexey Tsvetkov f94a2d688d Report correct source to output mapping for kjsm files 
Now IC can correctly remove kjsm files when source files are changed

Original commit: 2584143e92
 2018-03-19 18:04:33 +03:00
Zalim Bashorov 1772be8ca5 Fix copyright's start year in generated tests 
Original commit: 9970dd051f
 2018-03-14 15:04:58 +03:00
Alexander Udalov 55d5c602ae Move essential metadata-related classes to 'metadata' and 'metadata.jvm' 
Original commit: 3f3e05a9d2
 2018-03-14 12:25:16 +01:00
Alexander Udalov 5f88fbcd3f Remove dependency of NameResolverImpl on FqName 
Remove AbstractJsProtoComparisonTest.getProtoData in favor of
(apparently copy-pasted) IncrementalJsCache.getProtoData

Original commit: b07c6086cd
 2018-03-14 12:25:12 +01:00
Alexander Udalov 8845f7051b Make NameResolver.getClassId extension instead of member 
To get rid of dependency of NameResolver on ClassId

Original commit: e31f286444
 2018-03-14 12:25:11 +01:00
Alexander Udalov 470c4eea57 Move ProtoBuf classes to package org.jetbrains.kotlin.metadata 
Original commit: 27ad4f7d5d
 2018-03-14 12:25:10 +01:00
Alexey Tsvetkov b3a619bcc3 Revert "Provide custom ConstantAffectionResolver in JPS" 
This reverts commit 1a7737494b.

The API in Intellij was changed, now the issue can be fixed only in
182.* branches.

Original commit: 0deec7983d
 2018-03-13 21:26:11 +03:00
Alexey Sedunov 0a3b3056d8 MPP: Support multiple 'expectedBy' dependencies for single module 
#KT-22865 Fixed

Original commit: d9aa1796cd
 2018-03-07 18:34:03 +03:00
Yan Zhulanow 4d1a929809 Add Pill support to compiler and IDE modules 
Original commit: 34d1611ed4
 2018-03-02 03:15:17 +03:00
Ilya Gorbunov 08f6569827 Move deprecated kotlin-runtime and reduced runtime for tests into stdlib 
Rename mock-runtime-for-test project to kotlin-stdlib:jvm-minimal-for-test

Original commit: 5c0cc5f799
 2018-02-26 17:11:11 +03:00
Alexey Tsvetkov 1bb8ec4973 Perform a test lookup before build 
#KT-22535 fixed
   #KT-22995 fixed

Original commit: d7644559eb
 2018-02-22 18:21:37 +03:00