|
|
@ -9,9 +9,12 @@ package org.jetbrains.compose |
|
|
|
|
|
|
|
|
|
|
|
import org.gradle.api.Plugin |
|
|
|
import org.gradle.api.Plugin |
|
|
|
import org.gradle.api.Project |
|
|
|
import org.gradle.api.Project |
|
|
|
|
|
|
|
import org.gradle.api.artifacts.ComponentMetadataContext |
|
|
|
|
|
|
|
import org.gradle.api.artifacts.ComponentMetadataRule |
|
|
|
import org.gradle.api.artifacts.dsl.ComponentModuleMetadataHandler |
|
|
|
import org.gradle.api.artifacts.dsl.ComponentModuleMetadataHandler |
|
|
|
import org.gradle.api.artifacts.dsl.DependencyHandler |
|
|
|
import org.gradle.api.artifacts.dsl.DependencyHandler |
|
|
|
import org.gradle.api.plugins.ExtensionAware |
|
|
|
import org.gradle.api.plugins.ExtensionAware |
|
|
|
|
|
|
|
import org.jetbrains.compose.android.AndroidExtension |
|
|
|
import org.jetbrains.compose.desktop.DesktopExtension |
|
|
|
import org.jetbrains.compose.desktop.DesktopExtension |
|
|
|
import org.jetbrains.compose.desktop.application.internal.configureApplicationImpl |
|
|
|
import org.jetbrains.compose.desktop.application.internal.configureApplicationImpl |
|
|
|
import org.jetbrains.compose.desktop.application.internal.currentTarget |
|
|
|
import org.jetbrains.compose.desktop.application.internal.currentTarget |
|
|
@ -26,6 +29,7 @@ class ComposePlugin : Plugin<Project> { |
|
|
|
override fun apply(project: Project) { |
|
|
|
override fun apply(project: Project) { |
|
|
|
val composeExtension = project.extensions.create("compose", ComposeExtension::class.java) |
|
|
|
val composeExtension = project.extensions.create("compose", ComposeExtension::class.java) |
|
|
|
val desktopExtension = composeExtension.extensions.create("desktop", DesktopExtension::class.java) |
|
|
|
val desktopExtension = composeExtension.extensions.create("desktop", DesktopExtension::class.java) |
|
|
|
|
|
|
|
val androidExtension = composeExtension.extensions.create("android", AndroidExtension::class.java) |
|
|
|
|
|
|
|
|
|
|
|
if (!project.buildFile.endsWith(".gradle.kts")) { |
|
|
|
if (!project.buildFile.endsWith(".gradle.kts")) { |
|
|
|
// add compose extension for Groovy DSL to work |
|
|
|
// add compose extension for Groovy DSL to work |
|
|
@ -50,6 +54,13 @@ class ComposePlugin : Plugin<Project> { |
|
|
|
// we want to avoid creating tasks like package, run, etc. to avoid conflicts with other plugins |
|
|
|
// we want to avoid creating tasks like package, run, etc. to avoid conflicts with other plugins |
|
|
|
configureApplicationImpl(project, desktopExtension.application) |
|
|
|
configureApplicationImpl(project, desktopExtension.application) |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (androidExtension.useAndroidX) { |
|
|
|
|
|
|
|
println("useAndroidX is an experimental feature at the moment!") |
|
|
|
|
|
|
|
RedirectAndroidVariants.androidxVersion = androidExtension.androidxVersion |
|
|
|
|
|
|
|
listOf( |
|
|
|
|
|
|
|
RedirectAndroidVariants::class.java, |
|
|
|
|
|
|
|
).forEach(project.dependencies.components::all) |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
fun ComponentModuleMetadataHandler.replaceAndroidx(original: String, replacement: String) { |
|
|
|
fun ComponentModuleMetadataHandler.replaceAndroidx(original: String, replacement: String) { |
|
|
@ -58,7 +69,9 @@ class ComposePlugin : Plugin<Project> { |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//redirecting all android artifacts to androidx.compose |
|
|
|
project.dependencies.modules { |
|
|
|
project.dependencies.modules { |
|
|
|
|
|
|
|
if (!androidExtension.useAndroidX) { |
|
|
|
// Replace 'androidx.compose' artifacts by 'org.jetbrains.compose' artifacts. |
|
|
|
// Replace 'androidx.compose' artifacts by 'org.jetbrains.compose' artifacts. |
|
|
|
// It is needed, because 'org.jetbrains.compose' artifacts are the same artifacts as 'androidx.compose' |
|
|
|
// It is needed, because 'org.jetbrains.compose' artifacts are the same artifacts as 'androidx.compose' |
|
|
|
// (but with different version). |
|
|
|
// (but with different version). |
|
|
@ -78,26 +91,36 @@ class ComposePlugin : Plugin<Project> { |
|
|
|
// It is temporarily solution until we will be publishing all MPP artifacts in Google Maven repository. |
|
|
|
// It is temporarily solution until we will be publishing all MPP artifacts in Google Maven repository. |
|
|
|
// Or align versions with androidx artifacts and point MPP-android artifacts to androidx artifacts (is it possible?) |
|
|
|
// Or align versions with androidx artifacts and point MPP-android artifacts to androidx artifacts (is it possible?) |
|
|
|
|
|
|
|
|
|
|
|
it.replaceAndroidx("androidx.compose.animation:animation", "org.jetbrains.compose.animation:animation") |
|
|
|
listOf( |
|
|
|
it.replaceAndroidx("androidx.compose.animation:animation-core", "org.jetbrains.compose.animation:animation-core") |
|
|
|
"androidx.compose.animation:animation", |
|
|
|
it.replaceAndroidx("androidx.compose.compiler:compiler", "org.jetbrains.compose.compiler:compiler") |
|
|
|
"androidx.compose.animation:animation-core", |
|
|
|
it.replaceAndroidx("androidx.compose.compiler:compiler-hosted", "org.jetbrains.compose.compiler:compiler-hosted") |
|
|
|
"androidx.compose.compiler:compiler", |
|
|
|
it.replaceAndroidx("androidx.compose.foundation:foundation", "org.jetbrains.compose.foundation:foundation") |
|
|
|
"androidx.compose.compiler:compiler-hosted", |
|
|
|
it.replaceAndroidx("androidx.compose.foundation:foundation-layout", "org.jetbrains.compose.foundation:foundation-layout") |
|
|
|
"androidx.compose.foundation:foundation", |
|
|
|
it.replaceAndroidx("androidx.compose.material:material", "org.jetbrains.compose.material:material") |
|
|
|
"androidx.compose.foundation:foundation-layout", |
|
|
|
it.replaceAndroidx("androidx.compose.material:material-icons-core", "org.jetbrains.compose.material:material-icons-core") |
|
|
|
"androidx.compose.material:material", |
|
|
|
it.replaceAndroidx("androidx.compose.material:material-icons-extended", "org.jetbrains.compose.material:material-icons-extended") |
|
|
|
"androidx.compose.material:material-icons-core", |
|
|
|
it.replaceAndroidx("androidx.compose.material:material-ripple", "org.jetbrains.compose.material:material-ripple") |
|
|
|
"androidx.compose.material:material-icons-extended", |
|
|
|
it.replaceAndroidx("androidx.compose.runtime:runtime", "org.jetbrains.compose.runtime:runtime") |
|
|
|
"androidx.compose.material:material-ripple", |
|
|
|
it.replaceAndroidx("androidx.compose.runtime:runtime-saveable", "org.jetbrains.compose.runtime:runtime-saveable") |
|
|
|
"androidx.compose.runtime:runtime", |
|
|
|
it.replaceAndroidx("androidx.compose.ui:ui", "org.jetbrains.compose.ui:ui") |
|
|
|
"androidx.compose.runtime:runtime-saveable", |
|
|
|
it.replaceAndroidx("androidx.compose.ui:ui-geometry", "org.jetbrains.compose.ui:ui-geometry") |
|
|
|
"androidx.compose.ui:ui", |
|
|
|
it.replaceAndroidx("androidx.compose.ui:ui-graphics", "org.jetbrains.compose.ui:ui-graphics") |
|
|
|
"androidx.compose.ui:ui-geometry", |
|
|
|
it.replaceAndroidx("androidx.compose.ui:ui-test", "org.jetbrains.compose.ui:ui-test") |
|
|
|
"androidx.compose.ui:ui-graphics", |
|
|
|
it.replaceAndroidx("androidx.compose.ui:ui-test-junit4", "org.jetbrains.compose.ui:ui-test-junit4") |
|
|
|
"androidx.compose.ui:ui-test", |
|
|
|
it.replaceAndroidx("androidx.compose.ui:ui-text", "org.jetbrains.compose.ui:ui-text") |
|
|
|
"androidx.compose.ui:ui-test-junit4", |
|
|
|
it.replaceAndroidx("androidx.compose.ui:ui-unit", "org.jetbrains.compose.ui:ui-unit") |
|
|
|
"androidx.compose.ui:ui-text", |
|
|
|
it.replaceAndroidx("androidx.compose.ui:ui-util", "org.jetbrains.compose.ui:ui-util") |
|
|
|
"androidx.compose.ui:ui-unit", |
|
|
|
|
|
|
|
"androidx.compose.ui:ui-util" |
|
|
|
|
|
|
|
).forEach() { module -> |
|
|
|
|
|
|
|
it.replaceAndroidx( |
|
|
|
|
|
|
|
module, |
|
|
|
|
|
|
|
module.replace("androidx.compose", "org.jetbrains.compose") |
|
|
|
|
|
|
|
) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
project.tasks.withType(KotlinCompile::class.java) { |
|
|
|
project.tasks.withType(KotlinCompile::class.java) { |
|
|
@ -108,6 +131,32 @@ class ComposePlugin : Plugin<Project> { |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
class RedirectAndroidVariants : ComponentMetadataRule { |
|
|
|
|
|
|
|
override fun execute(context: ComponentMetadataContext) = with(context.details) { |
|
|
|
|
|
|
|
if (id.group.startsWith("org.jetbrains.compose")) { |
|
|
|
|
|
|
|
val group = id.group.replaceFirst("org.jetbrains.compose", "androidx.compose") |
|
|
|
|
|
|
|
val newReference = "$group:${id.module.name}:$androidxVersion" |
|
|
|
|
|
|
|
listOf( |
|
|
|
|
|
|
|
"debugApiElements-published", |
|
|
|
|
|
|
|
"debugRuntimeElements-published", |
|
|
|
|
|
|
|
"releaseApiElements-published", |
|
|
|
|
|
|
|
"releaseRuntimeElements-published" |
|
|
|
|
|
|
|
).forEach { variantNameToAlter -> |
|
|
|
|
|
|
|
withVariant(variantNameToAlter) { variantMetadata -> |
|
|
|
|
|
|
|
variantMetadata.withDependencies { dependencies -> |
|
|
|
|
|
|
|
dependencies.removeAll { true } //there are references to org.jetbrains artifacts now |
|
|
|
|
|
|
|
dependencies.add(newReference) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
companion object { |
|
|
|
|
|
|
|
var androidxVersion: String? = null |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
object Dependencies { |
|
|
|
object Dependencies { |
|
|
|
val desktop = DesktopDependencies |
|
|
|
val desktop = DesktopDependencies |
|
|
|
val animation get() = composeDependency("org.jetbrains.compose.animation:animation") |
|
|
|
val animation get() = composeDependency("org.jetbrains.compose.animation:animation") |
|
|
|