Skip to content

Commit 94fb86d

Browse files
committed
Dependency updates.
1 parent d3dc7be commit 94fb86d

8 files changed

Lines changed: 37 additions & 34 deletions

File tree

.idea/kotlinc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build.gradle.kts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
22

33
plugins {
4-
kotlin("jvm") version "1.9.10" apply false
4+
kotlin("jvm") version "1.9.20" apply false
55
id("org.jmailen.kotlinter") version "4.0.0" apply false
66
id("com.github.ben-manes.versions") version "0.49.0"
7-
id("io.gitlab.arturbosch.detekt") version "1.23.1"
8-
id("com.google.devtools.ksp") version "1.9.10-1.0.13" apply false
7+
id("io.gitlab.arturbosch.detekt") version "1.23.3"
8+
id("com.google.devtools.ksp") version "1.9.20-1.0.14" apply false
99
}
1010
subprojects {
1111
group = "com.github.cs124-illinois.jeed"
12-
version = "2023.10.6"
12+
version = "2023.11.0"
1313
tasks.withType<Test> {
1414
useJUnitPlatform()
1515
enableAssertions = true

containerrunner/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ dependencies {
1313
implementation("ch.qos.logback:logback-classic:1.4.11")
1414
implementation("io.github.microutils:kotlin-logging:3.0.5")
1515
implementation("com.github.ajalt.clikt:clikt:4.2.1")
16-
implementation("io.github.classgraph:classgraph:4.8.162")
16+
implementation("io.github.classgraph:classgraph:4.8.164")
1717
}
1818
application {
1919
mainClass.set("edu.illinois.cs.cs125.jeed.containerrunner.MainKt")
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
version=2023.10.6
1+
version=2023.11.0

core/build.gradle.kts

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ import java.io.File
22
import java.io.StringWriter
33
import java.util.Properties
44
import org.gradle.internal.os.OperatingSystem
5+
import org.jmailen.gradle.kotlinter.tasks.FormatTask
6+
import org.jmailen.gradle.kotlinter.tasks.LintTask
57

68
plugins {
79
kotlin("jvm")
@@ -17,7 +19,7 @@ dependencies {
1719

1820
antlr("org.antlr:antlr4:4.13.1")
1921

20-
implementation("org.jetbrains.kotlin:kotlin-compiler-embeddable:1.9.10")
22+
implementation("org.jetbrains.kotlin:kotlin-compiler-embeddable:1.9.20")
2123

2224
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3")
2325
implementation("com.puppycrawl.tools:checkstyle:10.12.4")
@@ -32,18 +34,18 @@ dependencies {
3234
implementation("org.slf4j:slf4j-api:2.0.9")
3335
implementation("ch.qos.logback:logback-classic:1.4.11")
3436
implementation("io.github.microutils:kotlin-logging:3.0.5")
35-
implementation("io.github.classgraph:classgraph:4.8.163")
37+
implementation("io.github.classgraph:classgraph:4.8.164")
3638
implementation("net.java.dev.jna:jna:5.13.0")
3739
implementation("io.github.java-diff-utils:java-diff-utils:4.12")
3840
implementation("com.google.googlejavaformat:google-java-format:1.18.1")
3941
implementation("net.sf.extjwnl:extjwnl:2.0.5")
4042
implementation("net.sf.extjwnl:extjwnl-data-wn31:1.2")
4143
implementation("com.beyondgrader.resource-agent:agent:2023.9.0")
4244

43-
api("org.jacoco:org.jacoco.core:0.8.10")
45+
api("org.jacoco:org.jacoco.core:0.8.11")
4446
api("com.github.ben-manes.caffeine:caffeine:3.1.8")
4547

46-
testImplementation("io.kotest:kotest-runner-junit5:5.7.2")
48+
testImplementation("io.kotest:kotest-runner-junit5:5.8.0")
4749
}
4850
tasks.test {
4951
useJUnitPlatform()
@@ -92,12 +94,6 @@ afterEvaluate {
9294
tasks.named("kspTestKotlin") {
9395
dependsOn(tasks.generateTestGrammarSource)
9496
}
95-
tasks.named("formatKotlinGeneratedByKspKotlin") {
96-
enabled = false
97-
}
98-
tasks.named("lintKotlinGeneratedByKspKotlin") {
99-
enabled = false
100-
}
10197
tasks.named("formatKotlinTest") {
10298
dependsOn(tasks.generateTestGrammarSource)
10399
}
@@ -154,3 +150,9 @@ java {
154150
languageVersion.set(JavaLanguageVersion.of(17))
155151
}
156152
}
153+
tasks.withType<FormatTask> {
154+
this.source = this.source.minus(fileTree("build")).asFileTree
155+
}
156+
tasks.withType<LintTask> {
157+
this.source = this.source.minus(fileTree("build")).asFileTree
158+
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
version=2023.10.6
1+
version=2023.11.0

server/build.gradle.kts

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import org.jmailen.gradle.kotlinter.tasks.FormatTask
2+
import org.jmailen.gradle.kotlinter.tasks.LintTask
13
import java.io.File
24
import java.io.StringWriter
35
import java.util.Properties
@@ -10,7 +12,7 @@ plugins {
1012
id("org.jmailen.kotlinter")
1113
id("io.gitlab.arturbosch.detekt")
1214
id("com.google.devtools.ksp")
13-
id("com.ryandens.javaagent-test") version "0.5.0"
15+
id("com.ryandens.javaagent-test") version "0.5.1"
1416
}
1517
dependencies {
1618
ksp("com.squareup.moshi:moshi-kotlin-codegen:1.15.0")
@@ -19,23 +21,23 @@ dependencies {
1921

2022
implementation(project(":core"))
2123

22-
implementation("io.ktor:ktor-server-netty:2.3.5")
23-
implementation("io.ktor:ktor-server-cors:2.3.5")
24-
implementation("io.ktor:ktor-server-content-negotiation:2.3.5")
24+
implementation("io.ktor:ktor-server-netty:2.3.6")
25+
implementation("io.ktor:ktor-server-cors:2.3.6")
26+
implementation("io.ktor:ktor-server-content-negotiation:2.3.6")
2527
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3")
2628
implementation("com.squareup.moshi:moshi-kotlin:1.15.0")
2729
implementation("com.github.cs124-illinois:ktor-moshi:2023.10.1")
2830
implementation("ch.qos.logback:logback-classic:1.4.11")
2931
implementation("com.uchuhimo:konf-core:1.1.2")
3032
implementation("com.uchuhimo:konf-yaml:1.1.2")
3133
implementation("io.github.microutils:kotlin-logging:3.0.5")
32-
implementation("com.github.cs124-illinois:libcs1:2023.10.0")
34+
implementation("com.github.cs124-illinois:libcs1:2023.11.0")
3335
implementation("com.beyondgrader.resource-agent:agent:2023.9.0")
3436
implementation("com.beyondgrader.resource-agent:jeedplugin:2023.9.0")
3537

36-
testImplementation("io.kotest:kotest-runner-junit5:5.7.2")
38+
testImplementation("io.kotest:kotest-runner-junit5:5.8.0")
3739
testImplementation("io.kotest:kotest-assertions-ktor:4.4.3")
38-
testImplementation("io.ktor:ktor-server-test-host:2.3.5")
40+
testImplementation("io.ktor:ktor-server-test-host:2.3.6")
3941
}
4042

4143
application {
@@ -118,16 +120,15 @@ tasks.shadowJar {
118120
attributes["Can-Retransform-Classes"] = "true"
119121
}
120122
}
121-
afterEvaluate {
122-
tasks.named("formatKotlinGeneratedByKspKotlin") {
123-
enabled = false
124-
}
125-
tasks.named("lintKotlinGeneratedByKspKotlin") {
126-
enabled = false
127-
}
128-
}
129123
java {
130124
toolchain {
131125
languageVersion.set(JavaLanguageVersion.of(17))
132126
}
133127
}
128+
tasks.withType<FormatTask> {
129+
this.source = this.source.minus(fileTree("build")).asFileTree
130+
}
131+
tasks.withType<LintTask> {
132+
this.source = this.source.minus(fileTree("build")).asFileTree
133+
}
134+
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
version=2023.10.6
1+
version=2023.11.0

0 commit comments

Comments
 (0)