Skip to content

Commit

Permalink
Dependency updates.
Browse files Browse the repository at this point in the history
  • Loading branch information
gchallen committed Aug 29, 2021
1 parent d6b9d0b commit 6f5e73e
Show file tree
Hide file tree
Showing 10 changed files with 52 additions and 18 deletions.
16 changes: 12 additions & 4 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
kotlin("jvm") version "1.5.21" apply false
kotlin("kapt") version "1.5.21" apply false
id("org.jmailen.kotlinter") version "3.5.0" apply false
kotlin("jvm") version "1.5.30" apply false
kotlin("kapt") version "1.5.30" apply false
id("org.jmailen.kotlinter") version "3.5.1" apply false
id("com.github.ben-manes.versions") version "0.39.0"
id("io.gitlab.arturbosch.detekt") version "1.18.0"
}
Expand All @@ -16,13 +18,19 @@ allprojects {
}
subprojects {
group = "com.github.cs125-illinois.jeed"
version = "2021.8.2"
version = "2021.8.3"
tasks.withType<Test> {
useJUnitPlatform()
enableAssertions = true
// Fix encoding bug on Windows
jvmArgs("-Dfile.encoding=UTF-8", "--illegal-access=permit")
}
tasks.withType<KotlinCompile> {
kotlinOptions {
jvmTarget = JavaVersion.VERSION_16.toString()
}

}
}
tasks.dependencyUpdates {
fun String.isNonStable() = !(
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version=2021.8.2
version=2021.8.3
17 changes: 16 additions & 1 deletion core/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ dependencies {

api("com.github.ben-manes.caffeine:caffeine:3.0.3")

testImplementation("io.kotest:kotest-runner-junit5:4.6.1")
testImplementation("io.kotest:kotest-runner-junit5:4.6.2")
}
tasks.test {
useJUnitPlatform()
Expand Down Expand Up @@ -122,3 +122,18 @@ publishing {
}
}
}
kotlin {
kotlinDaemonJvmArgs = listOf(
"-Dfile.encoding=UTF-8",
"--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED",
"--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED",
"--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED",
"--add-opens=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED",
"--add-opens=jdk.compiler/com.sun.tools.javac.jvm=ALL-UNNAMED",
"--add-opens=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED",
"--add-opens=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED",
"--add-opens=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED",
"--add-opens=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED",
"--add-opens=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"
)
}
1 change: 0 additions & 1 deletion core/src/main/kotlin/Parser.kt
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@ class DistinguishErrorListener : BaseErrorListener() {
msg: String,
e: RecognitionException?
) {
println(msg)
check(!msg.trim().startsWith("extraneous input"))
if (e != null) {
throw(e)
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version=2021.8.2
version=2021.8.3
4 changes: 1 addition & 3 deletions core/src/test/kotlin/TestKotlinComplexity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,7 @@ listOf(Dog("Shadow"), Dog("Chuchu"), Dog("Lulu"))
.forEach { println(it) }
""".trim(),
SnippetArguments(fileType = Source.FileType.KOTLIN)
).also {
println(it.rewrittenSource)
}.complexity().also {
).complexity().also {
it.lookup("", "").complexity shouldBe 1
}
}
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
kapt.use.worker.api=false
org.gradle.jvmargs=-Dfile.encoding=UTF-8
org.gradle.jvmargs=-Dfile.encoding=UTF-8
2 changes: 1 addition & 1 deletion server/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - && \

WORKDIR /
COPY *.jar jeed.jar
CMD [ "java", "-ea", "--enable-preview", "-Xmx1G", "-Xss256k", "-Dfile.encoding=UTF-8", "--illegal-access=permit", "-jar", "jeed.jar" ]
CMD [ "java", "-ea", "--enable-preview", "-Xmx1G", "-Xss256k", "-XX:+ExitOnOutOfMemoryError", "-Dfile.encoding=UTF-8", "--illegal-access=permit", "-jar", "jeed.jar" ]
22 changes: 18 additions & 4 deletions server/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ dependencies {
implementation(kotlin("stdlib"))
implementation(kotlin("reflect"))

implementation("io.ktor:ktor-server-netty:1.6.2")
implementation("io.ktor:ktor-server-netty:1.6.3")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.1")
implementation("com.squareup.moshi:moshi-kotlin-codegen:1.12.0")
implementation("com.github.cs125-illinois:ktor-moshi:1.0.3")
Expand All @@ -29,9 +29,9 @@ dependencies {
implementation("io.github.microutils:kotlin-logging:2.0.11")
implementation("com.github.cs125-illinois:libcs1:2021.8.0")

testImplementation("io.kotest:kotest-runner-junit5:4.6.1")
testImplementation("io.kotest:kotest-runner-junit5:4.6.2")
testImplementation("io.kotest:kotest-assertions-ktor:4.4.3")
testImplementation("io.ktor:ktor-server-test-host:1.6.2")
testImplementation("io.ktor:ktor-server-test-host:1.6.3")
}
application {
@Suppress("DEPRECATION")
Expand Down Expand Up @@ -83,4 +83,18 @@ publishing {
}
}
}

kotlin {
kotlinDaemonJvmArgs = listOf(
"-Dfile.encoding=UTF-8",
"--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED",
"--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED",
"--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED",
"--add-opens=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED",
"--add-opens=jdk.compiler/com.sun.tools.javac.jvm=ALL-UNNAMED",
"--add-opens=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED",
"--add-opens=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED",
"--add-opens=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED",
"--add-opens=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED",
"--add-opens=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"
)
}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version=2021.8.2
version=2021.8.3

0 comments on commit 6f5e73e

Please sign in to comment.