Skip to content
This repository has been archived by the owner on Mar 28, 2023. It is now read-only.

Commit

Permalink
Dependency updates.
Browse files Browse the repository at this point in the history
  • Loading branch information
gchallen committed Sep 29, 2021
1 parent 6f22845 commit 32d9086
Show file tree
Hide file tree
Showing 7 changed files with 30 additions and 28 deletions.
3 changes: 3 additions & 0 deletions .intellijlogger.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
destination: https://cloud.cs124.org/intellijlogger/
name: gradlegrader
emailLocation: email.txt
2 changes: 1 addition & 1 deletion .java-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
openjdk64-15
openjdk64-16
8 changes: 4 additions & 4 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
val kotlinVersion = "1.4.32"
val kotlinVersion = "1.5.31"
kotlin("jvm") version kotlinVersion apply false
kotlin("kapt") version kotlinVersion apply false
id("com.github.johnrengelman.shadow") version "6.1.0"
id("org.jmailen.kotlinter") version "3.4.0" apply false
id("com.github.ben-manes.versions") version "0.38.0"
id("com.github.johnrengelman.shadow") version "7.0.0"
id("org.jmailen.kotlinter") version "3.6.0" apply false
id("com.github.ben-manes.versions") version "0.39.0"
}
allprojects {
repositories {
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
18 changes: 9 additions & 9 deletions plugin/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,20 @@ plugins {
}

group = "com.github.cs125-illinois"
version = "2021.3.1"
version = "2021.9.0"

dependencies {
implementation(kotlin("stdlib"))
implementation(kotlin("reflect"))
implementation("org.jetbrains.kotlin:kotlin-stdlib:1.5.31")
implementation("org.jetbrains.kotlin:kotlin-reflect:1.5.31")
implementation(gradleApi())
implementation("com.google.code.gson:gson:2.8.6")
implementation("com.google.code.gson:gson:2.8.8")
implementation("org.apache.httpcomponents:httpclient:4.5.13")
implementation("org.apache.commons:commons-text:1.9")
implementation("org.eclipse.jgit:org.eclipse.jgit:5.11.0.202103091610-r")
implementation("com.fasterxml.jackson.core:jackson-databind:2.12.2")
implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.12.2")
implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.12.2")
implementation("io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.16.0")
implementation("org.eclipse.jgit:org.eclipse.jgit:5.13.0.202109080827-r")
implementation("com.fasterxml.jackson.core:jackson-databind:2.12.5")
implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.12.5")
implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.12.5")
implementation("io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.18.1")
}
gradlePlugin {
plugins {
Expand Down
23 changes: 11 additions & 12 deletions server/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,29 +3,28 @@ import java.io.StringWriter
import java.util.Properties

group = "edu.illinois.cs.cs125"
version = "2021.3.0"
version = "2021.9.0"

plugins {
kotlin("jvm")
kotlin("kapt")
application
id("com.github.johnrengelman.shadow")
id("org.jmailen.kotlinter")
id("com.palantir.docker") version "0.26.0"
id("com.palantir.docker") version "0.30.0"
}
dependencies {
kapt("com.squareup.moshi:moshi-kotlin-codegen:1.11.0")
kapt("com.squareup.moshi:moshi-kotlin-codegen:1.12.0")

val ktorVersion = "1.5.2"
implementation(kotlin("stdlib"))
implementation("io.ktor:ktor-server-netty:$ktorVersion")
implementation("org.mongodb:mongodb-driver:3.12.8")
implementation("com.squareup.moshi:moshi-kotlin-codegen:1.11.0")
implementation("org.jetbrains.kotlin:kotlin-stdlib:1.5.31")
implementation("io.ktor:ktor-server-netty:1.6.3")
implementation("org.mongodb:mongodb-driver:3.12.10")
implementation("com.squareup.moshi:moshi-kotlin-codegen:1.12.0")
implementation("com.github.cs125-illinois:ktor-moshi:1.0.3")
implementation("ch.qos.logback:logback-classic:1.2.3")
implementation("com.uchuhimo:konf-core:1.0.0")
implementation("com.uchuhimo:konf-yaml:1.0.0")
implementation("io.github.microutils:kotlin-logging:2.0.6")
implementation("ch.qos.logback:logback-classic:1.2.6")
implementation("com.uchuhimo:konf-core:1.1.2")
implementation("com.uchuhimo:konf-yaml:1.1.2")
implementation("io.github.microutils:kotlin-logging:2.0.11")
}
application {
mainClassName = "edu.illinois.cs.cs125.gradlegrader.server.MainKt"
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version=2021.2.0
version=2021.9.0

0 comments on commit 32d9086

Please sign in to comment.