1.27.0 (#38)

* Update jars
readingbat · May 26, 2022 · 4be0b6a · 4be0b6a
1 parent fdef4b0
commit 4be0b6a
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 28 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,6 +5,8 @@ jdk:
   #- oraclejdk11
   - openjdk11
 
+# https://alphahydrae.com/2021/02/how-to-run-postgresql-13-on-travis-ci/
+
 services:
   - postgresql
 

diff --git a/build.gradle b/build.gradle
@@ -7,12 +7,12 @@ buildscript {
 plugins {
     id 'java'
     id 'application'
-    id 'org.jetbrains.kotlin.jvm' version '1.6.20' apply false
-    id 'org.jetbrains.kotlin.plugin.serialization' version '1.6.20' apply false
+    id 'org.jetbrains.kotlin.jvm' version '1.7.0-RC' apply false
+    id 'org.jetbrains.kotlin.plugin.serialization' version '1.7.0-RC' apply false
     id 'org.jmailen.kotlinter' version "3.10.0" apply false
     id 'com.github.gmazzo.buildconfig' version '3.0.3' apply false
     id "com.github.ben-manes.versions" version '0.42.0' apply false
-    id "org.flywaydb.flyway" version "8.5.7"
+    id "org.flywaydb.flyway" version "8.5.11"
 }
 
 ext {
@@ -83,7 +83,7 @@ ext {
 allprojects {
     description = 'ReadingBat Core'
     group 'com.github.readingbat'
-    version '1.26.0'
+    version '1.27.0'
 
     apply plugin: 'application'
     apply plugin: 'java-library'  // gradle 7
@@ -96,7 +96,7 @@ allprojects {
 
     repositories {
         maven { url "https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-js-wrappers" }
-        maven { url "https://maven.pkg.jetbrains.space/public/p/ktor/eap" }
+        //maven { url "https://maven.pkg.jetbrains.space/public/p/ktor/eap" }
         google()
         mavenCentral()
         maven { url = 'https://jitpack.io' }
@@ -126,12 +126,13 @@ allprojects {
 subprojects {
 
     dependencies {
-        implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-        implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
+        //implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+        //implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
 
         // These are required for the annotation args below
-        implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
-        implementation "org.jetbrains.kotlinx:kotlinx-serialization-core:$serialization_version"
+        //implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
+        //implementation "org.jetbrains.kotlinx:kotlinx-serialization-core:$serialization_version"
+
         implementation "io.ktor:ktor-server-locations:$ktor_version"
 
         //implementation "dev.hayden:khealth:$khealth_version"
@@ -168,12 +169,13 @@ subprojects {
                                  '-opt-in=kotlin.time.ExperimentalTime',
                                  '-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi',
                                  '-opt-in=kotlin.contracts.ExperimentalContracts',
-                                 '-opt-in=kotlinx.serialization.ExperimentalSerializationApi',
+                                 //'-opt-in=kotlinx.serialization.ExperimentalSerializationApi',
                                  '-opt-in=kotlinx.coroutines.ObsoleteCoroutinesApi',
                                  '-opt-in=kotlin.ExperimentalStdlibApi',
                                  '-opt-in=io.ktor.server.locations.KtorExperimentalLocationsAPI',
                                  '-opt-in=kotlinx.coroutines.InternalCoroutinesApi',
-                                 '-opt-in=kotlinx.coroutines.DelicateCoroutinesApi']
+                                 '-opt-in=kotlinx.coroutines.DelicateCoroutinesApi',
+            ]
         }
     }
 

diff --git a/gradle.properties b/gradle.properties
@@ -4,29 +4,29 @@ org.gradle.daemon=true
 org.gradle.configureondemand=true
 org.gradle.parallel=true
 org.gradle.caching=true
-org.gradle.jvmargs=-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
-cloud_version=1.5.0
+org.gradle.jvmargs=-Xmx8g -Dkotlin.daemon.jvm.options=-Xmx6g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+cloud_version=1.6.0
 commons_version=1.9
-coroutines_version=1.6.1
-css_version=1.0.0-pre.329-kotlin-1.6.20
-exposed_version=0.38.1
+//coroutines_version=1.6.1
+css_version=1.0.0-pre.340
+exposed_version=0.38.2
 flexmark_version=0.64.0
-github_api_version=1.303
+github_api_version=1.306
 gson_version=2.9.0
 hikari_version=5.0.1
 java_script_version=2.0.0
 //khealth_version=1.0.0
-kotest_version=5.2.3
+kotest_version=5.3.0
 kotest_ktor_version=4.4.3
-kotlin_version=1.6.20
-ktor_version=2.0.0
+kotlin_version=1.7.0-Beta
+ktor_version=2.0.1
 logback_version=1.2.10
-logging_version=2.1.21
+logging_version=2.1.23
 pgjdbc_version=0.8.9
-postgres_version=42.3.3
+postgres_version=42.3.6
 prometheus_version=0.15.0
 proxy_version=1.13.0
-redis_version=4.2.2
-serialization_version=1.3.2
-sendgrid_version=4.9.1
-utils_version=1.24.0
+redis_version=4.2.3
+serialization_version=1.3.3
+sendgrid_version=4.9.2
+utils_version=1.25.0
diff --git a/readingbat-core/src/main/kotlin/com/github/readingbat/pages/AboutPage.kt b/readingbat-core/src/main/kotlin/com/github/readingbat/pages/AboutPage.kt
@@ -57,7 +57,7 @@ internal object AboutPage {
           div(classes = INDENT_1EM) {
             p {
               +"""
-              ReadingBat.com is a father-son effort by Paul and Matthew Ambrose to make learning how to program 
+              ReadingBat.com is a father-son effort, by Paul and Matthew Ambrose, to make learning how to program 
               a little easier.
               We are big fans of 
               """.trimIndent()

diff --git a/readingbat-core/src/main/kotlin/com/github/readingbat/server/Installs.kt b/readingbat-core/src/main/kotlin/com/github/readingbat/server/Installs.kt
@@ -178,7 +178,6 @@ object Installs : KLogging() {
     */
 
     install(StatusPages) {
-
       exception<Throwable> { call, cause ->
         when (cause) {
           is InvalidRequestException -> {