Skip to content

Commit 5f49728

Browse files
committed
init
1 parent 3536402 commit 5f49728

File tree

5 files changed

+26
-5
lines changed

5 files changed

+26
-5
lines changed

.github/workflows/release.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ jobs:
3131
mv $3.tmp $3
3232
}
3333
setProperty "server" "https://kotlingames.shop" "gradle.properties"
34+
setProperty "version" "Build-${{github.run_number}}" "gradle.properties"
3435
- run: git tag ${{github.run_number}}
3536

3637
- name: Grant execute permission for gradlew

client/src/commonMain/kotlin/scene/MainScene.kt

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,13 @@ import korlibs.korge.scene.SceneContainer
99
import korlibs.korge.scene.sceneContainer
1010
import korlibs.korge.style.*
1111
import korlibs.korge.ui.uiContainer
12-
import korlibs.korge.view.SContainer
12+
import korlibs.korge.ui.uiText
13+
import korlibs.korge.view.*
1314
import korlibs.korge.view.align.centerOnStage
15+
import korlibs.korge.view.align.centerXOn
16+
import korlibs.korge.view.align.centerXOnStage
1417
import network.login
18+
import org.koin.core.qualifier.named
1519
import org.koin.mp.KoinPlatform.getKoin
1620
import ui.MainMenuState
1721
import ui.mainMenu
@@ -26,6 +30,13 @@ val styler: ViewStyles.() -> Unit = {
2630

2731
class MainScene : Scene() {
2832
override suspend fun SContainer.sceneMain() {
33+
sceneContainer.container {
34+
text(getKoin().get<String>(named("version")), textSize = 15f) {
35+
positionY(sceneContainer.height - height)
36+
positionX(5)
37+
}.zIndex(100)
38+
zIndex(100)
39+
}
2940
MainMenuState().mainMenu()
3041
}
3142
}
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
server=$server
1+
server=$server
2+
version=Test Build

client/src/jsMain/kotlin/main.kt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,18 @@ import korlibs.io.lang.readProperties
44
import network.ClientEngineFactory
55
import network.URLProvider
66
import org.koin.core.context.startKoin
7+
import org.koin.core.qualifier.named
78
import org.koin.dsl.bind
89
import org.koin.dsl.module
910
import org.koin.mp.KoinPlatform
1011

1112
suspend fun main() {
12-
val url = resourcesVfs["client.properties"].readProperties()["server"]!!
13+
val clientProps = resourcesVfs["client.properties"].readProperties()
14+
val url = clientProps["server"]!!
15+
val version = clientProps["version"]!!
1316
startKoin {}
1417
KoinPlatform.getKoin().loadModules(listOf(module {
18+
single(named("version")) { version }
1519
factory {
1620
object : URLProvider {
1721
override val url: String get() = url

client/src/jvmMain/kotlin/main.kt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import korlibs.io.lang.readProperties
44
import network.ClientEngineFactory
55
import network.URLProvider
66
import org.koin.core.context.startKoin
7+
import org.koin.core.qualifier.named
78
import org.koin.dsl.bind
89
import org.koin.dsl.module
910
import org.koin.mp.KoinPlatform
@@ -12,11 +13,14 @@ import java.util.Properties
1213

1314
class Main
1415
suspend fun main() {
15-
val url = Properties().apply {
16+
val clientProps = Properties().apply {
1617
load(Main::class.java.getResourceAsStream("client.properties"))
17-
}["server"]!!.toString()
18+
}
19+
val url = clientProps["server"]!!.toString()
20+
val version = clientProps["version"]!!.toString()
1821
startKoin {}
1922
KoinPlatform.getKoin().loadModules(listOf(module {
23+
single(named("version")) { version }
2024
factory {
2125
object : URLProvider {
2226
override val url: String get() = url

0 commit comments

Comments
 (0)