diff --git a/Makefile b/Makefile index 0b0cf683e..0d5f84f84 100644 --- a/Makefile +++ b/Makefile @@ -55,4 +55,4 @@ depends: # 6.9.1 upgrade-wrapper: - ./gradlew wrapper --gradle-version=7.3 --distribution-type=bin \ No newline at end of file + ./gradlew wrapper --gradle-version=7.3.1 --distribution-type=bin \ No newline at end of file diff --git a/build.gradle b/build.gradle index 26acfeadd..4bda627ae 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ plugins { id 'org.jetbrains.kotlin.plugin.serialization' version '1.6.0' apply false id 'com.github.gmazzo.buildconfig' version '3.0.3' apply false id "com.github.ben-manes.versions" version '0.39.0' apply false - id "org.flywaydb.flyway" version "8.0.5" + id "org.flywaydb.flyway" version "8.2.0" } ext { @@ -84,9 +84,10 @@ ext { allprojects { description = 'ReadingBat Core' group 'com.github.readingbat' - version '1.23.8' + version '1.23.9' apply plugin: 'application' + apply plugin: 'java-library' // gradle 7 apply plugin: 'maven-publish' // required for jitpack.io install // gradle 7 apply plugin: 'org.jmailen.kotlinter' apply plugin: 'org.jetbrains.kotlin.jvm' @@ -96,11 +97,7 @@ allprojects { repositories { mavenLocal() - maven { url = 'https://kotlin.bintray.com/ktor' } - maven { url = 'https://kotlin.bintray.com/kotlinx' } - maven { url = 'https://kotlin.bintray.com/kotlin-js-wrappers' } maven { url = 'https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-js-wrappers' } - maven { url = 'https://maven-central.storage-download.googleapis.com/repos/central/data/' } mavenCentral() maven { url = 'https://jitpack.io' } } diff --git a/gradle.properties b/gradle.properties index b53cb5e6f..a3080d3e7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,11 +4,10 @@ org.gradle.daemon=true org.gradle.configureondemand=true org.gradle.parallel=true org.gradle.caching=true -# -XX:MaxPermSize=512m org.gradle.jvmargs=-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 cloud_version=1.4.0 commons_version=1.9 -coroutines_version=1.5.2 +coroutines_version=1.6.0-RC css_version=1.0.0-pre.156-kotlin-1.5.0 exposed_version=0.36.2 flexmark_version=0.62.2 @@ -16,17 +15,17 @@ github_api_version=1.135 gson_version=2.8.9 hikari_version=5.0.0 java_script_version=2.0.0 -kotest_version=5.0.0.RC +kotest_version=5.0.1 kotest_ktor_version=4.4.3 kotlin_version=1.6.0 -ktor_version=1.6.5 -logback_version=1.2.6 -logging_version=2.0.11 +ktor_version=1.6.6 +logback_version=1.2.7 +logging_version=2.1.0 pgjdbc_version=0.8.9 postgres_version=42.3.1 prometheus_version=0.12.0 proxy_version=1.10.1 redis_version=3.7.0 serialization_version=1.3.1 -sendgrid_version=4.8.0 +sendgrid_version=4.8.1 utils_version=1.19.0 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e750102e0..84d1f85fd 100644 --- 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.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/jitpack.io b/jitpack.io deleted file mode 100644 index 5e027de01..000000000 --- a/jitpack.io +++ /dev/null @@ -1,6 +0,0 @@ -jdk: - - openjdk11 -install: - - ./gradlew build -xtest - - ./gradlew publishToMavenLocal - diff --git a/readingbat-core/src/main/kotlin/com/github/readingbat/dsl/ContentDsl.kt b/readingbat-core/src/main/kotlin/com/github/readingbat/dsl/ContentDsl.kt index c9c2e2718..2f8cd18d6 100644 --- a/readingbat-core/src/main/kotlin/com/github/readingbat/dsl/ContentDsl.kt +++ b/readingbat-core/src/main/kotlin/com/github/readingbat/dsl/ContentDsl.kt @@ -140,7 +140,7 @@ internal fun addImports(code: String, variableName: String): String { .filter { code.contains("${it.javaObjectType.simpleName}(") } // See if the class is referenced .map { "import ${it.javaObjectType.name}" } // Convert to import stmt .filterNot { code.contains(it) } // Do not include if import already present - .joinToString("\n") // Turn into String + .joinToString("\n") // Turn into String val funcImports = listOf(::readingBatContent) @@ -148,7 +148,7 @@ internal fun addImports(code: String, variableName: String): String { .filter { code.contains("${it.name}(") } // See if the function is referenced .map { "import ${it.fqMethodName}" } // Convert to import stmt .filterNot { code.contains(it) } // Do not include is import already present - .joinToString("\n") // Turn into String + .joinToString("\n") // Turn into String val imports = listOf(classImports, funcImports).filter { it.isNotBlank() }.joinToString("\n") return """