azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make parcelize a non-experimental feature

Browse Source 
It was already being added to the feature list by default, but was only enabled when isExperimental was true.
This commit is contained in:
Jake Wharton
2019-02-22 15:21:46 -05:00
committed by Yan Zhulanow
parent c40cc76ad3
commit 8e23555660
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/AndroidSubplugin.kt
+2 -1
View File
@@ -122,7 +122,8 @@ class AndroidSubplugin : KotlinGradleSubplugin<KotlinCompile> {
val sourceSets = androidExtension.sourceSets val sourceSets = androidExtension.sourceSets
val pluginOptions = arrayListOf<SubpluginOption>() val pluginOptions = arrayListOf<SubpluginOption>()
pluginOptions += SubpluginOption("features", AndroidExtensionsFeature.VIEWS.featureName) pluginOptions += SubpluginOption("features",
AndroidExtensionsFeature.parseFeatures(androidExtensionsExtension.features).joinToString(",") { it.featureName })
val mainSourceSet = sourceSets.getByName("main") val mainSourceSet = sourceSets.getByName("main")
val manifestFile = mainSourceSet.manifest.srcFile val manifestFile = mainSourceSet.manifest.srcFile
plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/synthetic/AndroidComponentRegistrar.kt
+1 -1
View File
@@ -151,7 +151,7 @@ class AndroidComponentRegistrar : ComponentRegistrar {
val features = configuration.get(AndroidConfigurationKeys.FEATURES) ?: AndroidExtensionsFeature.values().toSet() val features = configuration.get(AndroidConfigurationKeys.FEATURES) ?: AndroidExtensionsFeature.values().toSet()
val isExperimental = configuration.get(AndroidConfigurationKeys.EXPERIMENTAL) == "true" val isExperimental = configuration.get(AndroidConfigurationKeys.EXPERIMENTAL) == "true"
if (isExperimental && AndroidExtensionsFeature.PARCELIZE in features) { if (AndroidExtensionsFeature.PARCELIZE in features) {
registerParcelExtensions(project) registerParcelExtensions(project)
} }