Merge branch 'refs/heads/master' into develop

aritra-tech · Jun 14, 2024 · c2c3e22 · c2c3e22
2 parents 92c9aad + 67ea090
commit c2c3e22
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 2 deletions.
diff --git a/composeApp/build.gradle.kts b/composeApp/build.gradle.kts
@@ -137,7 +137,17 @@ compose.desktop {
         nativeDistributions {
             targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb)
             packageName = "com.aritra.coinify"
-            packageVersion = "1.0.0"
+            packageVersion = properties["version.name"].toString()
+
+            macOS {
+                iconFile.set(rootProject.file("icons/coinify_logo.icns"))
+            }
+            windows {
+                iconFile.set(rootProject.file("icons/coinify_logo.ico"))
+            }
+            linux {
+                iconFile.set(rootProject.file("icons/coinify_logo.png"))
+            }
         }
     }
 }

diff --git a/composeApp/src/androidMain/app_logo.png b/composeApp/src/androidMain/app_logo.png
diff --git a/gradle.properties b/gradle.properties
@@ -9,4 +9,6 @@ android.useAndroidX=true
 
 #MPP
 kotlin.mpp.androidSourceSetLayoutVersion=2
-kotlin.mpp.enableCInteropCommonization=true
+kotlin.mpp.enableCInteropCommonization=true
+# App
+version.name=1.0.0
diff --git a/icons/coinify_logo.icns b/icons/coinify_logo.icns
diff --git a/icons/coinify_logo.ico b/icons/coinify_logo.ico
diff --git a/icons/coinify_logo.png b/icons/coinify_logo.png