diff --git a/build.gradle.kts b/build.gradle.kts index 32bc50f0..903fdce1 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,3 @@ -import org.jetbrains.kotlin.gradle.tasks.KotlinCompile - plugins { kotlin("jvm") version "1.5.0" apply false kotlin("kapt") version "1.5.0" apply false @@ -8,26 +6,16 @@ plugins { id("io.gitlab.arturbosch.detekt") version "1.16.0" } allprojects { - @Suppress("DEPRECATION") repositories { mavenCentral() - mavenLocal() maven("https://jitpack.io") maven("https://maven.google.com/") - jcenter() + maven("https://maven.pkg.jetbrains.space/public/p/kotlinx-html/maven") } } subprojects { group = "com.github.cs125-illinois.jeed" version = "2021.5.1" - tasks.withType { - val javaVersion = JavaVersion.VERSION_1_8.toString() - sourceCompatibility = javaVersion - targetCompatibility = javaVersion - kotlinOptions { - jvmTarget = javaVersion - } - } tasks.withType { enableAssertions = true } @@ -41,17 +29,11 @@ subprojects { } } tasks.dependencyUpdates { - resolutionStrategy { - componentSelection { - all { - if (listOf("alpha", "beta", "rc", "cr", "m", "preview", "b", "ea", "eap", "release").any { qualifier -> - candidate.version.matches(Regex("(?i).*[.-]$qualifier[.\\d-+]*")) - }) { - reject("Release candidate") - } - } - } - } + fun String.isNonStable() = !( + listOf("RELEASE", "FINAL", "GA").any { toUpperCase().contains(it) } + || "^[0-9,.v-]+(-r)?$".toRegex().matches(this) + ) + rejectVersionIf { candidate.version.isNonStable() } gradleReleaseChannel = "current" } detekt { diff --git a/core/src/test/kotlin/TestKompile.kt b/core/src/test/kotlin/TestKompile.kt index bfe7e1db..36079585 100644 --- a/core/src/test/kotlin/TestKompile.kt +++ b/core/src/test/kotlin/TestKompile.kt @@ -17,15 +17,6 @@ class TestKompile : StringSpec({ compiledSource should haveDefinedExactlyTheseClasses(setOf("TestKt")) compiledSource should haveProvidedThisManyClasses(0) } - "should compile simple lists" { - val executionResult = Source.fromKotlin( - """ - val list = listOf() - """.trim() - ).kompile().execute() - - println(executionResult.sandboxedClassLoader!!.loadedClasses) - } "should compile simple classes" { val compiledSource = Source( mapOf( diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f371643e..e5338d37 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.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/server/build.gradle.kts b/server/build.gradle.kts index 30c7bade..08a86f71 100644 --- a/server/build.gradle.kts +++ b/server/build.gradle.kts @@ -29,7 +29,7 @@ dependencies { implementation("com.uchuhimo:konf-yaml:1.1.2") implementation("io.github.microutils:kotlin-logging:2.0.6") implementation("com.google.api-client:google-api-client:1.31.4") - implementation("com.github.cs125-illinois.libcs1:libcs1:2021.4.1") + implementation("com.github.cs125-illinois:libcs1:2021.5.1") testImplementation("io.kotest:kotest-runner-junit5:4.5.0") testImplementation("io.kotest:kotest-assertions-ktor:4.4.3")