Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

COMPOSE-350 Remove old Gradle tasks to launch iOS App #3753

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion gradle-plugins/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile

plugins {
alias(libs.plugins.kotlin.jvm) apply false
alias(libs.plugins.kotlin.serialization) apply false
alias(libs.plugins.publish.plugin.portal) apply false
alias(libs.plugins.shadow.jar) apply false
alias(libs.plugins.download) apply false
Expand Down
6 changes: 1 addition & 5 deletions gradle-plugins/compose/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import de.undercouch.gradle.tasks.download.Download

plugins {
alias(libs.plugins.kotlin.jvm)
alias(libs.plugins.kotlin.serialization)
alias(libs.plugins.publish.plugin.portal)
id("java-gradle-plugin")
id("maven-publish")
Expand Down Expand Up @@ -64,14 +63,11 @@ dependencies {
testImplementation(kotlin("gradle-plugin-api"))

embedded(libs.download.task)
embedded(libs.serialization.json)
embedded(libs.serialization.core)
embedded(libs.serialization.core.jvm)
embedded(project(":preview-rpc"))
embedded(project(":jdk-version-probe"))
}

val packagesToRelocate = listOf("de.undercouch", "kotlinx.serialization")
val packagesToRelocate = listOf("de.undercouch")

val shadow = tasks.named<ShadowJar>("shadowJar") {
for (packageToRelocate in packagesToRelocate) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,4 @@ abstract class ExperimentalExtension @Inject constructor(
fun web(action: Action<ExperimentalWebExtension>) {
action.execute(web)
}

val uikit: ExperimentalUiKitExtension = objects.newInstance(ExperimentalUiKitExtension::class.java)
fun uikit(action: Action<ExperimentalUiKitExtension>) {
action.execute(uikit)
}
}

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ package org.jetbrains.compose.experimental.internal
import org.gradle.api.Project
import org.jetbrains.compose.ComposeExtension
import org.jetbrains.compose.experimental.dsl.ExperimentalExtension
import org.jetbrains.compose.experimental.uikit.internal.configureExperimentalUikitApplication
import org.jetbrains.compose.experimental.web.internal.configureExperimentalWebApplication
import org.jetbrains.compose.web.WebExtension
import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
Expand All @@ -17,12 +16,6 @@ internal fun Project.configureExperimental(
composeExt: ComposeExtension,
experimentalExt: ExperimentalExtension
) {
if (experimentalExt.uikit._isApplicationInitialized) {
val mppExt = project.extensions.findByType(KotlinMultiplatformExtension::class.java)
?: error("'org.jetbrains.kotlin.multiplatform' plugin is required for using 'compose.experimental.uikit {}'")
configureExperimentalUikitApplication(mppExt, experimentalExt.uikit.application)
}

if (experimentalExt.web._isApplicationInitialized) {
val webExt = composeExt.extensions.getByType(WebExtension::class.java)
webExt.targetsToConfigure(project)
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

Loading