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

45244 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vyacheslav Gerasimov 00d9dc7cc0 as31: Fix GenerateTests.kt compilation for AS 2018-04-11 16:28:21 +03:00
Vyacheslav Gerasimov b250d20dde as31: Disable ultimate for Android Studio 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 06efb037fd as31: Fix test data for testAddArrayOfTypeForJavaAnnotation 2018-04-11 16:28:20 +03:00
Vyacheslav Gerasimov c78c82a366 as31: Fix GradleFacetImportTest for AS 2018-04-11 16:28:20 +03:00
Simon Ogorodnik d58b0798cc as31: Fix AbstractImportsTest, add missing project parameter 
Settings by default taken from per-project settings manager
instead of app settings
 2018-04-11 16:28:20 +03:00
Vyacheslav Gerasimov 9bb3bb2777 as31: Remove duplicate registration of KotlinUastBindingContextProviderService 
from android-lint.xml, it is already registered in plugin.xml
 2018-04-11 16:28:20 +03:00
Vyacheslav Gerasimov 4c498b004f as31: Fix test data for android lint based tests for AS 3.0 2018-04-11 16:28:19 +03:00
Vyacheslav Gerasimov e12e63572c as31: Fix TypeParameterFindViewByIdInspection for AS 3.0 2018-04-11 16:28:19 +03:00
Nikolay Krasko 589487951c as31: Remove ultimate settings from AS branch 2018-04-11 16:28:19 +03:00
Ilya Gorbunov f22093ee7b as31: Comment out some new code in ClasspathRootsResolver 
Relates to disabled modular JDK9 support.
 2018-04-11 16:28:18 +03:00
Yan Zhulanow 48ae0651c6 as31: Add typealias for AndroidGradleModel 
(cherry picked from commit f6c6845)

(cherry picked from commit d13c2c2)
 2018-04-11 16:28:18 +03:00
Simon Ogorodnik e9caa54afa as31: Remove dependencies on jps/test 2018-04-11 16:28:18 +03:00
Simon Ogorodnik 647ff74612 as31: Disable maven for AS30 2018-04-11 16:28:18 +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
Mikhael Bogdanov 554b834f2c as31: Revert "Fix codegen tests on JDK 9 with jdkKind = FULL_JDK" 2018-04-11 16:28:17 +03:00
Dmitry Jemerov 932e9c74b6 as31: No Maven in AS 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
Dmitry Jemerov 686d8a1756 as31: Compilation fixes for as24 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 02f842f8b5 as31: Revert "Quickfix to enable language feature works for Maven project" 
This reverts commit aabd560eef.
 2018-04-11 16:28:15 +03:00
Vyacheslav Gerasimov 3dcca14a50 as31: Revert "Quickfix to enable coroutine support works in Maven projects" 
This reverts commit 7346fee513.
 2018-04-11 16:28:15 +03:00
Vyacheslav Gerasimov 78140fb304 as31: Fix compilation JavaRuntimePresentationProvider 2018-04-11 16:28:15 +03:00
Vyacheslav Gerasimov 7d7fff52b8 as31: Fix build for AS 2.4.0.3 
(cherry picked from commit a79f7a7)
 2018-04-11 16:28:15 +03:00
Pavel V. Talanov 8eb80a8f4a as31: Add step to patch plugin xml so that it only works in Android Studio 
(cherry picked from commit fcee4eb)

(cherry picked from commit 14f7731)

(cherry picked from commit b1f5df2)
 2018-04-11 16:28:14 +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
Vyacheslav Gerasimov a4699add8e as31: Fix gotoResourceHelper: MyReferredResourceFieldInfo now requires module 2018-04-11 16:28:14 +03:00
Vyacheslav Gerasimov b6abe84357 as31: Fix ResourceFoldingBuilder for AS 2.4 2018-04-11 16:28:14 +03:00
Yan Zhulanow bb4b1f5b9c as31: Remove Maven components from all-open and no-arg plugins 2018-04-11 16:28:13 +03:00
Yan Zhulanow 72e66f6175 as31: Disable Maven and JPS modules which is not available in AS 2018-04-11 16:28:13 +03:00
Nikolay Krasko e1fe148561 as31: Run AS properly 2018-04-11 16:28:13 +03:00
Nikolay Krasko 9f8ab7b98e as31: == 173 -> as31 ^^^ == 2018-04-11 16:28:13 +03:00
Natalia Selezneva 5ba337e998 172: Replace missing property from GradleConstants 2018-04-11 16:28:13 +03:00
Nicolay Mitropolsky 9af4f8c66b 172: psiModificationUtils.kt: compilation fixes 2018-04-11 16:28:13 +03:00
Nikolay Krasko ef6c8c6a10 172: Revert "UAST: support for JvmDeclarationUElement" 
This reverts commit db6a2390a22d4b35246cc4c6d246a5d7752f3506.
 2018-04-11 16:28:12 +03:00
Nikolay Krasko e2fb63729d 172: Revert "Data Inflow: Support grouping by leaf expressions" 
This reverts commit d5af2db2f259c7d55d38be73b9a5136e3aefd580.
 2018-04-11 16:28:12 +03:00
Mikhael Bogdanov b785aca98e 172: Fix compilation 2018-04-11 16:28:12 +03:00
Nikolay Krasko cdc0f60fe8 172: Restore KotlinCommonCodeStyleSettings behaviour for 172 Idea 
There are no soft margins in CommonCodeStyleSettings.
 2018-04-11 16:28:12 +03:00
Nikolay Krasko ca7f25d52f 172: Fix compilation in 172 after AbstractApplicationUsagesCollector rename 
See c299f7d10a93a055cc868a9d9d20d68cc47c35e3 to intellij_community
 2018-04-11 16:28:12 +03:00
Nicolay Mitropolsky 18198ee33c 172: Uast-revert: test-data-revert 2018-04-11 16:28:11 +03:00
Nicolay Mitropolsky a15d48c444 172: Uast-revert: reverting to previous rebase state 2018-04-11 16:28:11 +03:00
Nicolay Mitropolsky c6bb0ad712 172: Uast-revert: AbstractKotlinRenderLogTest 2018-04-11 16:28:11 +03:00