Skip to content

Commit 8ff5703

Browse files
committed
Mega commit with new READMEs for project definition and scope as well as unit tested actor code.
1 parent 23dbd72 commit 8ff5703

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+1174
-754
lines changed

build.gradle.kts

+46-75
Original file line numberDiff line numberDiff line change
@@ -1,91 +1,62 @@
1-
// build.gradle.kts
1+
@file:OptIn(ExperimentalKotlinGradlePluginApi::class)
22

3-
val kotlinVersion = "2.0.0"
4-
val logbackVersion = "1.5.6"
3+
import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
54

65
plugins {
7-
kotlin("jvm") version "2.0.0"
8-
kotlin("plugin.serialization") version "1.8.0"
9-
application
6+
kotlin("multiplatform") version "2.0.21" // Use the latest stable version available
107
}
118

129
group = "ai.solace.core"
1310
version = "0.0.1"
1411

15-
application {
16-
mainClass.set("ai.solace.core.ApplicationKt")
17-
18-
val isDevelopment: Boolean = project.hasProperty("development")
19-
applicationDefaultJvmArgs = listOf("-Dio.ktor.development=$isDevelopment")
20-
}
21-
2212
repositories {
2313
mavenCentral()
2414
}
2515

26-
dependencies {
27-
// Ktor core dependencies
28-
// Note remove -jvm for other platforms
29-
implementation("io.ktor:ktor-server-core-jvm:2.3.12")
30-
implementation("io.ktor:ktor-server-netty-jvm:2.3.12")
31-
implementation("io.ktor:ktor-serialization-kotlinx-json-jvm:2.3.12")
32-
33-
implementation("io.ktor:ktor-client-core:2.3.11")
34-
implementation("io.ktor:ktor-client-cio:2.3.11")
35-
implementation("io.ktor:ktor-client-auth:2.3.11")
36-
implementation("io.ktor:ktor-client-content-negotiation:2.3.11")
37-
implementation("io.ktor:ktor-serialization-gson:2.3.12")
38-
39-
// Scripting engine
40-
implementation("org.jetbrains.kotlin:kotlin-scripting-jsr223:2.0.0")
41-
42-
43-
// Content Negotiation
44-
implementation("io.ktor:ktor-server-content-negotiation-jvm:2.3.12")
45-
46-
// CORS Support
47-
implementation("io.ktor:ktor-server-cors-jvm:2.3.12")
48-
49-
// Logging
50-
implementation("io.ktor:ktor-server-call-logging-jvm:2.3.12")
51-
implementation("ch.qos.logback:logback-classic:1.5.11")
52-
implementation("io.ktor:ktor-server-metrics-micrometer-jvm:2.3.12")
53-
54-
// Swagger/OpenAPI Support
55-
implementation("io.ktor:ktor-server-openapi-jvm:2.3.12")
56-
implementation("io.ktor:ktor-server-swagger-jvm:2.3.12")
57-
58-
// WebSockets and Sessions
59-
implementation("io.ktor:ktor-server-sessions-jvm:2.3.12")
60-
implementation("io.ktor:ktor-server-websockets-jvm:2.3.12")
61-
62-
// Observability
63-
implementation("io.ktor:ktor-server-metrics-micrometer-jvm:2.3.12")
64-
implementation("io.micrometer:micrometer-registry-prometheus:1.13.2")
65-
66-
// Authentication
67-
implementation("io.ktor:ktor-server-auth-jvm:2.3.12")
68-
69-
// Testing
70-
testImplementation("io.ktor:ktor-server-tests-jvm:2.3.12")
71-
testImplementation("org.jetbrains.kotlin:kotlin-test-junit:$kotlinVersion")
72-
testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.8.0")
73-
testImplementation("io.mockk:mockk:1.13.10")
74-
testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.2")
75-
testImplementation("org.junit.jupiter:junit-jupiter-params:5.10.2")
76-
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.2")
77-
}
16+
val kotlinxCoroutinesVersion = "1.9.0"
17+
val kotlinxSerializationJsonVersion = "1.7.3" // Update to the latest stable version
18+
val kotlinVersion = "2.0.21" // Match Kotlin version
19+
val junitJupiterVersion = "5.10.2"
7820

7921
kotlin {
80-
compilerOptions {
81-
apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_0)
82-
}
83-
}
84-
85-
tasks.test {
86-
useJUnitPlatform()
87-
testLogging {
88-
events("passed", "skipped", "failed")
89-
showStandardStreams = true
22+
jvm().withJava()
23+
js().nodejs()
24+
macosArm64("macosArm64Native")
25+
sourceSets {
26+
val commonMain by getting {
27+
dependencies {
28+
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinxCoroutinesVersion")
29+
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlinxSerializationJsonVersion")
30+
}
31+
}
32+
val commonTest by getting {
33+
dependencies {
34+
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:$kotlinxCoroutinesVersion")
35+
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlinxSerializationJsonVersion")
36+
}
37+
}
38+
val macosArm64NativeMain by getting {
39+
dependencies {
40+
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinxCoroutinesVersion")
41+
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlinxSerializationJsonVersion")
42+
}
43+
}
44+
val jvmMain by getting {
45+
dependencies {
46+
implementation("org.jetbrains.kotlin:kotlin-scripting-jsr223:$kotlinVersion")
47+
}
48+
}
49+
val jvmTest by getting {
50+
dependencies {
51+
implementation("org.jetbrains.kotlin:kotlin-scripting-jsr223:$kotlinVersion")
52+
implementation("org.jetbrains.kotlin:kotlin-test:$kotlinVersion")
53+
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:$kotlinxCoroutinesVersion")
54+
implementation("io.mockk:mockk:1.13.10")
55+
implementation("org.junit.jupiter:junit-jupiter-api:$junitJupiterVersion")
56+
implementation("org.junit.jupiter:junit-jupiter-params:$junitJupiterVersion")
57+
runtimeOnly("org.junit.jupiter:junit-jupiter-engine:$junitJupiterVersion")
58+
}
59+
}
9060
}
61+
jvmToolchain(21)
9162
}

gradle/wrapper/gradle-wrapper.jar

-15.6 KB
Binary file not shown.
+3-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
46
zipStoreBase=GRADLE_USER_HOME
57
zipStorePath=wrapper/dists

gradlew

+31-13
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
# See the License for the specific language governing permissions and
1616
# limitations under the License.
1717
#
18+
# SPDX-License-Identifier: Apache-2.0
19+
#
1820

1921
##############################################################################
2022
#
@@ -55,7 +57,7 @@
5557
# Darwin, MinGW, and NonStop.
5658
#
5759
# (3) This script is generated from the Groovy template
58-
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
60+
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
5961
# within the Gradle project.
6062
#
6163
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +82,12 @@ do
8082
esac
8183
done
8284

83-
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
84-
85-
APP_NAME="Gradle"
85+
# This is normally unused
86+
# shellcheck disable=SC2034
8687
APP_BASE_NAME=${0##*/}
87-
88-
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
89-
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
88+
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
89+
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
90+
' "$PWD" ) || exit
9091

9192
# Use the maximum available, or set MAX_FD != -1 to use that value.
9293
MAX_FD=maximum
@@ -133,22 +134,29 @@ location of your Java installation."
133134
fi
134135
else
135136
JAVACMD=java
136-
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
137+
if ! command -v java >/dev/null 2>&1
138+
then
139+
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
137140
138141
Please set the JAVA_HOME variable in your environment to match the
139142
location of your Java installation."
143+
fi
140144
fi
141145

142146
# Increase the maximum file descriptors if we can.
143147
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
144148
case $MAX_FD in #(
145149
max*)
150+
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
151+
# shellcheck disable=SC2039,SC3045
146152
MAX_FD=$( ulimit -H -n ) ||
147153
warn "Could not query maximum file descriptor limit"
148154
esac
149155
case $MAX_FD in #(
150156
'' | soft) :;; #(
151157
*)
158+
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
159+
# shellcheck disable=SC2039,SC3045
152160
ulimit -n "$MAX_FD" ||
153161
warn "Could not set maximum file descriptor limit to $MAX_FD"
154162
esac
@@ -193,18 +201,28 @@ if "$cygwin" || "$msys" ; then
193201
done
194202
fi
195203

196-
# Collect all arguments for the java command;
197-
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
198-
# shell script including quotes and variable substitutions, so put them in
199-
# double quotes to make sure that they get re-expanded; and
200-
# * put everything else in single quotes, so that it's not re-expanded.
204+
205+
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
206+
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
207+
208+
# Collect all arguments for the java command:
209+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
210+
# and any embedded shellness will be escaped.
211+
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
212+
# treated as '${Hostname}' itself on the command line.
201213

202214
set -- \
203215
"-Dorg.gradle.appname=$APP_BASE_NAME" \
204216
-classpath "$CLASSPATH" \
205217
org.gradle.wrapper.GradleWrapperMain \
206218
"$@"
207219

220+
# Stop when "xargs" is not available.
221+
if ! command -v xargs >/dev/null 2>&1
222+
then
223+
die "xargs is not available"
224+
fi
225+
208226
# Use "xargs" to parse quoted args.
209227
#
210228
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew.bat

+21-16
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,10 @@
1313
@rem See the License for the specific language governing permissions and
1414
@rem limitations under the License.
1515
@rem
16+
@rem SPDX-License-Identifier: Apache-2.0
17+
@rem
1618

17-
@if "%DEBUG%" == "" @echo off
19+
@if "%DEBUG%"=="" @echo off
1820
@rem ##########################################################################
1921
@rem
2022
@rem Gradle startup script for Windows
@@ -25,7 +27,8 @@
2527
if "%OS%"=="Windows_NT" setlocal
2628

2729
set DIRNAME=%~dp0
28-
if "%DIRNAME%" == "" set DIRNAME=.
30+
if "%DIRNAME%"=="" set DIRNAME=.
31+
@rem This is normally unused
2932
set APP_BASE_NAME=%~n0
3033
set APP_HOME=%DIRNAME%
3134

@@ -40,13 +43,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome
4043

4144
set JAVA_EXE=java.exe
4245
%JAVA_EXE% -version >NUL 2>&1
43-
if "%ERRORLEVEL%" == "0" goto execute
46+
if %ERRORLEVEL% equ 0 goto execute
4447

45-
echo.
46-
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
47-
echo.
48-
echo Please set the JAVA_HOME variable in your environment to match the
49-
echo location of your Java installation.
48+
echo. 1>&2
49+
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
50+
echo. 1>&2
51+
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
52+
echo location of your Java installation. 1>&2
5053

5154
goto fail
5255

@@ -56,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
5659

5760
if exist "%JAVA_EXE%" goto execute
5861

59-
echo.
60-
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
61-
echo.
62-
echo Please set the JAVA_HOME variable in your environment to match the
63-
echo location of your Java installation.
62+
echo. 1>&2
63+
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
64+
echo. 1>&2
65+
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
66+
echo location of your Java installation. 1>&2
6467

6568
goto fail
6669

@@ -75,13 +78,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
7578

7679
:end
7780
@rem End local scope for the variables with windows NT shell
78-
if "%ERRORLEVEL%"=="0" goto mainEnd
81+
if %ERRORLEVEL% equ 0 goto mainEnd
7982

8083
:fail
8184
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
8285
rem the _cmd.exe /c_ return code!
83-
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
84-
exit /b 1
86+
set EXIT_CODE=%ERRORLEVEL%
87+
if %EXIT_CODE% equ 0 set EXIT_CODE=1
88+
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
89+
exit /b %EXIT_CODE%
8590

8691
:mainEnd
8792
if "%OS%"=="Windows_NT" endlocal

settings.gradle.kts

+3
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
11
rootProject.name = "SolaceCore"
2+
plugins {
3+
id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
4+
}

0 commit comments

Comments
 (0)