Merge branch 'dev'

naotiki · Jul 2, 2023 · 92d8965 · 92d8965
2 parents 260698b + 4ad56b2
commit 92d8965
Show file tree

Hide file tree

Showing 10 changed files with 421 additions and 283 deletions.
diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml
@@ -16,7 +16,7 @@ jobs:
     if: startsWith( inputs.version || github.ref_name , 'v' )
     strategy:
       matrix:
-        os: [windows-latest, ubuntu-latest]
+        os: [windows-latest, ubuntu-latest,macos-latest]
     uses: ./.github/workflows/build-client.yml
     with:
       version: ${{ inputs.version || github.ref_name }}

diff --git a/chiiugo-protocol-core/build.gradle.kts b/chiiugo-protocol-core/build.gradle.kts
@@ -1,5 +1,5 @@
-import org.jetbrains.kotlin.gradle.targets.js.npm.PackageJson
-import org.jetbrains.kotlin.gradle.targets.js.npm.tasks.KotlinPackageJsonTask
+import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsCompilation
+import org.jetbrains.kotlin.gradle.targets.js.npm.PublicPackageJsonTask
 
 plugins {
     kotlin("multiplatform")
@@ -21,36 +21,51 @@ dependencies {
 
 }
 
+
 kotlin {
+    targets {
+        js {
+            compilations.all{
+                packageJson {
+                    //name="@naotiki/chiiugo"
+                    private=false
+                }
+            }
+        }
+    }
     jvm()
     js(IR) {
+        compilations.getByName("main"){
+            packageJson {
+                name="@naotiki/chiiugo"
+                private=false
+            }
+        }
         binaries.executable()
 
         nodejs {
-this.runTask {
 
-}
         }
         generateTypeScriptDefinitions()
     }
-    sourceSets{
-        val commonMain by getting{
-           dependencies {
-               //testImplementation(kotlin("test"))
-               //implementation("org.jetbrains.kotlinx:kotlinx-nodejs:0.0.7")
-               implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
-               implementation("org.jetbrains.kotlinx:kotlinx-serialization-protobuf:1.5.1")
-           }
+    sourceSets {
+        val commonMain by getting {
+            dependencies {
+                //testImplementation(kotlin("test"))
+                //implementation("org.jetbrains.kotlinx:kotlinx-nodejs:0.0.7")
+                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
+                implementation("org.jetbrains.kotlinx:kotlinx-serialization-protobuf:1.5.1")
+            }
 
 
         }
-        val jsMain by getting{
+        val jsMain by getting {
             dependencies {
                 implementation(enforcedPlatform(kotlinw("wrappers-bom:$kotlinWrappersVersion")))
                 implementation(kotlinw("node"))
             }
         }
-        val jvmMain by getting{
+        val jvmMain by getting {
 
         }
     }

diff --git a/chiiugo-protocol-core/src/commonMain/kotlin/Event.kt b/chiiugo-protocol-core/src/commonMain/kotlin/Event.kt
@@ -18,6 +18,7 @@ sealed class Event{
     data class SuccessBuild(val buildId:String) : Event()
     @Serializable
     data class FailedBuild(val buildId:String): Event()
+    @Suppress("NON_EXPORTABLE_TYPE")
     @Serializable
     data class Typed(val char: Char): Event()
     @Serializable

diff --git a/chiiugo-protocol-core/src/jsMain/kotlin/Client.kt b/chiiugo-protocol-core/src/jsMain/kotlin/Client.kt
@@ -16,7 +16,7 @@ class Client(val clientData: ClientData):Disposable {
     var socket: Socket? = null
 
     fun startServer(): Promise<Unit> {
-        return Promise { resolve, reject ->
+        return Promise { resolve, _ ->
             val s = Socket()
             s.once(Event.ERROR) {
                 console.log("Error")

diff --git a/client-app/build.gradle.kts b/client-app/build.gradle.kts
@@ -33,6 +33,7 @@ dependencies {
     implementation(compose.desktop.currentOs)
     @OptIn(org.jetbrains.compose.ExperimentalComposeLibrary::class)
     implementation(compose.desktop.components.animatedImage)
+    implementation(compose.materialIconsExtended)
 
 
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
@@ -47,7 +48,7 @@ dependencies {
     implementation("org.jetbrains.exposed:exposed-jdbc:$exposedVersion")
     implementation("org.jetbrains.exposed:exposed-kotlin-datetime:$exposedVersion")
     implementation("com.h2database:h2:2.1.214")
-
+    implementation("com.1stleg:jnativehook:2.1.0")
     implementation(project(":chiiugo-protocol-core"))
 }
 
@@ -58,7 +59,7 @@ compose.desktop {
         jvmArgs += listOf("-Dfile.encoding=UTF-8")
         nativeDistributions {
             modules("java.sql")
-            targetFormats( TargetFormat.Msi, TargetFormat.Deb, TargetFormat.Rpm)
+            targetFormats( TargetFormat.Msi, TargetFormat.Deb, TargetFormat.Rpm,TargetFormat.Dmg)
             packageName = "Chiiugo"
             description = "Chiiugo Client App"
             vendor="Naotiki"
@@ -68,6 +69,9 @@ compose.desktop {
                 shortcut = true
                 iconFile.set(file("Chiiugo.png"))
             }
+            macOS{
+                packageVersion=appVersion.generateMacVersion()
+            }
             windows {
                 perUserInstall=true
                 packageVersion = appVersion.generateWindowsVersion()

diff --git a/client-app/buildSrc/src/main/kotlin/AppVersion.kt b/client-app/buildSrc/src/main/kotlin/AppVersion.kt
@@ -30,6 +30,12 @@ data class AppVersion(
             }
         }
     }
+    fun generateMacVersion():String{
+        val winPatch=if (preRelease!=null&&preReleaseNumber!=null){
+            (patch shl 8) or (preRelease.ordinal shl 6) or preReleaseNumber
+        }else (patch shl 8) or (0b11 shl 6)
+        return "${major+1}.$minor.$winPatch"
+    }
     fun generateWindowsVersion(): String {
         val winPatch=if (preRelease!=null&&preReleaseNumber!=null){
             (patch shl 8) or (preRelease.ordinal shl 6) or preReleaseNumber