add icons

ThomasBernard03 · Jan 26, 2025 · f834639 · f834639
1 parent 897a14e
commit f834639
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 10 deletions.
diff --git 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,30 +38,40 @@ 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)
         }
     }
 }
 
-
 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"))
             }
         }
     }
-}
+}
diff --git a/composeApp/src/commonMain/composeResources/drawable/icon.icns b/composeApp/src/commonMain/composeResources/drawable/icon.icns
diff --git a/proguard-rules.pro b/proguard-rules.pro
@@ -0,0 +1,3 @@
+-dontwarn androidx.compose.material.**
+-dontwarn META-INF.MANIFEST.MF
+-dontwarn kotlinx.serialization.**