Skip to content

Commit d557203

Browse files
committed
Revert "build(example): Add support build fat-jar"
This reverts commit 9b08f38.
1 parent 4d7de72 commit d557203

File tree

3 files changed

+2
-25
lines changed

3 files changed

+2
-25
lines changed

example/build.gradle.kts

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
@file:Suppress("UnstableApiUsage")
22

33
import com.android.build.gradle.internal.api.BaseVariantOutputImpl
4-
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
54
import org.jetbrains.compose.desktop.application.dsl.TargetFormat
6-
import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
75
import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
86
import java.util.Properties
97

@@ -12,14 +10,12 @@ plugins {
1210
alias(libs.plugins.compose.compiler)
1311
alias(libs.plugins.jetbrains.compose)
1412
alias(libs.plugins.kotlin.multiplatform)
15-
alias(libs.plugins.shadow)
1613
}
1714

1815
val appName = "Miuix"
1916
val pkgName = "top.yukonga.miuix.uitest"
2017
val verName = "1.0.4"
2118
val verCode = getVersionCode()
22-
val javaMainClass = "Main_desktopKt"
2319
val generatedSrcDir = layout.buildDirectory.dir("generated").get().asFile.resolve("miuix-example")
2420

2521
java {
@@ -59,23 +55,7 @@ kotlin {
5955
}
6056
}
6157

62-
jvm("desktop") {
63-
@OptIn(ExperimentalKotlinGradlePluginApi::class)
64-
mainRun {
65-
mainClass = javaMainClass
66-
}
67-
68-
tasks.register<ShadowJar>("jvmShadowJar") {
69-
val mainCompilation = compilations["main"]
70-
val jvmRuntimeConfiguration = mainCompilation
71-
.runtimeDependencyConfigurationName
72-
.let { project.configurations[it] }
73-
from(mainCompilation.output.allOutputs)
74-
configurations = listOf(jvmRuntimeConfiguration)
75-
archiveClassifier.set("fatjar")
76-
manifest.attributes("Main-Class" to javaMainClass)
77-
}
78-
}
58+
jvm("desktop")
7959

8060
@OptIn(ExperimentalWasmDsl::class)
8161
wasmJs {
@@ -188,7 +168,7 @@ android {
188168

189169
compose.desktop {
190170
application {
191-
mainClass = javaMainClass
171+
mainClass = "Main_desktopKt"
192172
buildTypes.release.proguard {
193173
configurationFiles.from("proguard-rules-jvm.pro")
194174
}

gradle/libs.versions.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ compose-plugin = "1.8.0-rc01"
1111
dokka = "2.0.0"
1212
haze = "1.6.0-SNAPSHOT"
1313
kotlin = "2.1.20"
14-
shadow = "9.0.0-beta13"
1514

1615
[libraries]
1716
androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity-compose" }
@@ -27,4 +26,3 @@ compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "
2726
jetbrains-dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
2827
jetbrains-compose = { id = "org.jetbrains.compose", version.ref = "compose-plugin" }
2928
kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
30-
shadow = { id = "com.gradleup.shadow", version.ref = "shadow" }

miuix/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ plugins {
66
alias(libs.plugins.jetbrains.compose)
77
alias(libs.plugins.jetbrains.dokka)
88
alias(libs.plugins.kotlin.multiplatform)
9-
alias(libs.plugins.shadow)
109
id("module.publication")
1110
}
1211

0 commit comments

Comments
 (0)