Commit Graph

209 Commits

Author SHA1 Message Date
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
Vyacheslav Gerasimov c1f5ebb28e as32: Fix usages of AppResourceRepository in AS 3.2 C14 plugin 2018-05-10 23:28:41 +03:00
Vyacheslav Gerasimov 838f1f91fc Build: Extract android ide modules from kotlin-plugin.jar to standalone jars
So we could exclude them in IDEs which don't have android plugin (AppCode, CLion)
2018-05-08 00:26:04 +03:00
Nikolay Krasko c83ff5e75f Remove files introduced in 181 from 173 branch 2018-04-27 19:45:23 +03:00
Vyacheslav Gerasimov 8c88ac69df Cleanup .181 bunch files 2018-04-27 18:25:21 +03:00
Vyacheslav Gerasimov bc403ce744 Switch to 181 platform 2018-04-27 18:25:17 +03:00
Zalim Bashorov ab03ab84bb Regenerate tests 2018-04-19 13:17:27 +03:00
Vyacheslav Gerasimov 76cbdf08aa as32: Update AndroidResourceReferenceAnnotator to AS 3.2 C10 2018-04-13 21:33:15 +03:00
Vyacheslav Gerasimov 4299455dc1 as32: Update to AS 3.2 C10 2018-04-13 21:33:03 +03:00
Raluca Sauciuc 89d61ee12d Support androidx packages
... in the IDE plugin and the Android extensions compiler.

Change-Id: Iffd58351b0592e12ffc937c06d871d26958fe161
2018-04-12 16:29:13 +03:00
Alexey Tsvetkov 619663cc88 182: Remove com.android.annotations.NonNull usage from TestUtils.java
It is not present in Intellij (182.*) anymore.
Also `org.jetbrains.annotations.NotNull` seems OK here as well.
2018-04-11 16:28:41 +03:00
Vyacheslav Gerasimov 4cf804f30f 181: Restore broken android lint quickfixes 2018-04-11 16:28:37 +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 4e078fe94b 181: Android-related compilation fix (klint.AndroidLintInspectionBase) 2018-04-11 16:28:28 +03:00
Vyacheslav Gerasimov f31b56a936 181: Fix compatibility after AS 3.0 was merged to 181 2018-04-11 16:28:27 +03:00
Raluca Sauciuc cab1813dcd as32: Fix compilation to match changes in SdkConstants (#1533)
... and match the intended semantics for AndroidxName.

Change-Id: If2148ab8cefcc124a72f63458b7dbddf1a6cfe04
2018-04-11 16:28:24 +03:00
Vyacheslav Gerasimov 054ae37ef4 as32: Fix fqname constant usages for AS 3.2 C3 2018-04-11 16:28:24 +03:00
Raluca Sauciuc 25e193546d as32: Android framework resource refactoring fixes
Change-Id: I5dc44306eb315bc9463aaf3d55ad1a75c1e12015
2018-04-11 16:28:24 +03:00
Vyacheslav Gerasimov b83da08708 as32: Fix compilation against AS 3.2 C2 2018-04-11 16:28:23 +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 25fddaacfb as31: Fix compilation ResourceReferenceAnnotatorUtil 2018-04-11 16:28:20 +03:00
Vyacheslav Gerasimov ec460d88a7 as31: Fix compilation KotlinAndroidGradleLibraryDataService.kt for AS 3.1 2018-04-11 16:28:20 +03:00
Vyacheslav Gerasimov e12e63572c as31: Fix TypeParameterFindViewByIdInspection for AS 3.0 2018-04-11 16:28:19 +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
Alexey Sedunov a9cdccc6de as31: Misc: Fix compilation 2018-04-11 16:28:18 +03:00
Dmitry Jemerov 8568bde4df as31: Fix compilation
(cherry picked from commit bc0bc0e)
2018-04-11 16:28:17 +03:00
Dmitry Jemerov abce7170be as31: Implement ConvertJavaToKotlinProvider
(cherry picked from commit 34dfa24)
2018-04-11 16:28:17 +03:00
Vyacheslav Gerasimov 38b38511a0 as31: Fix KotlinAndroidLineMarkerProvider for AS 3.0 2018-04-11 16:28:17 +03:00
Vyacheslav Gerasimov 13b192cd47 as31: Moved getRequiredVersion to KotlinAndroidQuickFixProvider 2018-04-11 16:28:16 +03:00
Vyacheslav Gerasimov 11ee744340 as31: Drop custom Kotlin Android lint, register quickfixes with extension point 2018-04-11 16:28:16 +03:00
Vyacheslav Gerasimov ab532732ed as31: Fix compilation AndroidResourceReferenceAnnotator 2018-04-11 16:28:15 +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