init

.github/workflows/release.yml

@@ -41,8 +41,6 @@ jobs:
       - name: Buid
         run: |
           ./gradlew :client:jsBrowserProductionWebpack
-#          brew install wine-stable
-#          ./gradlew :client:linkReleaseExecutableMingwX64
       - name: server.zip
         run: ./gradlew :server:distZip
 
@@ -57,3 +55,37 @@ jobs:
       - shell: bash
         run: |
           curl -d "${{ secrets.ADMIN_KEY }}" -X POST ${{ env.url }}/shutdown
+  buildExe:
+    name: Release .exe
+    runs-on: windows-latest
+    needs: release
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up JDK 11
+        uses: actions/setup-java@v1
+        with:
+          java-version: 11
+      - name: set properties value of server
+        run: |
+          echo "import java.io.File;import java.io.FileInputStream;import java.util.Arrays;import java.util.Iterator;import java.util.Properties;public class Prop {public static void main(String[] args) throws Exception {Iterator<String> iterator = Arrays.stream(args).iterator();if (!iterator.hasNext()) return;String fileName = iterator.next();File file = new File(fileName);Properties props = new Properties();props.load(new FileInputStream(file));while (true) {if (!iterator.hasNext()) return;String key = iterator.next();if (!iterator.hasNext()) return;String value = iterator.next();props.setProperty(key, value);}}}" > Prop.java
+          java Prop.java gradle.properties server ${{ env.url }}
+          java Prop.java gradle.properties version v0.0.${{github.run_number}}
+      - run: git tag ${{github.run_number}}
+
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+      - name: Buid
+        run: |
+          brew install wine-stable
+          ./gradlew :client:linkReleaseExecutableMingwX64
+
+      - name: Build
+        run: cargo build --release
+      - name: Upload binaries to release
+        uses: svenstaro/upload-release-action@v2
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file: client/build/**
+          tag: ${{ github.ref }}
+          overwrite: true
+

client/build.gradle.kts

@@ -13,11 +13,10 @@ korge {
     targetJs()
     targetDesktopCross()
     targetDesktop()
-    entryPoint = "startMain"
+    entryPoint = "runMain"
 }
 
 kotlin {
-    mingwX64()
     sourceSets {
         val commonMain by getting {
             dependencies {
@@ -26,10 +25,9 @@ kotlin {
                 api(project(":deps"))
             }
         }
-        val jsMain by getting
-        val jvmMain by getting
-        val mingwX64Main by getting
-        val macosArm64Main by getting
+        runCatching { val jvmMain by getting }
+        runCatching { val mingwX64Main by getting }
+        runCatching { val macosArm64Main by getting }
     }
 }
 

client/src/commonMain/kotlin/start.kt

@@ -1,19 +1,23 @@
 import korlibs.image.font.Font
 import korlibs.image.font.readWoffFont
 import korlibs.image.format.*
+import korlibs.io.async.runBlockingNoSuspensions
 import korlibs.io.file.std.resourcesVfs
 import korlibs.korge.Korge
 import korlibs.korge.scene.SceneContainer
 import korlibs.korge.scene.sceneContainer
 import korlibs.math.geom.ScaleMode
 import korlibs.math.geom.Size
+import kotlinx.coroutines.currentCoroutineContext
+import kotlinx.coroutines.withContext
 import network.client
 import org.koin.core.qualifier.named
 import org.koin.dsl.bind
 import org.koin.dsl.module
 import org.koin.mp.KoinPlatform.getKoin
 import scene.MainScene
 import util.ColorPalette
+import util.launchNow
 import websocket.startWebSocket
 import kotlin.coroutines.coroutineContext
 import kotlin.random.Random

client/src/macosArm64Main/kotlin/main.kt

@@ -0,0 +1,37 @@
+import io.ktor.client.engine.cio.*
+import korlibs.io.async.runBlockingNoSuspensions
+import korlibs.io.file.std.resourcesVfs
+import korlibs.io.lang.readProperties
+import kotlinx.coroutines.withContext
+import network.ClientEngineFactory
+import network.URLProvider
+import org.koin.core.context.startKoin
+import org.koin.core.qualifier.named
+import org.koin.dsl.bind
+import org.koin.dsl.module
+import org.koin.mp.KoinPlatform
+
+class Main
+
+fun runMain() = main()
+
+fun main() {
+    runBlockingNoSuspensions {
+        val clientProps = resourcesVfs["client.properties"].readProperties()
+        val url = clientProps["server"]!!
+        val version = clientProps["version"]!!
+        startKoin {}
+        KoinPlatform.getKoin().loadModules(listOf(module {
+            single(named("version")) { version }
+            factory {
+                object : URLProvider {
+                    override val url: String get() = url
+                }
+            } bind URLProvider::class
+            factory {
+                object : ClientEngineFactory { override fun getEngine() = CIO }
+            } bind ClientEngineFactory::class
+        }))
+        start()
+    }
+}

shared/build.gradle.kts

@@ -11,12 +11,11 @@ plugins {
 korge {
     targetJvm()
     targetJs()
-    targetDesktop()
     targetDesktopCross()
     targetDesktop()
-    entryPoint = "startMain"
+    entryPoint = "runMain"
 }
-kapt { generateStubs = true }
+
 kotlin {
     linuxArm64().apply {
         configurations.filter { it.name.contains("linuxArm64") }.forEach {

shared/src/commonMain/kotlin/start.kt

@@ -1,3 +1,3 @@
-fun startMain() {
+fun runMain() {
     println("A")
-}
+}