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.

Sign up for GitHub

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

Move Proguard version from ProguardSettings.kt To Gradle version catalog #4946

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Move Proguard version from ProguardSettings.kt To Gradle version catalog #4946

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7fe43e3
chore(versions): add Proguard default version in libs.versions.toml
Jun 8, 2024
6d2bbad
chore: add generated DEFAULT_PROGUARD_VERSION in org.jetbrains.compos…
Jun 8, 2024
eaa4b34
chore: use the generated DEFAULT_PROGUARD_VERSION
Jun 8, 2024
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: 1 addition & 0 deletions gradle-plugins/compose/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ val buildConfig = tasks.register("buildConfig", GenerateBuildConfig::class.java)
generatedOutputDir.set(buildConfigDir)
fieldsToGenerate.put("composeVersion", BuildProperties.composeVersion(project))
fieldsToGenerate.put("composeGradlePluginVersion", BuildProperties.deployVersion(project))
fieldsToGenerate.put("DEFAULT_PROGUARD_VERSION", libs.versions.default.proguard.get())
}
tasks.named("compileKotlin", KotlinCompilationTask::class) {
dependsOn(buildConfig)
Expand Down
3 changes: 2 additions & 1 deletion ...compose/src/main/kotlin/org/jetbrains/compose/desktop/application/dsl/ProguardSettings.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,12 @@ package org.jetbrains.compose.desktop.application.dsl
import org.gradle.api.file.ConfigurableFileCollection
import org.gradle.api.model.ObjectFactory
import org.gradle.api.provider.Property
import org.jetbrains.compose.ComposeBuildConfig
import org.jetbrains.compose.internal.utils.notNullProperty
import org.jetbrains.compose.internal.utils.nullableProperty
import javax.inject.Inject

private const val DEFAULT_PROGUARD_VERSION = "7.2.2"
private const val DEFAULT_PROGUARD_VERSION = ComposeBuildConfig.DEFAULT_PROGUARD_VERSION

abstract class ProguardSettings @Inject constructor(
objects: ObjectFactory,
Expand Down
3 changes: 3 additions & 0 deletions gradle-plugins/gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ kotlin-poet = "1.16.0"
plugin-android = "7.3.0"
shadow-jar = "8.1.1"
publish-plugin = "1.2.1"
# The default version of Proguard that will be used in Compose Desktop Gradle plugin
# to shrink and minimize the application in the Release build, the version can be overriden.
default-proguard = "7.2.2"

[libraries]
download-task = { module = "de.undercouch:gradle-download-task", version.ref = "gradle-download-plugin" }
Expand Down