Skip to content

Commit

Permalink
Upgrades
Browse files Browse the repository at this point in the history
- Update kotlin to 2.0.21
- Update ktor to 3.0.0
- Update mikbot to 3.37.19
- Update ksp to 2.0.21-1.0.26
- Update kordex to 1.9.12-mikbot-SNAPSHOT
- Update AGP to 8.7.1
- Update compose to 1.7.0
- Update horologist to 0.7.3-alpha
- Update protobuf to 4.28.3
- Update coil to 3.0.0-rc01
- Update mikbot-music-player to 3.12.0-SNAPSHOT
- Update logback to 1.5.11
- Update activity-compose to 1.9.3
- Update androidx-core-ktx to 1.15.0-rc01
- Switch coil-network-ktor2 to coil-network-ktor3
- Register Discord Activity Entry point
  • Loading branch information
DRSchlaubi committed Oct 25, 2024
1 parent 206c677 commit 4020862
Show file tree
Hide file tree
Showing 23 changed files with 187 additions and 131 deletions.
57 changes: 45 additions & 12 deletions .idea/other.xml → .idea/caches/deviceStreaming.xml

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

1 change: 1 addition & 0 deletions .idea/gradle.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.

17 changes: 17 additions & 0 deletions .idea/runConfigurations.xml

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

4 changes: 0 additions & 4 deletions app/android/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@ plugins {
id("org.jetbrains.compose")
}

repositories {
maven("https://androidx.dev/storage/compose-compiler/repository/")
}

dependencies {
implementation(projects.app.shared)
implementation(projects.app.android.androidShared)
Expand Down
1 change: 0 additions & 1 deletion app/android/src/main/java/UpdateAwareAppScope.kt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.filled.OpenInNew
import androidx.compose.material.icons.filled.OpenInNew
import androidx.compose.material3.Button
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
Expand Down
2 changes: 1 addition & 1 deletion app/desktop/rules.pro
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
}

# Coil
-keep class coil3.network.ktor2.internal.KtorNetworkFetcherServiceLoaderTarget
-keep class coil3.network.ktor3.internal.KtorNetworkFetcherServiceLoaderTarget

# https://github.com/Guardsquare/proguard/issues/349
-dontoptimize
4 changes: 3 additions & 1 deletion app/desktop/src/nonWindowsMain/kotlin/AuthorizationServer.kt
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ import kotlinx.coroutines.cancel
fun startAuthorizationServer(onAuth: () -> Unit) {
val scope = CoroutineScope(Dispatchers.Default)
scope.embeddedServer(Netty, port = authServerPort, module = { authModule(onAuth, scope) })
.start().stopServerOnCancellation()
.start().also {
it.engine.stopServerOnCancellation(it.application)
}
}

fun Application.authModule(onAuth: () -> Unit, scope: CoroutineScope) {
Expand Down
Loading

0 comments on commit 4020862

Please sign in to comment.