Skip to content

Commit

Permalink
Quality of life updates
Browse files Browse the repository at this point in the history
- Update dependencies
- Add support for Linux ARM64
- Add support for RPM
  • Loading branch information
DRSchlaubi committed Feb 8, 2025
1 parent f963917 commit 5464bf8
Show file tree
Hide file tree
Showing 8 changed files with 33 additions and 17 deletions.
7 changes: 6 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
name: Build Desktop App
strategy:
matrix:
os: [ ubuntu-latest, macos-14, windows-latest ]
os: [ ubuntu-latest, macos-14, windows-latest, ubuntu-24.04-arm ]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -297,6 +297,10 @@ jobs:
name: Download Artifacts from MacOS
with:
name: desktopapp-macos-14
- uses: actions/download-artifact@v4
name: Download Artifacts from Ubuntu (ARM)
with:
name: desktopapp-ubuntu-24.04-arm
- uses: actions/download-artifact@v4
name: Download Bot
with:
Expand All @@ -315,6 +319,7 @@ jobs:
files: |
app/desktop/build/compose/binaries/main-release/deb/*.deb
app/desktop/build/compose/binaries/main-release/pkg/*.pkg
app/desktop/build/compose/binaries/main-release/rpm/*.rpm
app/desktop/build/distributions/*.tar.gz
*.zip
*-signed.apk
Expand Down
11 changes: 11 additions & 0 deletions .idea/caches/deviceStreaming.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/kotlinc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions app/desktop/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ compose.desktop {
when {
HostManager.hostIsMingw -> targetFormats(TargetFormat.AppImage)
HostManager.hostIsMac -> targetFormats(TargetFormat.Pkg)
else -> targetFormats(TargetFormat.Deb)
else -> targetFormats(TargetFormat.Deb, TargetFormat.Rpm)
}

licenseFile = rootProject.file("LICENSE")
Expand Down Expand Up @@ -107,7 +107,7 @@ tasks {
register<Tar>("packageDistributable") {
from(named("createReleaseDistributable"))
archiveBaseName = "tonbrett"
archiveClassifier = "linux"
archiveClassifier = "linux-${System.getProperty("os.arch")}"
compression = Compression.GZIP
archiveExtension = "tar.gz"
}
Expand Down
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ plugins {

allprojects {
group = "dev.schlaubi.tonbrett"
version = "2.2.1"
version = "2.3.0"

repositories {
mavenCentral()
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ systemProp.javax.xml.parsers.SAXParserFactory=com.sun.org.apache.xerces.internal
systemProp.javax.xml.transform.TransformerFactory=com.sun.org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl
systemProp.javax.xml.parsers.DocumentBuilderFactory=com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl

dev.schlaubi.tonbrett.no_windows=false
dev.schlaubi.tonbrett.no_windows=true
ksp.useKSP2=true
20 changes: 10 additions & 10 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
[versions]
kotlin = "2.1.0"
ktor = "3.0.2"
kotlin = "2.1.10"
ktor = "3.0.3"
kmongo = "5.1.0"
kord = "0.15.0"
mikbot = "4.2.0"
ksp = "2.1.0-1.0.29"
ksp = "2.1.10-1.0.29"
kordex = "2.3.1-MIKBOT.4"
android = "8.8.0-rc01"
compose = "1.8.0-alpha01"
android = "8.8.0"
compose = "1.8.0-alpha02"
compose-wear = "1.4.0"
lyricist = "1.7.0"
google-play = "2.1.0"
coroutines = "1.9.0"
coroutines = "1.10.1"
play-services-wearable = "19.0.0"
horologist = "0.7.3-alpha"
protobuf = "4.28.3"
coil = "3.0.4"
lavalink-api = "4.0.8"

[libraries]
kotlinx-serialization = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version = "1.7.3" }
kotlinx-serialization = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version = "1.8.0" }
kmongo-id-serialization = { group = "org.litote.kmongo", name = "kmongo-id-serialization", version.ref = "kmongo" }
kmongo-serialization = { group = "org.litote.kmongo", name = "kmongo-serialization", version.ref = "kmongo" }
kord-common = { group = "dev.kord", name = "kord-common", version.ref = "kord" }
Expand Down Expand Up @@ -53,16 +53,16 @@ ktor-serialization-kotlinx-json = { group = "io.ktor", name = "ktor-serializatio
mikbot-ktor = { group = "dev.schlaubi", name = "mikbot-ktor", version.ref = "mikbot" }
mikbot-music = { group = "dev.schlaubi", name = "mikbot-music-player", version = "4.2.0-SNAPSHOT" }

kotlin-logging = { group = "io.github.oshai", name = "kotlin-logging", version = "7.0.0" }
kotlin-logging = { group = "io.github.oshai", name = "kotlin-logging", version = "7.0.3" }

lyricist = { group = "cafe.adriel.lyricist", name = "lyricist", version.ref = "lyricist" }
lyricist-processor = { group = "cafe.adriel.lyricist", name = "lyricist-processor", version.ref = "lyricist" }

logback = { group = "ch.qos.logback", name = "logback-classic", version = "1.5.12" }
logback = { group = "ch.qos.logback", name = "logback-classic", version = "1.5.16" }

kvault = { group = "com.liftric", name = "kvault", version = "1.12.0" }

androidx-activity = { group = "androidx.activity", name = "activity-compose", version = "1.9.3" }
androidx-activity = { group = "androidx.activity", name = "activity-compose", version = "1.10.0" }
androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version = "1.7.0" }
androidx-core = { group = "androidx.core", name = "core-ktx", version = "1.15.0" }
androidx-browser = { group = "androidx.browser", name = "browser", version = "1.8.0" }
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down

0 comments on commit 5464bf8

Please sign in to comment.