Skip to content

Commit

Permalink
Bump dependencies and add license.
Browse files Browse the repository at this point in the history
  • Loading branch information
gchallen committed Apr 23, 2020
1 parent 1d519b8 commit 1149d55
Show file tree
Hide file tree
Showing 8 changed files with 32 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 21 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2020 CS 125 @ Illinois

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
4 changes: 2 additions & 2 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.3.71"
val kotlinVersion = "1.3.72"
kotlin("jvm") version kotlinVersion apply false
kotlin("kapt") version kotlinVersion apply false
id("org.jmailen.kotlinter") version "2.3.2" apply false
id("com.github.ben-manes.versions") version "0.28.0"
id("io.gitlab.arturbosch.detekt") version "1.7.4"
id("io.gitlab.arturbosch.detekt") version "1.8.0"
}
allprojects {
repositories {
Expand Down
6 changes: 3 additions & 3 deletions core/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import java.io.StringWriter
import java.util.Properties

group = "com.github.cs125-illinois"
version = "2020.4.6"
version = "2020.4.7"

plugins {
kotlin("jvm")
Expand All @@ -26,15 +26,15 @@ dependencies {
implementation("com.puppycrawl.tools:checkstyle:8.31")
implementation("com.pinterest.ktlint:ktlint-core:0.36.0")
implementation("com.pinterest.ktlint:ktlint-ruleset-standard:0.36.0")
implementation("org.jetbrains.kotlin:kotlin-reflect:1.3.71")
implementation("org.jetbrains.kotlin:kotlin-reflect:1.3.72")
implementation("com.github.jknack:handlebars:4.1.2")
implementation("com.squareup.moshi:moshi:1.9.2")
implementation("org.ow2.asm:asm:8.0.1")
implementation("org.ow2.asm:asm-util:8.0.1")
implementation("org.slf4j:slf4j-api:1.7.30")
implementation("ch.qos.logback:logback-classic:1.2.3")
implementation("io.github.microutils:kotlin-logging:1.7.9")
implementation("io.github.classgraph:classgraph:4.8.69")
implementation("io.github.classgraph:classgraph:4.8.73")
implementation("net.java.dev.jna:jna:5.5.0")
api("com.github.ben-manes.caffeine:caffeine:2.8.1")

Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version=2020.4.6
version=2020.4.7
4 changes: 2 additions & 2 deletions server/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import java.io.StringWriter
import java.util.Properties

group = "edu.illinois.cs.cs125"
version = "2020.4.6"
version = "2020.4.7"

plugins {
kotlin("jvm")
Expand Down Expand Up @@ -57,7 +57,7 @@ tasks.test {
jvmArgs("-ea", "-Xmx1G")
}
systemProperties["logback.configurationFile"] = File(projectDir, "src/test/resources/logback-test.xml").absolutePath
environment["MONGODB"] = "mongodb://localhost:27038/cs125"
environment["MONGODB"] = "mongodb://localhost:27017/cs125"
environment["SEMESTER"] = "Spring2020"
}
tasks.jar {
Expand Down
2 changes: 1 addition & 1 deletion server/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ services:
mongodb:
image: "bitnami/mongodb:4.0"
ports:
- "27038:27017"
- "27017:27017"
volumes:
- "mongodb_data:/bitnami"
networks:
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version=2020.4.6
version=2020.4.7

0 comments on commit 1149d55

Please sign in to comment.