Skip to content

Commit 380a523

Browse files
committed
chore: enable more module after refactorings
1 parent 7861b9c commit 380a523

File tree

32 files changed

+251
-607
lines changed

32 files changed

+251
-607
lines changed

β€ŽREADME.mdβ€Ž

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -217,20 +217,16 @@ The next version will be based on the semantic version scope (`major`, `minor`,
217217

218218
# Test linux binary on ARM64 MacOS
219219
$ ./gradlew :backend:native:linuxArm64Binaries
220-
$ docker run \
221-
-it \
222-
--rm \
220+
$ docker run -it -rm \
223221
--publish 8080:80 \
224222
--mount type=bind,source=$(pwd),destination=/app,readonly \
225223
debian:stable-slim
226224
# /app/backend/native/build/bin/linuxArm64/releaseExecutable/native.kexe
227225
# libtree -v /app/backend/native/build/bin/linuxArm64/releaseExecutable/native.kexe
228226

229227
# Build native binaries on container
230-
$ docker run \
228+
$ docker run -it --rm \
231229
--platform=linux/amd64 \
232-
-it \
233-
--rm \
234230
--pull always \
235231
--workdir /app \
236232
--name kotlin-native-build \

β€Žbackend/jvm/src/main/kotlin/dev/suresh/di/DI.ktβ€Ž

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,39 @@
11
package dev.suresh.di
22

33
import io.ktor.server.application.Application
4+
import io.ktor.server.application.install
45
import io.ktor.server.application.log
56
import io.ktor.server.config.ApplicationConfig
67
import io.ktor.server.config.property
8+
import io.ktor.server.plugins.di.DI
9+
import io.ktor.server.plugins.di.DefaultConflictPolicy
10+
import io.ktor.server.plugins.di.DependencyConflictPolicy
711
import io.ktor.server.plugins.di.dependencies
812
import kotlin.reflect.full.withNullability
913
import kotlin.reflect.typeOf
1014
import kotlin.time.Duration
1115

1216
suspend fun Application.configureDI() {
17+
// Override dependencies
18+
install(DI) {
19+
conflictPolicy = DependencyConflictPolicy { prev, curr ->
20+
when (val result = DefaultConflictPolicy.resolve(prev, curr)) {
21+
is Conflict -> KeepNew
22+
else -> result
23+
}
24+
}
25+
}
26+
1327
log.info("Initializing config dependencies.")
1428
val app = this
15-
dependencies { provide { app.property<Auth>("app.auth") } }
29+
dependencies {
30+
provide { app.property<Auth>("app.auth") }
31+
// provide(MediaApiClient::class)
32+
// provide { MediaApiClient(resolve()) }
33+
// provide(::MediaApiClient)
34+
// provide<()->Type> { {Factory(resolve(), ...)}}
35+
}
36+
1637
log.info("Auth config: ${dependencies.resolve<Auth>()}")
1738
}
1839

β€Žbackend/native/build.gradle.ktsβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import org.jetbrains.kotlin.konan.target.Family
1212
plugins {
1313
id("dev.suresh.plugin.kotlin.mpp")
1414
id("dev.suresh.plugin.publishing")
15-
com.google.cloud.tools.jib
15+
id("com.google.cloud.tools.jib")
1616
}
1717

1818
val appBinName = "app"

β€Žbackend/native/src/nativeMain/kotlin/Main.ktβ€Ž

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,8 @@ fun main(args: Array<String>): Unit = runBlocking {
7070
- Cindy
7171
- Dan
7272
"""
73-
.trimIndent())
73+
.trimIndent()
74+
)
7475
println(yaml)
7576
}
7677

β€Žcompose/cmp/build.gradle.ktsβ€Ž

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ import org.jetbrains.compose.desktop.application.dsl.TargetFormat.*
1010
import org.jetbrains.compose.desktop.application.tasks.AbstractJPackageTask
1111

1212
plugins {
13-
dev.suresh.plugin.kotlin.mpp
13+
id("dev.suresh.plugin.kotlin.mpp")
1414
alias(libs.plugins.kotlin.compose.compiler)
1515
alias(libs.plugins.jetbrains.compose)
1616
alias(libs.plugins.jetbrains.compose.hotreload)
1717
// alias(libs.plugins.detekt)
18-
dev.suresh.plugin.publishing
18+
id("dev.suresh.plugin.publishing")
1919
}
2020

2121
description = "Compose Desktop App!"
@@ -53,17 +53,13 @@ kotlin {
5353
implementation(compose.desktop.components.animatedImage)
5454
implementation(libs.kotlinx.coroutines.swing)
5555
implementation(libs.slf4j.simple)
56-
implementation(libs.evas.compose)
5756
}
5857

5958
// jsMain.dependencies { implementation(compose.html.core) }
6059
}
6160
}
6261

63-
composeCompiler {
64-
reportsDestination = layout.buildDirectory.dir("compose_compiler")
65-
// featureFlags.add(ComposeFeatureFlag.)
66-
}
62+
composeCompiler {}
6763

6864
compose {
6965
desktop {
@@ -73,7 +69,7 @@ compose {
7369
jvmArgs += buildList {
7470
// $APPDIR macro is used by jpackage.
7571
// To debug _JAVA_LAUNCHER_DEBUG=1
76-
add("-splash:${'$'}APPDIR/resources/splash.jpg")
72+
add($$"-splash:$APPDIR/resources/splash.jpg")
7773
addAll(runJvmArgs)
7874
// Resource localization
7975
// add("-Duser.language=en")

β€Žcompose/cmp/src/commonMain/composeResources/drawable/animated_svg/audio.svgβ€Ž

Lines changed: 0 additions & 29 deletions
This file was deleted.

β€Žcompose/cmp/src/commonMain/composeResources/drawable/animated_svg/ball-triangle.svgβ€Ž

Lines changed: 0 additions & 47 deletions
This file was deleted.

β€Žcompose/cmp/src/commonMain/composeResources/drawable/animated_svg/bars.svgβ€Ž

Lines changed: 0 additions & 52 deletions
This file was deleted.

β€Žcompose/cmp/src/commonMain/composeResources/drawable/animated_svg/circles.svgβ€Ž

Lines changed: 0 additions & 20 deletions
This file was deleted.

β€Žcompose/cmp/src/commonMain/composeResources/drawable/animated_svg/grid.svgβ€Ž

Lines changed: 0 additions & 56 deletions
This file was deleted.

0 commit comments

Comments
Β (0)