分离shared

client-py/build.gradle.kts

@@ -68,6 +68,7 @@ kotlin {
     sourceSets {
         val nativeMain by getting {
             dependencies {
+                implementation(projects.shared)
                 api(projects.pyCommon)
                 api(projects.pyInternal)
                 implementation(libs.kotlinx.datetime)

client-py/src/nativeMain/kotlin/Client.kt

@@ -26,6 +26,7 @@ import kotlinx.coroutines.*
 import kotlinx.coroutines.channels.Channel
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.cbor.Cbor
+import xyz.xfqlittlefan.fhraise.logger
 import kotlin.coroutines.resume
 import kotlin.experimental.ExperimentalNativeApi
 

client-py/src/nativeMain/kotlin/Logger.kt

@@ -18,35 +18,12 @@
 
 package xyz.xfqlittlefan.fhraise.py
 
-import kotlinx.datetime.Clock
-import kotlinx.datetime.TimeZone
-import kotlinx.datetime.toLocalDateTime
-
-class Logger internal constructor(private val tag: Any) {
-    @Deprecated("This constructor is for calling from C code only.", level = DeprecationLevel.HIDDEN)
-    constructor(tag: String) : this("<From C> $tag" as Any)
-
-    fun debug(message: String) {
-        println("Debug", message)
-    }
-
-    fun info(message: String) {
-        println("Info", message)
-    }
-
-    fun warn(message: String) {
-        println("Warn", message)
-    }
-
-    fun error(message: String) {
-        println("Error", message)
-    }
-
-    private fun println(level: String, message: String) {
-        message.split("\n").forEach {
-            println("${Clock.System.now().toLocalDateTime(TimeZone.currentSystemDefault())} [$tag] $level: $it")
-        }
-    }
+class Logger(tag: String) {
+    private val delegate = xyz.xfqlittlefan.fhraise.Logger("<From C> $tag")
+
+    fun trace(message: String) = delegate.trace(message)
+    fun debug(message: String) = delegate.debug(message)
+    fun info(message: String) = delegate.info(message)
+    fun warn(message: String) = delegate.warn(message)
+    fun error(message: String) = delegate.error(message)
 }
-
-internal val Any.logger: Logger get() = Logger(this::class.let { it.qualifiedName ?: it })

client-py/src/nativeMain/kotlin/Throwable.kt

@@ -19,6 +19,7 @@
 package xyz.xfqlittlefan.fhraise.py
 
 import kotlinx.cinterop.*
+import xyz.xfqlittlefan.fhraise.logger
 import kotlin.experimental.ExperimentalNativeApi
 
 @ExperimentalForeignApi

compose-app/build.gradle.kts

@@ -66,7 +66,7 @@ kotlin {
     sourceSets {
         val commonMain by getting {
             dependencies {
-                implementation(projects.shared)
+                implementation(projects.sharedApp)
                 implementation(projects.pyCommon)
                 implementation(compose.runtime)
                 implementation(compose.foundation)

compose-app/compose-android.pro

@@ -1,6 +1,4 @@
 -dontwarn java.lang.management.ManagementFactory
 -dontwarn java.lang.management.RuntimeMXBean
-#-dontwarn org.slf4j.impl.StaticLoggerBinder
 
--keep class org.slf4j.** { *; }
 -keepclassmembers class xyz.xfqlittlefan.fhraise.oauth.OAuthApplication$module$1

server/build.gradle.kts

@@ -34,7 +34,7 @@ application {
 }
 
 dependencies {
-    implementation(projects.shared)
+    implementation(projects.sharedApp)
     implementation(projects.pyCommon)
     implementation(projects.pyInternal)
     implementation(libs.kotlinx.coroutines.core)

settings.gradle.kts

@@ -36,6 +36,7 @@ dependencyResolutionManagement {
 }
 
 include(":shared")
+include(":shared-app")
 
 include(":compose-app")
 include(":server")

shared-app/build.gradle.kts

@@ -0,0 +1,109 @@
+/*
+ * This file is part of Fhraise.
+ * Copyright (c) 2024 HSAS Foodies. All Rights Reserved.
+ *
+ * Fhraise is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
+ *
+ * Fhraise is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with Fhraise. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
+
+plugins {
+    alias(libs.plugins.kotlinMultiplatform)
+    alias(libs.plugins.kotlinSerialization)
+    alias(libs.plugins.androidLibrary)
+}
+
+kotlin {
+    androidTarget {
+        @OptIn(ExperimentalKotlinGradlePluginApi::class) compilerOptions {
+            jvmTarget.set(JvmTarget.JVM_17)
+        }
+    }
+
+    jvm()
+
+    @OptIn(ExperimentalWasmDsl::class) wasmJs {
+        browser()
+    }
+
+    applyDefaultHierarchyTemplate()
+
+    sourceSets {
+        val commonMain by getting {
+            dependencies {
+                implementation(projects.shared)
+                implementation(libs.kotlinx.coroutines.core)
+                implementation(libs.kotlinx.datetime)
+                implementation(libs.ktor.client.core)
+                implementation(libs.ktor.http)
+                implementation(libs.ktor.resources)
+            }
+        }
+
+        val commonJvmMain by creating {
+            dependsOn(commonMain)
+            dependencies {
+                implementation(libs.androidx.datastore.core)
+                implementation(libs.androidx.datastore.preferences.core)
+                implementation(libs.ktor.server.core)
+                implementation(libs.ktor.server.resources)
+            }
+
+            tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile::class.java) {
+                exclude("androidx/datastore/**")
+            }
+        }
+
+        val androidMain by getting {
+            dependsOn(commonJvmMain)
+            dependencies {
+                implementation(libs.androidx.datastore.preferences)
+            }
+        }
+
+        val jvmMain by getting {
+            dependsOn(commonJvmMain)
+        }
+
+        val wasmJsMain by getting {
+            dependencies {}
+        }
+    }
+}
+
+val androidCompileSdk: String by project
+val androidMinSdk: String by project
+
+android {
+    namespace = "xyz.xfqlittlefan.fhraise.sharedapp"
+    compileSdk = androidCompileSdk.toInt()
+
+    defaultConfig {
+        minSdk = androidMinSdk.toInt()
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+
+    splits {
+        abi {
+            isEnable = true
+            isUniversalApk = true
+        }
+    }
+}

shared/build.gradle.kts

@@ -27,10 +27,6 @@ plugins {
 }
 
 kotlin {
-    @OptIn(ExperimentalWasmDsl::class) wasmJs {
-        browser()
-    }
-
     androidTarget {
         @OptIn(ExperimentalKotlinGradlePluginApi::class) compilerOptions {
             jvmTarget.set(JvmTarget.JVM_17)
@@ -39,46 +35,54 @@ kotlin {
 
     jvm()
 
+    @OptIn(ExperimentalWasmDsl::class) wasmJs {
+        browser()
+    }
+
+    linuxArm64()
+    linuxX64()
+    mingwX64()
+
     applyDefaultHierarchyTemplate()
 
     sourceSets {
         val commonMain by getting {
             dependencies {
-                implementation(libs.kotlinx.coroutines.core)
                 implementation(libs.kotlinx.datetime)
-                implementation(libs.ktor.client.core)
-                implementation(libs.ktor.http)
-                implementation(libs.ktor.resources)
             }
         }
 
         val commonJvmMain by creating {
             dependsOn(commonMain)
             dependencies {
-                implementation(libs.androidx.datastore.core)
-                implementation(libs.androidx.datastore.preferences.core)
-                implementation(libs.ktor.server.core)
-                implementation(libs.ktor.server.resources)
-            }
-
-            tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile::class.java) {
-                exclude("androidx/datastore/**")
+                implementation(libs.slf4j.api)
             }
         }
 
         val androidMain by getting {
             dependsOn(commonJvmMain)
             dependencies {
-                implementation(libs.androidx.datastore.preferences)
+                implementation(libs.logback.android)
             }
         }
 
         val jvmMain by getting {
             dependsOn(commonJvmMain)
+            dependencies {
+                implementation(libs.logback)
+            }
+        }
+
+        val notJvmMain by creating {
+            dependsOn(commonMain)
         }
 
         val wasmJsMain by getting {
-            dependencies {}
+            dependsOn(notJvmMain)
+        }
+
+        val nativeMain by getting {
+            dependsOn(notJvmMain)
         }
     }
 }
@@ -92,6 +96,7 @@ android {
 
     defaultConfig {
         minSdk = androidMinSdk.toInt()
+        consumerProguardFiles("consumer-rules.pro")
     }
 
     compileOptions {

shared/proguard-android.pro

@@ -0,0 +1 @@
+-keep class org.slf4j.** { *; }

shared/src/commonMain/kotlin/xyz/xfqlittlefan/fhraise/Platform.kt → shared/src/commonMain/kotlin/Platform.kt

@@ -37,6 +37,20 @@ sealed interface DesktopPlatform : JvmPlatform {
     companion object
 }
 
-object WasmPlatform : Platform {
+data object WasmPlatform : Platform {
     override val name: String = "Web with Kotlin/Wasm"
 }
+
+sealed interface NativePlatform : Platform {
+    data object LinuxArm64 : NativePlatform {
+        override val name: String = "Linux Arm64"
+    }
+
+    data object LinuxX64 : NativePlatform {
+        override val name: String = "Linux x64"
+    }
+
+    data object WindowsX64 : NativePlatform {
+        override val name: String = "Windows x64"
+    }
+}

shared/src/linuxArm64Main/kotlin/Platform.linuxArm64.kt

@@ -0,0 +1,21 @@
+/*
+ * This file is part of Fhraise.
+ * Copyright (c) 2024 HSAS Foodies. All Rights Reserved.
+ *
+ * Fhraise is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
+ *
+ * Fhraise is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with Fhraise. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package xyz.xfqlittlefan.fhraise
+
+actual val platform: Platform = NativePlatform.LinuxArm64

client-py/src/nativeMain/kotlin/Types.kt → shared/src/linuxX64Main/kotlin/Platform.linuxX64.kt

@@ -16,4 +16,6 @@
  * with Fhraise. If not, see <https://www.gnu.org/licenses/>.
  */
 
-package xyz.xfqlittlefan.fhraise.py
+package xyz.xfqlittlefan.fhraise
+
+actual val platform: Platform = NativePlatform.LinuxX64

shared/src/mingwX64Main/kotlin/Platform.mingwX64.kt

@@ -0,0 +1,21 @@
+/*
+ * This file is part of Fhraise.
+ * Copyright (c) 2024 HSAS Foodies. All Rights Reserved.
+ *
+ * Fhraise is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
+ *
+ * Fhraise is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with Fhraise. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package xyz.xfqlittlefan.fhraise
+
+actual val platform: Platform = NativePlatform.WindowsX64