Upgrade jars

readingbat · Apr 7, 2022 · 579ee5e · 579ee5e
1 parent da18603
commit 579ee5e
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 203 deletions.
diff --git a/Makefile b/Makefile
@@ -27,4 +27,4 @@ versioncheck:
 	./gradlew dependencyUpdates
 
 upgrade-wrapper:
-	./gradlew wrapper --gradle-version=7.4 --distribution-type=bin
+	./gradlew wrapper --gradle-version=7.4.2 --distribution-type=bin
diff --git a/build.gradle b/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id 'java'
     id 'application'
-    id 'org.jetbrains.kotlin.jvm' version '1.6.20-M1'
+    id 'org.jetbrains.kotlin.jvm' version '1.6.20'
     id "com.github.ben-manes.versions" version "0.42.0"
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -4,13 +4,13 @@ org.gradle.daemon=true
 org.gradle.configureondemand=true
 org.gradle.parallel=true
 org.gradle.caching=true
-coroutines_version=1.6.0
+coroutines_version=1.6.1
 junit_version=5.8.2
-kotest_version=5.1.0
+kotest_version=5.2.2
 kotest_ktor_version=4.4.3
-kotlin_version=1.6.20-M1
+kotlin_version=1.6.20
 ktor_version=2.0.0-beta-1
 logback_version=1.2.10
 logging_version=2.1.21
 readingbat_version=1.25.0
-utils_version=1.21.0
+utils_version=1.23.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.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/Content.kt b/src/Content.kt
@@ -19,41 +19,15 @@ val content =
         packageName = "boolean_exprs"
         description = "Basic boolean expressions"
 
-        challenge("less_than") {
-          returnType = BooleanType
-        }
-
-        challenge("greater_than") {
-          returnType = BooleanType
-        }
-
-        challenge("less_than_or_equal") {
-          returnType = BooleanType
-        }
-
-        challenge("greater_than_or_equal") {
-          returnType = BooleanType
-        }
-
-        challenge("equal") {
-          returnType = BooleanType
-        }
-
-        challenge("not_equal") {
-          returnType = BooleanType
-        }
-
-        challenge("modulo1") {
-          returnType = IntType
-        }
-
-        challenge("modulo2") {
-          returnType = BooleanType
-        }
-
-        challenge("modulo3") {
-          returnType = BooleanType
-        }
+        challenge("less_than") { returnType = BooleanType }
+        challenge("greater_than") { returnType = BooleanType }
+        challenge("less_than_or_equal") { returnType = BooleanType }
+        challenge("greater_than_or_equal") { returnType = BooleanType }
+        challenge("equal") { returnType = BooleanType }
+        challenge("not_equal") { returnType = BooleanType }
+        challenge("modulo1") { returnType = IntType }
+        challenge("modulo2") { returnType = BooleanType }
+        challenge("modulo3") { returnType = BooleanType }
 
         includeFilesWithType = "andor*.py" returns BooleanType
       }
@@ -62,184 +36,64 @@ val content =
         packageName = "string_ops"
         description = "Basic string operations"
 
-        challenge("goodbye_name") {
-          returnType = StringType
-        }
-
-        challenge("combine1") {
-          returnType = StringType
-        }
-
-        challenge("combine2") {
-          returnType = StringType
-        }
-
-        challenge("concat1") {
-          returnType = StringType
-        }
-
-        challenge("concat2") {
-          returnType = StringType
-        }
-
-        challenge("concat3") {
-          returnType = StringType
-        }
-
-        challenge("strlen1") {
-          returnType = IntType
-        }
-
-        challenge("strlen2") {
-          returnType = IntType
-        }
-
-        challenge("strlen3") {
-          returnType = IntType
-        }
-
-        challenge("in_oper") {
-          returnType = BooleanType
-        }
-
-        challenge("starts_with") {
-          returnType = BooleanType
-        }
-
-        challenge("ends_with") {
-          returnType = BooleanType
-        }
-
-        challenge("slice1") {
-          returnType = StringType
-        }
-
-        challenge("slice2") {
-          returnType = StringType
-        }
-
-        challenge("slice3") {
-          returnType = StringType
-        }
-
-        challenge("slice4") {
-          returnType = StringType
-        }
-
-        challenge("slice5") {
-          returnType = StringType
-        }
-
-        challenge("split") {
-          returnType = StringType
-        }
+        challenge("goodbye_name") { returnType = StringType }
+        challenge("combine1") { returnType = StringType }
+        challenge("combine2") { returnType = StringType }
+        includeFilesWithType = "concat*.py" returns StringType
+        includeFilesWithType = "strlen*.py" returns IntType
+        challenge("in_oper") { returnType = BooleanType }
+        challenge("starts_with") { returnType = BooleanType }
+        challenge("ends_with") { returnType = BooleanType }
+        includeFilesWithType = "slice*.py" returns StringType
+        challenge("split") { returnType = StringType }
       }
 
       group("If Statements") {
         packageName = "if_stmts"
         description = "Basic if statements"
-
-        challenge("if_stmt1") {
-          returnType = IntType
-        }
-
-        challenge("if_stmt2") {
-          returnType = IntType
-        }
-
-        challenge("if_stmt3") {
-          returnType = IntType
-        }
-
-        challenge("if_stmt4") {
-          returnType = IntType
-        }
+        includeFilesWithType = "if_stmt*.py" returns IntType
       }
 
       group("For Loops") {
         packageName = "for_loops"
         description = "Basic for loops"
-
-        challenge("for_loop1") {
-          returnType = IntType
-        }
-
-        challenge("for_loop2") {
-          returnType = IntType
-        }
-
-        challenge("for_loop3") {
-          returnType = IntType
-        }
-
-        challenge("for_loop4") {
-          returnType = IntType
-        }
-
-        challenge("for_loop5") {
-          returnType = IntType
-        }
-
-        challenge("for_loop6") {
-          returnType = IntType
-        }
+        includeFilesWithType = "for_loop*.py" returns IntType
       }
 
       group("Lists") {
         packageName = "lists"
         description = "Basic list challenges"
-
         includeFilesWithType = "list*.py" returns IntType
       }
 
       group("Warmup 1") {
         packageName = "warmup1"
         description = "Warmup 1 challenges"
 
-        challenge("simple_choice1") {
-          returnType = BooleanType
-        }
+        challenge("simple_choice1") { returnType = BooleanType }
 
         challenge("simple_choice2") {
           codingBatEquiv = "p173401"
           returnType = BooleanType
         }
 
-        challenge("boolean_list") {
-          returnType = BooleanListType
-        }
+        challenge("boolean_list") { returnType = BooleanListType }
 
-        challenge("int_list") {
-          returnType = IntListType
-        }
+        challenge("int_list") { returnType = IntListType }
 
-        challenge("string_list") {
-          returnType = StringListType
-        }
+        challenge("string_list") { returnType = StringListType }
 
-        challenge("x_and_y") {
-          returnType = IntType
-        }
+        challenge("x_and_y") { returnType = IntType }
 
-        challenge("replace1") {
-          returnType = StringType
-        }
+        challenge("replace1") { returnType = StringType }
 
-        challenge("replace2") {
-          returnType = StringType
-        }
+        challenge("replace2") { returnType = StringType }
 
-        challenge("replace3") {
-          returnType = StringType
-        }
+        challenge("replace3") { returnType = StringType }
 
-        challenge("replace4") {
-          returnType = StringType
-        }
+        challenge("replace4") { returnType = StringType }
 
-        challenge("count1") {
-          returnType = IntType
-        }
+        challenge("count1") { returnType = IntType }
       }
     }
   }
diff --git a/test/ContentTests.kt b/test/ContentTests.kt
@@ -15,26 +15,18 @@
  *
  */
 
-import com.github.pambrose.common.util.*
-import com.github.readingbat.TestSupport.answerAllWith
-import com.github.readingbat.TestSupport.answerAllWithCorrectAnswer
-import com.github.readingbat.TestSupport.forEachAnswer
-import com.github.readingbat.TestSupport.forEachChallenge
-import com.github.readingbat.TestSupport.forEachGroup
-import com.github.readingbat.TestSupport.forEachLanguage
-import com.github.readingbat.TestSupport.shouldHaveAnswer
-import com.github.readingbat.TestSupport.testModule
-import com.github.readingbat.common.*
-import com.github.readingbat.common.Property.*
-import com.github.readingbat.dsl.*
-import com.github.readingbat.posts.*
+import com.github.readingbat.kotest.TestSupport.answerAllWith
+import com.github.readingbat.kotest.TestSupport.answerAllWithCorrectAnswer
+import com.github.readingbat.kotest.TestSupport.forEachAnswer
+import com.github.readingbat.kotest.TestSupport.forEachChallenge
+import com.github.readingbat.kotest.TestSupport.forEachGroup
+import com.github.readingbat.kotest.TestSupport.forEachLanguage
+import com.github.readingbat.kotest.TestSupport.shouldHaveAnswer
+import com.github.readingbat.kotest.TestSupport.testModule
 import com.github.readingbat.posts.AnswerStatus.*
-import com.github.readingbat.server.*
-import io.kotest.core.spec.style.*
-import io.kotest.matchers.*
-import io.kotest.matchers.string.*
-import io.ktor.application.*
-import io.ktor.server.engine.*
+import io.kotest.core.spec.style.StringSpec
+import io.kotest.matchers.shouldBe
+import io.kotest.matchers.string.shouldBeBlank
 import io.ktor.server.testing.*
 
 class ContentTests : StringSpec({