Skip to content

Commit 219fe18

Browse files
committed
aaaaaaaaaaaa
1 parent 78886a3 commit 219fe18

File tree

7 files changed

+20
-32
lines changed

7 files changed

+20
-32
lines changed

build.gradle.kts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ val dotenvVersion: String by project
88

99
plugins {
1010
application
11-
kotlin("jvm") version "1.9.22"
12-
id("io.ktor.plugin") version "2.3.8"
13-
id("org.jetbrains.kotlin.plugin.serialization") version "1.9.22"
11+
kotlin("jvm") version "1.9.23"
12+
id("io.ktor.plugin") version "2.3.9"
13+
id("org.jetbrains.kotlin.plugin.serialization") version "1.9.23"
1414
}
1515

1616
group = "dev.lythium.pulsar"
@@ -35,8 +35,6 @@ dependencies {
3535
implementation("io.ktor:ktor-server-content-negotiation-jvm:$ktorVersion")
3636
implementation("io.ktor:ktor-serialization-kotlinx-json-jvm:$ktorVersion")
3737

38-
implementation("com.squareup.okhttp3:okhttp:4.12.0")
39-
4038
implementation("org.jetbrains.exposed:exposed-core:$exposedVersion")
4139
implementation("org.jetbrains.exposed:exposed-jdbc:$exposedVersion")
4240
implementation("org.jetbrains.exposed:exposed-java-time:$exposedVersion")
@@ -45,6 +43,7 @@ dependencies {
4543
implementation("ch.qos.logback:logback-classic:$logbackVersion")
4644
implementation("org.mariadb.jdbc:mariadb-java-client:$mariadbVersion")
4745
implementation("io.github.cdimascio:dotenv-kotlin:$dotenvVersion")
46+
implementation("com.squareup.okhttp3:okhttp:4.12.0")
4847
}
4948

5049
ktor {

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
ktorVersion=3.0.0-beta-1
2-
kotlinVersion=1.9.22
1+
ktorVersion=2.3.9
2+
kotlinVersion=1.9.23
33
logbackVersion=1.4.14
44
kotlin.code.style=official
55
exposedVersion=0.41.1

gradle/wrapper/gradle-wrapper.jar

-19.8 KB
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew.bat

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
4343
%JAVA_EXE% -version >NUL 2>&1
4444
if %ERRORLEVEL% equ 0 goto execute
4545

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

5252
goto fail
5353

@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
5757

5858
if exist "%JAVA_EXE%" goto execute
5959

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

6666
goto fail
6767

src/main/kotlin/dev/lythium/pulsar/Application.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package dev.lythium.pulsar
22

3-
import dev.lythium.pulsar.Tickets.addon
43
import dev.lythium.pulsar.routes.ticketRoutes
54
import dev.lythium.pulsar.routes.userRoutes
65
import io.github.cdimascio.dotenv.dotenv
@@ -29,7 +28,7 @@ object Environment {
2928
val dotenv = dotenv()
3029
}
3130

32-
suspend fun main(args: Array<String>) {
31+
fun main(args: Array<String>) {
3332
println(Paths.get("").toAbsolutePath().toString())
3433

3534
val connectionString = Environment.dotenv.get("DATABASE_URL")
Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
ktor {
2-
development = true
2+
development = true
3+
34
deployment {
45
port = 8080
56
port = ${?PORT}
6-
sslPort = 8443
7-
sslPort = ${?SSL_PORT}
87
watch = [ classes, resources ]
98
}
109

@@ -13,13 +12,4 @@ development = true
1312
dev.lythium.pulsar.ApplicationKt.module
1413
]
1514
}
16-
17-
security {
18-
ssl {
19-
keyStore = test.jks
20-
keyAlias = testkey
21-
keyStorePassword = Password
22-
privateKeyPassword = Password
23-
}
24-
}
2515
}

0 commit comments

Comments
 (0)