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

1328 Commits

Author SHA1 Message Date
Ilya Chernikov 439622187f Move Jsr223 engine from compiler jar to script-util.jar (libraries part) 2016-10-12 15:37:50 +02:00
Ilya Chernikov fe69185cd4 Refactor script definition and related parts: 
- simplify script definition interface, convert it to class
 - create simple definitions right from base
 - refactor (rename and simplify) script definition with annotated template
 - simplify usages of script definition in many places
 2016-10-12 15:37:50 +02:00
Ilya Chernikov 1a137357e5 Add support for custom script compilation and execution to maven plugin, add simple test, relevant refactorings on the compiler side 2016-10-12 15:37:49 +02:00
Ilya Chernikov f992f91686 Add kotlin-script-util lib with tests 
- collection of standard templates and resolvers
 2016-10-12 15:37:48 +02:00
Alexander Udalov 167ab1f860 Introduce "-api-version" CLI option 
The `@SinceKotlin("X.Y.Z")` annotation now hides a particular declaration from
resolution when the API version specified by the `-api-version` option is
_less_ than X.Y.Z. The comparison is performed as for versions in Maven:
MavenComparableVersion is in fact a copy of
org.apache.maven.artifact.versioning.ComparableVersion.

Also support "!API_VERSION" directive in diagnostic tests

 #KT-14298 Fixed
 2016-10-11 17:46:01 +03:00
Alexander Udalov 8d660c2f6e Refactor gradle option generation mechanism 
Ensure there's a statically checked dependency on LanguageVersion and
JvmTarget, so that this information is updated automatically once a new
language version or a JVM target is added
 2016-10-11 17:30:15 +03:00
Ilya Gorbunov a239231c75 Revert dropping inline-only extensions for Throwable, to be able to use runtime of 1.1 with language version of 1.0 which makes mapped builtin members unavailable again. 
#KT-14213 Fixed
 2016-10-11 16:46:14 +03:00
Yan Zhulanow f15f90a719 Kapt: Support apt options (KT-13984) 
(cherry picked from commit b566a37)
 2016-10-07 16:28:31 +03:00
Yan Zhulanow 49926fda36 Use LightParameter from Kotlin light classes to add an inner class constructor parameter instead of calling addParameter(name, type). The latter tries to load an icon :( (KT-13798) 
(cherry picked from commit cc86d79)

(cherry picked from commit de55de2)
 2016-10-07 16:28:21 +03:00
Denis Zharkov 828ff87db4 Update rendered stdlib public API 
Many redundant methods were optimized out in the previous commits
 2016-10-07 11:59:15 +03:00
Alexey Tsvetkov 5fa561eb70 Add test for freeCompilerArgs in kotlin options for Gradle 2016-10-05 22:50:46 +03:00
Alexey Tsvetkov 0944e9076d Add 1.1 language version to kotlin options for Gradle 2016-10-05 22:50:46 +03:00
Alexey Tsvetkov 7d657a8c58 Don't warn about absence of kotlin files 
#KT-10401 fixed
 2016-10-05 22:50:46 +03:00
Alexey Tsvetkov a474d75fe2 Avoid exception when getting relative path 
#KT-14056 fixed Target versions 1.0.5
 2016-10-05 22:50:46 +03:00
Alexey Tsvetkov d293138c28 Refactoring: use same module name as Intellij 2016-10-05 22:50:46 +03:00
Alexey Tsvetkov 0d8fa69760 Refactoring: move gradle tests imported from jps to separate dir 
This will allow skipping jps tests when running all tests in directory from Intellij
 2016-10-05 22:50:46 +03:00
Alexey Tsvetkov 1cc423b163 Refactoring: move gradle integration tests to separate module 2016-10-05 22:50:46 +03:00
Alexey Tsvetkov 8cc384a6dd Refactoring: specify internal visibility where possible 2016-10-05 22:50:46 +03:00
Alexey Tsvetkov 617bc6c296 Refactoring: use daemon by default in gradle tests 2016-10-05 22:50:46 +03:00
Alexey Tsvetkov b3ed04230d Refactoring: cleanup build.gradle files in tests 2016-10-05 22:50:46 +03:00
Alexey Tsvetkov 11d971c4bf Refactoring: extract kotlin_version constant for gradle tests 2016-10-05 22:50:46 +03:00
Alexey Tsvetkov 18ffb974c7 Refactoring: cleanup after merge 2016-10-05 22:50:46 +03:00
Alexey Tsvetkov 139cead7b4 Refactoring: merge modules 'kotlin-gradle-plugin-dsl', 'kotlin-gradle-plugin-core' into 'kotlin-gradle-plugin' 2016-10-05 22:50:46 +03:00
Alexey Tsvetkov 892fc63fd1 Generate gradle options from compiler arguments 
#KT-13633 fixed
 2016-10-05 22:50:46 +03:00
Alexey Tsvetkov 2c34088859 Track changes in java files generated by kapt2 
#KT-13500 fixed
 2016-10-05 22:50:46 +03:00
Ilya Gorbunov 0180c614c0 Add parent pom reference to idl2k module. 
Tie kotlin-version of dependencies to the version of parent project being built.
 2016-10-01 01:19:15 +03:00
Ilya Gorbunov 282629f618 Remove overrides of equals and hashCode from AbstractCollection and AbstractMap.values, making the equality referential again. 2016-09-28 22:06:03 +03:00
Ilya Gorbunov 7dde8df9ae Make mutation methods in AbstractMutable-collections abstract rather than implement them unsupported. 2016-09-28 22:06:03 +03:00
Ilya Gorbunov 38f030dce4 Split AbstractMap into readonly and mutable. 2016-09-28 22:06:03 +03:00
Ilya Gorbunov a5c0f11d60 Split AbstractCollection, List, Set in JS to readonly Abstract[Collection] and mutable AbstractMutable[Collection]. 
Update compatibility type aliases.
 2016-09-28 22:06:03 +03:00
Ilya Gorbunov 2bb1d6d5b4 Provide implementation of read-only AbstractCollection, AbstractList and AbstractSet, 
Alias AbstactMutableCollection to java.util.AbstractCollection.
Change inheritance hierarchy of reversed list views.
 2016-09-28 22:06:03 +03:00
Ilya Gorbunov e342593d2e Flatten HashMap hierarhy, provide string-keyed map and set specializations. 2016-09-24 07:08:21 +03:00
Ilya Gorbunov 75069143c7 Rewrite ArrayList, AbstractList, AbstractCollection in kotlin. 
AbstractList is imported from GWT.
#KT-12386
 2016-09-24 07:08:21 +03:00
Ilya Gorbunov 47be8e664a Minor: replace var with val. 2016-09-22 22:28:14 +03:00
Ilya Gorbunov 2c0edf6652 Fix working directory where CompilerSmokeTest runs to be 'project.build.directory', otherwise it may vary depending on maven goals invoked. 2016-09-22 21:59:10 +03:00
Ilya Gorbunov f60447328d Remove snapshot repository from idl2k module. 2016-09-22 21:52:33 +03:00
Alexey Tsvetkov fc6773a416 Print gradle output only if test is failed 2016-09-22 20:43:01 +03:00
Mikhail Zarechenskiy 46ef1920d6 Update API listing after changes in runtime.jvm 2016-09-20 18:44:39 +03:00
Alexey Tsvetkov 7b99730e39 Test that typealias works with Gradle 
#KT-13204 Obsolete
 2016-09-14 18:30:02 +03:00
Alexey Tsvetkov a04d60406b Fix snapshot version in gradle tests 2016-09-14 14:13:59 +03:00
Alexey Tsvetkov 1bac872047 Do not try to remove source annotations from not .class file 2016-09-14 13:53:35 +03:00
Alexey Tsvetkov d2677c0500 Change directory for sync task cache #KT-13732 fixed 2016-09-14 13:53:08 +03:00
Alexey Tsvetkov 508b965d88 Minor: fix gradle plugin order in test 2016-09-14 13:53:04 +03:00
Alexey Tsvetkov 6ebb50751c Remove source annotations when copy class with kapt2 
Writing source annotations enables incremental compilation for kapt2.
However they are not needed in bytecode, so we remove them when
copying classes.

# Conflicts:
#	compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt
#	compiler/frontend.java/src/org/jetbrains/kotlin/config/JVMConfigurationKeys.java
 2016-09-14 13:52:56 +03:00
Alexander Udalov 4d7d70db19 Regenerate public API reference after changes in runtime.jvm 2016-09-13 14:12:32 +03:00
Yan Zhulanow 78a4e90132 Minor: Fix Maven plugin compilation (configuration parameter is not required now in analyzeAndGenerate(), cherrypick problem) 2016-09-12 19:07:57 +03:00
Yan Zhulanow 261a300299 Do not dex kapt2 test classes (it consumes too much memory while RR) 
(cherry picked from commit 54f7ac4)
 2016-09-10 17:36:54 +03:00
Yan Zhulanow 015130832b Kapt: allow to use Kapt from compileBunchOfSources() 2016-09-10 17:36:53 +03:00
Yan Zhulanow 30a29eaa46 Minor: Fix Gradle tests, update Kotlin artifact version to 1.1 2016-09-10 17:36:15 +03:00
Yan Zhulanow 00355f3c52 Kapt: Remove generated output directory each time before annotation processing 
(cherry picked from commit c4b772a)
 2016-09-10 17:36:15 +03:00