Skip to content

Commit

Permalink
Delete conveyor
Browse files Browse the repository at this point in the history
  • Loading branch information
kaleidot725 committed Feb 24, 2023
1 parent 9acf747 commit 0448326
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 56 deletions.
62 changes: 23 additions & 39 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import org.jetbrains.compose.desktop.application.dsl.TargetFormat

group = "jp.kaleidot725"
version = "1.9.0"

Expand All @@ -6,7 +8,6 @@ plugins {
kotlin("plugin.serialization")
id("org.jetbrains.compose")
id("org.jlleitschuh.gradle.ktlint")
id("dev.hydraulic.conveyor")
}

repositories {
Expand All @@ -31,55 +32,38 @@ dependencies {
testImplementation(libs.kotest)
}

tasks.test {
useJUnitPlatform()
}

configure<org.jlleitschuh.gradle.ktlint.KtlintExtension> {
reporters {
reporter(org.jlleitschuh.gradle.ktlint.reporter.ReporterType.CHECKSTYLE)
}
}

compose.desktop {
application {
mainClass = "ScrcpyHubKt"
nativeDistributions {
packageName = "ScrcpyHub"
modules("jdk.management")

targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb)

macOS {
bundleID = "jp.kaleidot725.scrcpyhub"
signing {
sign.set(false)
}
iconFile.set(project.file("icon.icns"))
}

windows {
iconFile.set(project.file("icon.ico"))
}
}
}
}

dependencies {
linuxAmd64(compose.desktop.linux_x64)
macAmd64(compose.desktop.macos_x64)
macAarch64(compose.desktop.macos_arm64)
windowsAmd64(compose.desktop.windows_x64)
}

// region Work around temporary Compose bugs.
configurations.all {
attributes {
// https://github.com/JetBrains/compose-jb/issues/1404#issuecomment-1146894731
attribute(Attribute.of("ui", String::class.java), "awt")
}
}

// Force override the Kotlin stdlib version used by Compose to 1.7, as otherwise we can end up with a mix of 1.6 and 1.7 on our classpath.
dependencies {
val v = "1.7.20"
for (m in setOf("linuxAmd64", "macAmd64", "macAarch64", "windowsAmd64")) {
m("org.jetbrains.kotlin:kotlin-stdlib:$v")
m("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$v")
m("org.jetbrains.kotlin:kotlin-stdlib-jdk7:$v")
linux {
iconFile.set(project.file("icon.ico"))
}
}
}
}
// endregion

tasks.test {
useJUnitPlatform()
}

configure<org.jlleitschuh.gradle.ktlint.KtlintExtension> {
reporters {
reporter(org.jlleitschuh.gradle.ktlint.reporter.ReporterType.CHECKSTYLE)
}
}
17 changes: 0 additions & 17 deletions conveyor.conf

This file was deleted.

Binary file added icon.icns
Binary file not shown.
Binary file added icon.ico
Binary file not shown.

0 comments on commit 0448326

Please sign in to comment.