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

175 Commits

Author SHA1 Message Date
Zalim Bashorov ab03ab84bb Regenerate tests 2018-04-19 13:17:27 +03:00
Nikolay Krasko ecd2db3b48 Remove bunch files that are equal to base files 2018-04-16 15:55:53 +03:00
Vyacheslav Gerasimov 4299455dc1 as32: Update to AS 3.2 C10 2018-04-13 21:33:03 +03:00
Alexey Sedunov 0647ffca36 MPP: Show error popups for module names in the New Kotlin/Multiplatform wizard 
#KT-23261 Fixed
 2018-04-13 20:23:08 +03:00
Vyacheslav Gerasimov 283ac840c2 181: Add smali plugin required by android plugin to test runtime 2018-04-11 16:28:29 +03:00
Nicolay Mitropolsky 0f6df38211 as31: fixup: Kotlin Facet: Configure facet based on Android build variant (in AS) 2018-04-11 16:28:22 +03:00
Vyacheslav Gerasimov e2578b6a17 as31: Add smali plugin required by android plugin to test runtime 2018-04-11 16:28:21 +03:00
Vyacheslav Gerasimov fd0045cf6b as31: Fix build scripts for AS 3.1 2018-04-11 16:28:21 +03:00
Vyacheslav Gerasimov c78c82a366 as31: Fix GradleFacetImportTest for AS 2018-04-11 16:28:20 +03:00
Alexey Sedunov 6636c4376b as31: Kotlin Facet: Configure facet based on Android build variant (in AS) 
#KT-19958 Fixed
 2018-04-11 16:28:18 +03:00
Dmitry Jemerov abce7170be as31: Implement ConvertJavaToKotlinProvider 
(cherry picked from commit 34dfa24)
 2018-04-11 16:28:17 +03:00
Dmitry Jemerov 686d8a1756 as31: Compilation fixes for as24 2018-04-11 16:28:16 +03:00
Vyacheslav Gerasimov 7c30e80382 as31: Kotlin Facet: Configure facet on Gradle project sync in Android Studio 2.3 
#KT-15909 Fixed

(cherry picked from commit 6a490bc681f968ee209580f683804b1ee3baee96)
 2018-04-11 16:28:14 +03:00
Vyacheslav Gerasimov 6bca651848 as31: Fix compilation for Android Studio 2.4 2018-04-11 16:28:14 +03:00
Natalia Selezneva 5ba337e998 172: Replace missing property from GradleConstants 2018-04-11 16:28:13 +03:00
Nikolay Krasko 368dd193ac 172: Revert "Fix compilation after moving to idea 173" 
This reverts commit fe121cc6aeadf63ca2c2819c9c7df59cc81caf5d.
 2018-04-11 16:28:02 +03:00
Nikolay Krasko fbed7f9c08 172: Restore compilation against Idea 172 
Revert "Fix proguard settings for 173"
4dadae2e9c8419bfda9d77f56797e68edbd8ecd7.

Revert "Fix compilation in 173"
0633aa925c8e862519ae699e5e3fe81a2bd227c2.

Revert "Fix compilation (MockParameterInfoUIContext.java)"
01a7fbfb60d786c56c54f4fd77d9f1233f599ede.

Revert "Fix compilation"
043a5dac796f6bf92bbe6c9573c1af07fadcfe4e.

Revert "Fix compatibility with BuildScriptDataBuilder API changes"
c7df054d0e90a86fbe67f23802e9be49b2117ded.
 2018-04-11 16:28:02 +03:00
Nikolay Krasko 1dcaaf1fe4 172: Revert "Fix GradleNoduleBuilder use qualified names check" 
This reverts commit aec020a404d367195d58c7bb5d30185bfb85f202.
 2018-04-11 16:28:01 +03:00
Nikolay Krasko 47df9bc428 172: Revert "Drop new Kotlin Dsl gradle project wizard which has been merged to idea" 
This reverts commit 742d337ad722fe6ddcd6ad5dab27d52eda970489.
 2018-04-11 16:27:59 +03:00
Nikolay Krasko b56a0550a4 172: Revert "Fix formatting for new kotlin dsl gradle project build script" 
This reverts commit 75a46e66d18f69ff196749ba436b572b4462ea0d.
 2018-04-11 16:27:59 +03:00
Vyacheslav Gerasimov 7c02d55b23 Remove explicit jar specification from ide modules build scripts 
They often change between ide versions and difficult to maintain
 2018-04-09 21:47:48 +03:00
Alexey Sedunov 6c7959dd54 Configuration: Put 'buildscript' block before 'plugins' in build.gradle 
#KT-23588 Fixed
 2018-04-05 18:18:01 +03:00
Ilya Chernikov 3f22e28a51 Implement basic support of the new scripting in the frontend and plugin 2018-04-04 16:23:54 +02:00
Natalia Selezneva 3d73786e98 Highlight scripts according to ScriptLocation annotation in ScriptDefinition 2018-03-30 14:43:17 +03:00
Natalia Selezneva f52441d64e Do not show "Gradle Project needs to be imported" notification for gradle script if only spaces are added 2018-03-30 14:43:17 +03:00
Nikolay Krasko 70d236cb8d Always configure "idea.home.path" system variable 
When TestLoggerFactory is initialized in tests it checks that variable
and it it's not present uses classpath to search for logger configuration.

If this search is unsuccessful a lot of exceptions are written to log:

java.lang.RuntimeException: Could not find installation home path. Please make sure bin/idea.properties is present in the installation directory.
     	at com.intellij.openapi.application.PathManager.getHomePath(PathManager.java:96)
     	at com.intellij.testFramework.TestLoggerFactory.reconfigure(TestLoggerFactory.java:67)
 2018-03-29 19:49:00 +03:00
Alexey Tsvetkov 8a82c1618c 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`).
 2018-03-26 16:09:29 +03:00
Natalia Selezneva 3b11b890e9 Set FATAL severity for errors from GradleScriptTemplateProvider 2018-03-21 16:51:53 +03:00
Natalia Selezneva 1f75eaed9a Don't highlight gradle scripts during gradle import. 
Show warning on the top panel for these files
 2018-03-17 00:21:25 +03:00
Natalia Selezneva 5f1118e820 Don't highlight scripts if resolver returns Failure. 
Note that we don't highlight script when ScriptDependenciesFileAttribute is not set.
 2018-03-17 00:21:17 +03:00
Natalia Selezneva 26a4b67fa3 Introduce default ScriptTemplate for Gradle scripts 
^KT-23228 Fixed
 2018-03-17 00:21:02 +03:00
Alexey Sedunov b7d79cc146 Gradle: Do not resolve sourcesets in projects with Android module 2018-03-15 13:17:43 +03:00
Natalia Selezneva 2486be0f86 'Configure kotlin' should set 1.2-SNAPSHOT version in build.gradle for snapshot version of kotlin plugin 2018-03-14 16:08:33 +03:00
Zalim Bashorov 9970dd051f Fix copyright's start year in generated tests 2018-03-14 15:04:58 +03:00
Nikolay Krasko 7174b31756 Fix GradleConfiguratorTest.kt compilation 2018-03-13 17:42:40 +03:00
Nikolay Krasko 57aaf0444f Add support for "implementation" gradle directive (KT-21746) 
#KT-21746 Fixed
 2018-03-13 15:52:19 +03:00
Nikolay Krasko 9004cdfa45 Reformat: idea-gradle module 2018-03-13 15:52:18 +03:00
Dmitry Jemerov b4fb0e0305 Further reduce number of calls to getConfigurableModulesWithKotlinFiles 
Also handle INRE and requeue check
 2018-03-13 12:29:16 +01:00
Dmitry Jemerov fa39cec94b Avoid duplicate scan of modules with Kotlin files (KT-23183) 2018-03-13 12:29:16 +01:00
Mikhail Glukhikh 71a6827b1c MPP wizard step refactoring: use UI layout DSL 2018-03-07 19:07:56 +03:00
Mikhail Glukhikh ea4b04780c MPP wizard fix: remove non-existing modules from settings.gradle 2018-03-07 19:07:56 +03:00
Mikhail Glukhikh 1d0c5413de MPP wizard: add combobox selecting common module position + extra checks 
So #KT-23097 Fixed
 2018-03-07 19:07:55 +03:00
Mikhail Glukhikh 879779ec0d MPP wizard: take default JDK from default project template 
Related to KT-23097
 2018-03-07 19:07:55 +03:00
Mikhail Glukhikh 4f2701385d MPP wizard: set sourceCompatibility / jvmTarget for JVM module 
Related to KT-23097
 2018-03-07 19:07:55 +03:00
Alexey Sedunov d9aa1796cd MPP: Support multiple 'expectedBy' dependencies for single module 
#KT-22865 Fixed
 2018-03-07 18:34:03 +03:00
Mikhail Glukhikh 2eddce57ff MPP wizard: add combo-box with JDK for JVM platform, if any 
Related to KT-23097
 2018-03-06 14:32:31 +03:00
Mikhail Glukhikh 2108634ddb MPP wizard: add check-boxes to create JVM / JS module 
Related to KT-23097
 2018-03-06 14:32:31 +03:00
Mikhail Glukhikh cc8a2b3123 MPP wizard: add common module at the same level with platform ones 
Related to KT-23097
 2018-03-06 14:32:31 +03:00
Mikhail Glukhikh 720c84d1d6 Fix style: KotlinGradleMultiplatformWizardStep 2018-03-06 14:32:31 +03:00
Yan Zhulanow df88acaefd Get rid of test-to-production dependencies as it's not supported in plain IDEA projects 2018-03-02 03:15:24 +03:00