From 3075de917bf68129f92cf79f3b4f073e73e66744 Mon Sep 17 00:00:00 2001 From: Kirill Shmakov Date: Fri, 25 Sep 2020 14:14:09 +0300 Subject: [PATCH] Add useAndroidX property into mobile library template KT-42123 --- .../moduleConfigurators/AndroidModuleConfigurator.kt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/moduleConfigurators/AndroidModuleConfigurator.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/moduleConfigurators/AndroidModuleConfigurator.kt index 3e2b8e7ef8c..31ecfdbb145 100644 --- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/moduleConfigurators/AndroidModuleConfigurator.kt +++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/moduleConfigurators/AndroidModuleConfigurator.kt @@ -20,6 +20,7 @@ import org.jetbrains.kotlin.tools.projectWizard.ir.buildsystem.gradle.AndroidCon import org.jetbrains.kotlin.tools.projectWizard.library.MavenArtifact import org.jetbrains.kotlin.tools.projectWizard.phases.GenerationPhase import org.jetbrains.kotlin.tools.projectWizard.plugins.AndroidPlugin +import org.jetbrains.kotlin.tools.projectWizard.plugins.buildSystem.gradle.GradlePlugin import org.jetbrains.kotlin.tools.projectWizard.plugins.kotlin.KotlinPlugin import org.jetbrains.kotlin.tools.projectWizard.plugins.kotlin.ModulesToIrConversionData import org.jetbrains.kotlin.tools.projectWizard.plugins.kotlin.ModuleSubType @@ -181,6 +182,8 @@ object AndroidTargetConfigurator : TargetConfigurator, FileTemplate(getAndroidManifestForLibraryXml(module), modulePath, settings) ) ) + + GradlePlugin.gradleProperties.addValues("android.useAndroidX" to true) } override fun defaultTestFramework(): KotlinTestFramework = KotlinTestFramework.JUNIT4