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

269 Commits

Author SHA1 Message Date
Nikolay Krasko b856d60575 Add required plugins for Android Studio 3.6 to runtime 2019-09-02 15:14:32 +03:00
Nikolay Krasko 8ae4293a0f Remove 181 branch from build scripts 
#KT-33536 Fixed
 2019-08-30 12:14:54 +03:00
Nikolay Krasko 0ae9240e5f Remove 182 and AS33 from build scripts 
#KT-33536 Fixed
 2019-08-30 12:14:50 +03:00
Nikolay Krasko 4d0fc1dc22 Remove 182 support 
#KT-33536 Fixed
 2019-08-30 12:13:44 +03:00
Andrey Uskov 89a53fe028 Safe get of registry key in KotlinAndroidGradleMPPModuleDataService 2019-07-26 09:33:56 +03:00
Andrey Uskov 584d441587 Fix import when android gradle plugin is involved in IDEA 183 
All dependencies on MPP modules are added in KotlinAndroidGradleMPPModuleDataService
including transitive ones. Fixes KT-30510 in IDEA 183 and below
 2019-07-26 01:18:29 +03:00
Andrey Uskov db743aa6e8 Calculation of supported platforms in AndroidSourceSetDataService fixed 
for IDEA versions 183 and below.
A deep copy of MPP model for Android source sets is created
 2019-07-22 16:06:03 +03:00
Andrey Uskov 1f17ff5d38 Fix compilation of KotlinAndroidGradle MPPModuleDataService 
in bunch 182
 2019-06-13 20:31:12 +03:00
Dmitry Savvinov 716e55d171 [Compatibility] Restore KotlinProjectConfugirator.getTargetPlatform() 2019-05-28 13:08:09 +03:00
Dmitry Savvinov d5fbe59a3e [Platform API] Introduce fundamental abstraction of Platform 
This is a large commit, which introduces general API for working with
abstraction of Platform.

- Add new abstraction to 'core' - SimplePlatform - which represents
exactly one platform
  - Clients are strongly prohibited to create instances of SimplePlatform
  by hand, instead, corresponding *Platforms abstraction should be used
  (e.g. JvmPlatforms, JsPlatforms, KonanPlatforms)

- Move TargetPlatform to 'core', it represents now a collection of
SimplePlatforms
  - Clients are strongly encouraged to use TargetPlatform
    (not SimplePlatform) in API, to enforce checks for multiplatform

- Provide a helper-extensions to work with TargetPlatform
(in particular, for getting a specific component platform)

- Remove MultiTargetPlatform in favour of TargetPlatform
  - Notably, this commit leaves another widely used duplicated abstraction,
    namely, IdePlatform. For the sake sanity, removal of IdePlatform is
    extracted in the separate commit.
 2019-05-28 13:08:07 +03:00
Igor Yakovlev f044d654f0 Fix KotlinLintTest.parcel test 
Added plugin classpath of android compiler extensions to module facet
 2019-05-20 19:54:46 +03:00
Dmitry Gridin 37c856290f Fix minor compile warnings 2019-04-25 19:47:39 +07:00
nikita.movshin 65244b4bea Update copyright. 
Change the copyright from "JetBrains s.r.o." to
"JetBrains s.r.o. and Kotlin Project contributors"
Update only 2 lines copyright.
 2019-04-23 20:09:22 +03:00
Vyacheslav Gerasimov 2bc11cbd58 Remove as32 bunch files 2019-04-23 17:28:41 +03:00
Vyacheslav Gerasimov 952d2b6287 Remove 181 bunch files 2019-04-23 17:28:41 +03:00
Mikhael Bogdanov 0d3f03a15a Support parallelization in another IDE tests 2019-04-17 11:22:18 +02:00
Andrey Uskov 364274ef90 Fix setting production-on-test flags in MPP projects 
#KT-29854 Fixed
 2019-04-17 00:17:21 +03:00
Vyacheslav Gerasimov d554b5aafa Build: Embed projects not published to maven into kotlin-plugin.jar 2019-04-10 17:54:05 +03:00
Andrey Uskov 59bcd608a1 Minor. Remove useless code related to IJ 173 and AS 3.1 in build scripts 2019-02-17 12:29:01 +03:00
Yan Zhulanow 9729932fe4 191: Update Android plugin changes to AS33 (KT-29847) 2019-02-13 16:35:46 +03:00
Vyacheslav Gerasimov 13d87e8eae Remove as31 bunch files 2019-01-14 21:29:02 +03:00
Vyacheslav Gerasimov 818910267e Remove 173 bunch files 2019-01-14 21:29:02 +03:00
Mikhael Bogdanov e963c52c80 Update copyright in generated non-compiler tests 2019-01-02 13:34:03 +01:00
Yan Zhulanow f5bb9d5866 Remove Lint tests for annotation argument API check. 
Looks like newer Lint API checker ignores type usage in annotations, so these tests are no more needed.
 2018-12-12 21:40:45 +09:00
Vyacheslav Gerasimov d84c5b1608 Switch to 183 platform 2018-12-06 20:16:58 +03:00
Andrey Uskov c85f56a0a8 Remove some bunches for build scripts. 2018-12-06 19:44:09 +03:00
Sergey Rostov df2e4524d7 Move resources from /src to separate /resources directory. 
Previously this files was stored in /src directory and was included in
resources mainly by SourceSet.projectDefault from sourceSets.kt:

val processResources = tasks.getByName(processResourcesTaskName) as ProcessResources
processResources.from("resources") { include("**") }
processResources.from("src") { include("META-INF/**", "**/*.properties") }

Also there are some custom rules like this:

resources.srcDir("../idea-analysis/src").apply { include("**/*.properties") }
resources.srcDirs("idea-repl/src").apply { include("META-INF/**") }

All this rules are synthesized in script
https://github.com/snrostov/kotlin-migrate-resources/blob/master/src/main/kotlin/main.kt

This commit created using that script. See README.md for more details on
 script.
 2018-11-30 15:01:01 +03:00
Simon Ogorodnik 7f0fcf7ef1 CLion/AppCode: Do not import sourceSets with unsupported platforms 2018-11-23 22:27:22 +07:00
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