Skip to content

snapo-desktop-compose Icon improvements for macOS 15 and update dependencies #93

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

Merged
rz-openai merged 1 commit into from
Jan 16, 2026
Merged

snapo-desktop-compose Icon improvements for macOS 15 and update dependencies #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 14 additions & 16 deletions snapo-desktop-compose/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,22 +22,13 @@ repositories {
}

kotlin {
// Compose Desktop is happiest on a modern JDK; toolchains let Gradle provision one even if the
// user has an older `java` on PATH.
jvmToolchain(17)
sourceSets {
named("main") {
kotlin.srcDir(layout.buildDirectory.dir("generated/version"))
}
}
}

java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(17))
}
}

data class VersionInfo(
val version: String,
val buildNumber: String,
Expand Down Expand Up @@ -101,8 +92,16 @@ val generateBuildInfo by tasks.registering {
}
}

val java17Launcher = javaToolchains.launcherFor {
languageVersion.set(JavaLanguageVersion.of(17))
val releaseDistributionTasks = setOf(
"createReleaseDistributable",
"runReleaseDistributable",
"packageReleaseDistributionForCurrentOS",
"packageReleaseDmg",
"packageReleaseUberJarForCurrentOS",
"notarizeReleaseDmg",
)
val isReleaseDistribution = gradle.startParameter.taskNames.any { taskName ->
releaseDistributionTasks.contains(taskName.substringAfterLast(":"))
}

tasks.withType<AbstractJLinkTask>().configureEach {
Expand Down Expand Up @@ -168,9 +167,6 @@ tasks.withType<Detekt>().configureEach {

compose.desktop {
application {
// Compose Desktop packaging uses tools like `jpackage` which are not available in older JDKs.
// The Gradle daemon might still run on an older JDK, so explicitly point Compose to JDK 17.
javaHome = java17Launcher.get().metadata.installationPath.asFile.absolutePath
mainClass = "com.openai.snapo.desktop.MainKt"
jvmArgs("-Dapple.awt.application.appearance=system")

Expand All @@ -184,8 +180,10 @@ compose.desktop {
packageVersion = resolvedPackageVersion
macOS {
iconFile.set(project.file("src/main/resources/icons/network.icns"))
entitlementsFile.set(project.file("macos/NetworkInspector.entitlements"))
runtimeEntitlementsFile.set(project.file("macos/NetworkInspector.entitlements"))
if (isReleaseDistribution) {
entitlementsFile.set(project.file("macos/NetworkInspector.entitlements"))
runtimeEntitlementsFile.set(project.file("macos/NetworkInspector.entitlements"))
}
}
}

Expand Down
4 changes: 0 additions & 4 deletions snapo-desktop-compose/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,4 @@ org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8
org.gradle.parallel=true
org.gradle.caching=true

# Ensure Gradle can provision the requested toolchain JDK automatically.
org.gradle.java.installations.auto-download=true

kotlin.code.style=official

48 changes: 1 addition & 47 deletions snapo-desktop-compose/gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,75 +1,29 @@
[versions]
agp = "8.13.2"
detektGradlePlugin = "1.23.8"
detektComposeRules = "0.4.23"
gradle = "8.13.2"
kotlin = "2.3.0"
metro = "0.9.3"
composeMultiplatform = "1.10.0-rc02"
composeMultiplatform = "1.10.0"
composeMaterial3 = "1.10.0-alpha05"
composeMaterial3Adaptive = "1.3.0-alpha02"
composeHotReload = "1.1.0-alpha03"
jetbrainsLifecycle = "2.10.0-alpha06"
jetbrainsNavigation = "2.9.1"
jetbrainsNavigation3 = "1.0.0-alpha06"
jetbrainsNavigationEvent = "1.0.0-rc02"
jetbrainsSavedstate = "1.4.0"
jetbrainsWindowCore = "1.5.1"
coroutines = "1.10.2"
kotlinGradlePlugin = "2.2.20"
serialization = "1.9.0"
coreKtx = "1.17.0"
lifecycleRuntimeKtx = "2.10.0"
activityCompose = "1.12.2"
composeBom = "2025.12.01"
okhttpBom = "5.3.2"
ktor = "3.3.3"
detekt = "1.23.8"

[libraries]
androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
detekt-gradle-plugin = { module = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin", version.ref = "detektGradlePlugin" }
detekt-formatting = { module = "io.gitlab.arturbosch.detekt:detekt-formatting", version.ref = "detekt" }
detekt-compose-rules = { module = "io.nlopez.compose.rules:detekt", version.ref = "detektComposeRules" }
gradle = { module = "com.android.tools.build:gradle", version.ref = "gradle" }
kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlinGradlePlugin" }
kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "coroutines" }
serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "serialization" }
androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycleRuntimeKtx" }
androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" }
androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" }
androidx-compose-foundation = { group = "androidx.compose.foundation", name = "foundation" }
androidx-compose-ui = { group = "androidx.compose.ui", name = "ui" }
androidx-compose-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" }
androidx-compose-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" }
androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3" }
compose-material3 = { group = "org.jetbrains.compose.material3", name = "material3", version.ref = "composeMaterial3" }
compose-material3-adaptive = { group = "org.jetbrains.compose.material3.adaptive", name = "adaptive", version.ref = "composeMaterial3Adaptive" }
compose-components-resources = { group = "org.jetbrains.compose.components", name = "components-resources", version.ref = "composeMultiplatform" }
compose-components-splitpane = { group = "org.jetbrains.compose.components", name = "components-splitpane", version.ref = "composeMultiplatform" }
compose-ui-tooling-preview = { group = "org.jetbrains.compose.ui", name = "ui-tooling-preview", version.ref = "composeMultiplatform" }
jetbrains-lifecycle-runtime-compose = { group = "org.jetbrains.androidx.lifecycle", name = "lifecycle-runtime-compose", version.ref = "jetbrainsLifecycle" }
jetbrains-navigation-compose = { group = "org.jetbrains.androidx.navigation", name = "navigation-compose", version.ref = "jetbrainsNavigation" }
jetbrains-navigation3-runtime = { group = "org.jetbrains.androidx.navigation3", name = "navigation3-runtime", version.ref = "jetbrainsNavigation3" }
jetbrains-navigationevent-compose = { group = "org.jetbrains.androidx.navigationevent", name = "navigationevent-compose", version.ref = "jetbrainsNavigationEvent" }
jetbrains-savedstate-compose = { group = "org.jetbrains.androidx.savedstate", name = "savedstate-compose", version.ref = "jetbrainsSavedstate" }
jetbrains-window-core = { group = "org.jetbrains.androidx.window", name = "window-core", version.ref = "jetbrainsWindowCore" }
okhttp3-bom = { group = "com.squareup.okhttp3", name = "okhttp-bom", version.ref = "okhttpBom" }
okhttp3-coroutines = { group = "com.squareup.okhttp3", name = "okhttp-coroutines" }
okhttp3-okhttp = { group = "com.squareup.okhttp3", name = "okhttp" }
ktor-client-core = { group = "io.ktor", name = "ktor-client-core", version.ref = "ktor" }
ktor-client-okhttp = { group = "io.ktor", name = "ktor-client-okhttp", version.ref = "ktor" }
ktor-client-websockets = { group = "io.ktor", name = "ktor-client-websockets", version.ref = "ktor" }

[plugins]
android-application = { id = "com.android.application", version.ref = "agp" }
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
kotlinx-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
android-library = { id = "com.android.library", version.ref = "agp" }
kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
compose-multiplatform = { id = "org.jetbrains.compose", version.ref = "composeMultiplatform" }
composeHotReload = { id = "org.jetbrains.compose.hot-reload", version.ref = "composeHotReload" }
detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }
metro = { id = "dev.zacsweers.metro", version.ref = "metro" }
projectAccessors = "co.hinge.gradle.project-accessors:1.2.0"
Binary file modified snapo-desktop-compose/gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
5 changes: 3 additions & 2 deletions snapo-desktop-compose/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#Wed Sep 24 11:05:57 EDT 2025
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading