diff --git a/composeApp/build.gradle.kts b/composeApp/build.gradle.kts index 6f2df96..bb773f1 100644 --- a/composeApp/build.gradle.kts +++ b/composeApp/build.gradle.kts @@ -14,10 +14,10 @@ java { kotlin { jvm("desktop") - + sourceSets { val desktopMain by getting - + commonMain.dependencies { implementation(compose.runtime) implementation(compose.foundation) @@ -38,10 +38,8 @@ kotlin { implementation(libs.klogging) } - // https://gist.github.com/OysterD3?page=3 - // https://betterprogramming.pub/how-to-create-an-auto-updater-for-desktop-application-jetpack-compose-d118db26d65f desktopMain.dependencies { - implementation(compose.desktop.currentOs){ + implementation(compose.desktop.currentOs) { exclude("org.jetbrains.compose.material") } implementation(libs.kotlinx.coroutines.swing) @@ -49,19 +47,31 @@ kotlin { } } - compose.desktop { application { mainClass = "fr.thomasbernard03.androidtools.MainKt" + buildTypes { + release { + proguard { + configurationFiles.from("proguard-rules.pro") // Ajoute un fichier de règles personnalisé si nécessaire +// ignoreWarnings.set(true) // Cette option permet d'ignorer les avertissements + } + } + } + nativeDistributions { - targetFormats(TargetFormat.Dmg, TargetFormat.Exe, TargetFormat.Deb) - packageName = "fr.thomasbernard03.androidtools" + targetFormats(TargetFormat.Pkg, TargetFormat.Exe, TargetFormat.Deb) + packageName = "Android Tools" packageVersion = "1.0.0" + macOS { + iconFile.set(project.file("src/commonMain/composeResources/drawable/icon.icns")) + } + windows { - iconFile.set(project.file("icon.ico")) + iconFile.set(project.file("src/commonMain/composeResources/drawable/icon.ico")) } } } -} \ No newline at end of file +} diff --git a/composeApp/src/commonMain/composeResources/drawable/icon.icns b/composeApp/src/commonMain/composeResources/drawable/icon.icns new file mode 100644 index 0000000..2138747 Binary files /dev/null and b/composeApp/src/commonMain/composeResources/drawable/icon.icns differ diff --git a/proguard-rules.pro b/proguard-rules.pro new file mode 100644 index 0000000..a3c73f9 --- /dev/null +++ b/proguard-rules.pro @@ -0,0 +1,3 @@ +-dontwarn androidx.compose.material.** +-dontwarn META-INF.MANIFEST.MF +-dontwarn kotlinx.serialization.**