azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
50,466 Commits 1 Branch 0 Tags
2af9efa4a098d87feb8370637bcfd62f3bbdc034
Commit Graph

241 Commits

Author SHA1 Message Date
Andrey Uskov dac4cb5d06 Fix source sets in all bunches except AS 33 in idea-android 2018-11-12 21:23:14 +03:00
Mikhail Glukhikh e597dda526 AndroidViewConstructorFix: do not reformat while creating constructor 
Before this commit, it was done by createDeclarationByPattern,
preventing later reformatting in addAnnotation

Related to KT-27945
 2018-11-07 11:56:54 +03:00
Mikhail Glukhikh 22fa9b6b92 AndroidViewConstructorFix: add white space after annotation explicitly 
This fixes Android formatter-related issue
#KT-27945 Fixed
 2018-11-02 19:51:44 +03:00
Andrey Uskov b9753164c9 Fix dependency resolution on model post-processing 
#KT-27265 Fixed
 2018-11-02 13:12:37 +03:00
Vyacheslav Gerasimov 4076923a26 as34: Apply changes from AS 3.3 2018-10-26 18:25:20 +03:00
Yan Zhulanow cd88209cf4 Fix Android Extension imports resolution after project reopening (KT-27793) 2018-10-25 23:10:41 +03:00
Yan Zhulanow ba53ba37b0 Replace bunch copies for some of build.gradle.kts files with a DSL 2018-10-24 20:12:30 +03:00
Alexey Sedunov cf31e4d58c MPP: Recover content root import accidentally removed earlier 2018-10-16 12:05:19 +03:00
Alexey Sedunov fea397a2ad MPP: Support MPP-dependent Java modules in Android projects 
#KT-27265 Fixed
 2018-10-16 12:05:19 +03:00
Alexey Sedunov d36ee02499 Gradle: Retrieve AndroidModuleModel using IdeModifiableModelsProvider 
Otherwise it may be null if module is just created by the import
 2018-10-16 12:05:18 +03:00
Alexey Sedunov 3a0e539eee MPP: Add MPP source roots to dependent non-MPP module 
#KT-27365 Fixed
 2018-10-16 12:05:18 +03:00
Alexey Sedunov ca2367f2b5 MPP: Rewrite ImportedModule name instead of wrapping it 
Otherwise this instance is not deserialized properly
breaking import on opening project in AS

 #KT-27485 Fixed
 #KT-27473 Fixed
 2018-10-16 12:05:17 +03:00
Alexey Sedunov b5d3520db9 MPP: Add MPP sources roots to dependent Android module 
#KT-27331 Fixed
 2018-10-02 11:18:09 +03:00
Alexey Sedunov c59779f5b9 MPP: Retain KotlinSourceSetInfo for Android in data nodes 
User data is not serialized which leads to broken import on reopening

 #KT-27213 Fixed
 2018-10-01 13:55:35 +03:00
Alexey Sedunov c183c5b36a MPP: Add dependencies for all source sets for a given Android variant 2018-10-01 13:55:31 +03:00
Alexey Sedunov 4f01a438c4 MPP: Add all android-targeted compilation source roots to the module 2018-09-25 15:05:43 +03:00
Alexey Sedunov 3a973973ce MPP: Create android source roots automatically when requested 
#KT-26764 Fixed
 2018-09-25 14:54:27 +03:00
Yan Zhulanow bc27cabb1a Call 'GradleProjectImportHandler's in MPP Gradle importer (KT-27006) 2018-09-24 17:54:23 +03:00
Alexey Sedunov 7b3973db52 MPP: Enable Android-specific content root logic for Android Studio 
#KT-26813 Fixed
 2018-09-14 21:27:10 +03:00
Alexey Sedunov 14d8425e27 MPP: Fix import of dependencies on Android modules 2018-09-14 14:51:01 +03:00
Alexey Sedunov 1de0dbd67d MPP: Configure Kotlin facets for Android modules 
#KT-26770 Fixed
 2018-09-14 14:51:01 +03:00
Ilya Gorbunov a18770fbbb Remove projectDist dependency helper usages 
Use default configuration dependencies instead of projectDist ones.
 2018-09-12 06:05:05 +03:00
Pavel V. Talanov ef915096a5 Common tests are discoverable via platform modules test classpath 
Introduce KotlinGradleOrderEnumerationHandler
    and patch KotlinAndroidGradleOrderEnumerationHandler:
    - If 'Android Support' plugin is off KAndroidGradleOEH will not be available and KGOEH will be used
    - Make KAndroidGOEH implement a different EP so it replaces KGOEH when it is available
 2018-09-12 04:13:32 +02:00
Yan Zhulanow c6b5e8c40f Minor: Extract code for checking Dalvik identifiers to frontend 2018-09-11 16:40:43 +03:00
Leonid Startsev 23fd0a6ec9 Split IDE part from kotlinx-serialization-compiler-plugin 2018-09-11 13:22:16 +03:00
Alexander Podkhalyuzin 720587abf3 Added DynamicallyLoaded annotation to AndroidDexWrapper 
#KT-25449 Fixed
 2018-09-10 13:26:12 +03:00
Mikhail Glukhikh 1fd4be580a Add native dependencies to idea-android module tests 2018-09-08 12:16:26 +03:00
Leonid Startsev dea69e4469 Integrate serialization plugin into big Kotlin plugin 
Split import handlers into multiple files
Add empty Maven handler for Android Studio

Add testRuntime dependency on kx-serialization-plugin for all modules which require compiler
plugins in test classpath
 2018-09-07 21:17:07 +03:00
Yan Zhulanow f55a52b86e MPP: Fix compatibility issue with Android Studio 3.3 Canary 7 
'TargetPlatformKind' is still used in AS 3.3 so we can't remove it entirely yet.
 2018-09-06 14:42:19 +03:00
Nicolay Mitropolsky d415ca9cf6 fixed nullability for various listeners update in 183 2018-08-31 17:20:54 +03:00
Yan Zhulanow d00f5b335a MPP: Refactoring, extract IDE platform kinds, allow to add custom platforms 2018-08-31 05:14:15 +05:00
Juan Chen 1a562d477a Add sync after Kotlin configured in Android Studio projects. 2018-08-24 22:07:36 +03:00
Alexey Sedunov c45608a46e MPP: Restore non-Android content roots dropped by AS3.1 2018-08-21 15:35:42 +03:00
Alexey Sedunov a5de065d7c MPP: Support Android platform in new model import 2018-08-21 15:35:42 +03:00
Alexey Sedunov b983c93930 MPP: Add ImportedModule for non-Android source set modules 
The goal is to work around model disposal service
which discards module data without ImportedModule instance
 2018-08-21 15:35:42 +03:00
Alexey Sedunov ecf607d4fa Gradle: Implement new MPP model import 2018-08-07 15:59:41 +03:00
Vyacheslav Gerasimov ebb90f8260 183: Build against 183-SNAPSHOT 2018-08-03 21:29:19 +03:00
Vyacheslav Gerasimov 0103c0d2fd Switch to 182 platform 2018-08-02 18:17:06 +03:00
Vyacheslav Gerasimov 2ec7c4fd0d Update platform versions for 181, 182, as32, as33 plugins 2018-07-31 19:27:23 +03:00
Nikolay Krasko c210d3d10a Minor: remove duplicated copyright comment 2018-07-25 19:52:26 +03:00
Nikolay Krasko 2d1fc4b798 Fix incompatibility because of KotlinGradleModelFacade change (KT-25713) 
AndroidGradleModelFacade was moved to android plugin in AS 3.3, so
now changes in KotlinGradleModelFacade should be binary compatible.

Current fix rewrite KotlinGradleModelFacade to Java because of default
methods.

Also current implementation abuses the fact that AndroidGradleModelFacade
don't use groupId parameter for getting library versions.

 #KT-25713 Fixed
 2018-07-25 19:52:25 +03:00
Yan Zhulanow 88422fb7ce Make source set empty for Android modules of deleting the resulting JAR files in 'ideaPlugin' task 2018-07-19 19:09:40 +03:00
Nikolay Krasko 86a33defd8 Refactoring: introduce parameter for getResolvedKotlinStdlibVersionByModuleData 2018-07-19 16:09:56 +03:00
Ilya Chernikov 7bff5e3ce7 Add missing tests dependencies on the renewed kotlin-scripting-idea plugin 2018-06-25 08:06:20 +02:00
Yan Zhulanow 4aa7a95055 Android Extensions: Explicitly check if the Android plugin is enabled (EA-104651) 
AndroidGradleOrderEnumerationHandler is defined in gradle.xml that doesn't depend on the Android plugin.
So we need to additionally check if the Android plugin is installed/enabled.
 2018-06-22 17:48:13 +03:00
Alexey Sedunov 70287ce974 Configuration: Use Android variant as source set name 
#KT-24839 Fixed
 2018-06-19 12:22:41 +03:00
Yan Zhulanow e57463e5fd 182: Fix compatibility with the Android plugin from AS 3.1 
(cherry picked from commit 0592121)
 2018-06-09 14:44:50 +03:00
Yan Zhulanow 3df6d63580 Minor: Fix compilation after unsuccessful rebase. Add back the isMultiplatformModule() method 2018-06-09 00:19:17 +03:00
Yan Zhulanow 386f05bb91 Fix "Run" action for Kotlin sources in non-Android modules 2018-06-08 19:37:18 +03:00
Alexey Sedunov 1650e69980 Configuration: Use 'plugins' block in generated/modified Gradle scripts 
#KT-20665 Fixed
 2018-05-23 16:39:20 +03:00