Fixed merge conflict

cs125-illinois · Jun 16, 2021 · bb4b00a · bb4b00a
2 parents 2033304 + 6e812f5
commit bb4b00a
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
     kotlin("jvm") version "1.5.10" apply false
     kotlin("kapt") version "1.5.10" apply false
-    id("org.jmailen.kotlinter") version "3.4.4" apply false
+    id("org.jmailen.kotlinter") version "3.4.5" apply false
     id("com.github.ben-manes.versions") version "0.39.0"
     id("io.gitlab.arturbosch.detekt") version "1.17.1"
 }

diff --git a/containerrunner/src/main/resources/edu.illinois.cs.cs125.jeed.containerrunner.version b/containerrunner/src/main/resources/edu.illinois.cs.cs125.jeed.containerrunner.version
@@ -1 +1 @@
-version=2021.6.0
+version=2021.6.1
diff --git a/core/src/test/kotlin/TestFeatures.kt b/core/src/test/kotlin/TestFeatures.kt
@@ -3,6 +3,7 @@ package edu.illinois.cs.cs125.jeed.core
 import io.kotest.core.spec.style.StringSpec
 import io.kotest.matchers.shouldBe
 
+@Suppress("LargeClass")
 class TestFeatures : StringSpec({
     "should count variable declarations in snippets" {
         Source.fromSnippet(
@@ -485,7 +486,8 @@ void container(int setSize) throws IllegalArgumentException {
 """.trim()
         ).features().also {
             it.lookup("").features.featureMap[FeatureName.THROW] shouldBe 1
-            it.lookup("").features.featureMap[FeatureName.THROWS] shouldBe 2 // main method for snippets also throws exception
+            // main method for snippets also throws exception
+            it.lookup("").features.featureMap[FeatureName.THROWS] shouldBe 2
         }
     }
     "should count generic classes" {
@@ -655,7 +657,7 @@ public class Test implements Comparable {
             it.lookup("", "Test.java").features.featureMap[FeatureName.COMPARABLE] shouldBe 1
         }
     }
-    "should correctly create a code skeleton for snippets" {
+    "!should correctly create a code skeleton for snippets" {
         Source.fromSnippet(
             """
 int i = 0;

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/server/src/main/resources/edu.illinois.cs.cs125.jeed.server.version b/server/src/main/resources/edu.illinois.cs.cs125.jeed.server.version
@@ -1 +1 @@
-version=2021.6.0
+version=2021.6.1