diff --git a/build.gradle.kts b/build.gradle.kts index e08c569..b0b1738 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,7 +1,8 @@ plugins { - kotlin("multiplatform") version "1.7.10" - kotlin("plugin.serialization") version "1.7.10" - id("org.jetbrains.compose") + alias(libs.plugins.kotlin.multiplatform) + alias(libs.plugins.kotlin.serialization) + alias(libs.plugins.compose) + alias(libs.plugins.ktor) application } @@ -10,58 +11,58 @@ version = "1.0-SNAPSHOT" repositories { mavenCentral() - maven("https://maven.pkg.jetbrains.space/public/p/kotlinx-html/maven") + google() } kotlin { + jvmToolchain(17) jvm { - compilations.all { - kotlinOptions.jvmTarget = "11" - } withJava() - testRuns["test"].executionTask.configure { - useJUnitPlatform() + testRuns.configureEach { + executionTask { + useJUnitPlatform() + } } } js(IR) { - binaries.executable() + useEsModules() browser { commonWebpackConfig { - cssSupport.enabled = true - bundleAnalyzerReportDir = File(buildDir, "analysis") + cssSupport { + enabled = true + } } } + binaries.executable() } sourceSets { - val commonMain by getting { + commonMain { dependencies { implementation(compose.runtime) - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4") - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1") + implementation(libs.kotlinx.coroutines.core) + implementation(libs.kotlinx.serialization.json) } } - val commonTest by getting { + commonTest { dependencies { - implementation(kotlin("test")) + implementation(libs.kotlin.test) } } - val jvmMain by getting { + jvmMain { dependencies { - implementation("io.ktor:ktor-server-netty:2.1.2") - implementation("io.ktor:ktor-server-html-builder-jvm:2.1.2") - implementation("org.jetbrains.kotlinx:kotlinx-html-jvm:0.7.2") - implementation("io.rsocket.kotlin:rsocket-ktor-server:0.15.4") + implementation(libs.ktor.server.netty) + implementation(libs.ktor.server.html.builder) + implementation(libs.rsocket.ktor.server) + implementation(libs.logback.classic) } } - val jvmTest by getting - val jsMain by getting { + jsMain { dependencies { - implementation(compose.web.core) - implementation("io.ktor:ktor-client-js:2.1.2") - implementation("io.rsocket.kotlin:rsocket-transport-ktor-websocket-client:0.15.4") + implementation(compose.html.core) + implementation(libs.ktor.client.js) + implementation(libs.rsocket.transport.ktor.websocket.client) } } - val jsTest by getting } } @@ -71,8 +72,10 @@ application { tasks.named("jvmProcessResources") { val jsBrowserDistribution = tasks.named("jsBrowserDistribution") - include("*.js") - from(jsBrowserDistribution) + dependsOn(jsBrowserDistribution) + from(jsBrowserDistribution) { + into("www") + } } tasks.named("run") { diff --git a/gradle.properties b/gradle.properties deleted file mode 100644 index 48ff2cf..0000000 --- a/gradle.properties +++ /dev/null @@ -1,8 +0,0 @@ -kotlin.code.style=official -kotlin.mpp.enableGranularSourceSetsMetadata=true -kotlin.native.enableDependencyPropagation=false -kotlin.js.generate.executable.default=false - -kotlin.js.webpack.major.version=4 -kotlin.version=1.7.10 -compose.version=1.2.0 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 0000000..4b35720 --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,49 @@ +[versions] + +kotlin = "1.9.23" + +kotlinx-coroutines = "1.8.0" + +kotlinx-serialization = "1.6.3" + +ktor = "2.3.10" + +compose = "1.6.2" + +rsocket = "0.15.4" + +[plugins] + +kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" } + +kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } + +ktor = { id = "io.ktor.plugin", version.ref = "ktor" } + +compose = { id = "org.jetbrains.compose", version.ref = "compose" } + +[libraries] + +kotlin-test = { group = "org.jetbrains.kotlin", name = "kotlin-test", version.ref = "kotlin" } + +kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" } + +kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "kotlinx-serialization" } + +compose-runtime = { module = "org.jetbrains.compose.runtime:runtime", version.ref = "compose" } + +compose-html-core = { group = "org.jetbrains.compose.html", name = "html-core", version.ref = "compose" } + +ktor-bom = { group = "io.ktor", name = "ktor-bom", version.ref = "ktor" } + +ktor-client-js = { group = "io.ktor", name = "ktor-client-js", version.ref = "ktor" } + +ktor-server-netty = { module = "io.ktor:ktor-server-netty", version.ref = "ktor" } + +ktor-server-html-builder = { module = "io.ktor:ktor-server-html-builder", version.ref = "ktor" } + +rsocket-ktor-server = { module = "io.rsocket.kotlin:rsocket-ktor-server", version.ref = "rsocket" } + +rsocket-transport-ktor-websocket-client = { module = "io.rsocket.kotlin:rsocket-transport-ktor-websocket-client", version.ref = "rsocket" } + +logback-classic = "ch.qos.logback:logback-classic:1.5.6" diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 41d9927..e644113 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ae04661..b82aa23 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 1b6c787..1aa94a4 100644 --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,13 +80,11 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -133,22 +131,29 @@ location of your Java installation." fi else JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -193,11 +198,15 @@ if "$cygwin" || "$msys" ; then done fi -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ @@ -205,6 +214,12 @@ set -- \ org.gradle.wrapper.GradleWrapperMain \ "$@" +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + # Use "xargs" to parse quoted args. # # With -n1 it outputs one arg per line, with the quotes and backslashes removed. diff --git a/gradlew.bat b/gradlew.bat index 107acd3..25da30d 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,13 +41,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -56,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/settings.gradle.kts b/settings.gradle.kts index bbcd99d..0fe656a 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,18 +1 @@ - -rootProject.name = "full-stack-demo" - -pluginManagement { - repositories { - google() - gradlePluginPortal() - mavenCentral() - maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") - } - - plugins { - kotlin("multiplatform").version(extra["kotlin.version"] as String) - id("org.jetbrains.compose").version(extra["compose.version"] as String) - } -} - - +rootProject.name = "full-stack-demo" \ No newline at end of file diff --git a/src/jsMain/resources/index.html b/src/jsMain/resources/www/index.html similarity index 100% rename from src/jsMain/resources/index.html rename to src/jsMain/resources/www/index.html diff --git a/src/jvmMain/kotlin/server.kt b/src/jvmMain/kotlin/server.kt index 0ffa857..775328a 100644 --- a/src/jvmMain/kotlin/server.kt +++ b/src/jvmMain/kotlin/server.kt @@ -6,6 +6,7 @@ import io.ktor.server.application.install import io.ktor.server.engine.embeddedServer import io.ktor.server.html.respondHtml import io.ktor.server.http.content.resources +import io.ktor.server.http.content.staticResources import io.ktor.server.netty.Netty import io.ktor.server.routing.get import io.ktor.server.routing.routing @@ -62,7 +63,7 @@ fun main() { get("/") { call.respondHtml(HttpStatusCode.OK, HTML::index) } - resources() + staticResources("/","www") rSocket("rsocket") { println(config.setupPayload.data.readText()) //print setup payload data