diff options
| -rw-r--r-- | buildSrc/build.gradle.kts | 8 | ||||
| -rw-r--r-- | buildSrc/src/main/kotlin/kotlin-conventions.gradle.kts | 1 | ||||
| -rw-r--r-- | gradle/libs.versions.toml | 14 | ||||
| -rw-r--r-- | opendc-experiments/opendc-experiments-serverless20/build.gradle.kts | 3 | ||||
| -rw-r--r-- | opendc-format/build.gradle.kts | 5 | ||||
| -rw-r--r-- | opendc-web/opendc-web-runner/build.gradle.kts | 5 | ||||
| -rw-r--r-- | opendc-workflow/opendc-workflow-service/build.gradle.kts | 5 |
7 files changed, 22 insertions, 19 deletions
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 3b793a61..56b85608 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -33,16 +33,10 @@ repositories { } dependencies { - implementation(kotlin("gradle-plugin", version = "1.4.31")) + implementation(kotlin("gradle-plugin", version = "1.5.0")) implementation("org.jlleitschuh.gradle:ktlint-gradle:10.0.0") implementation("org.jetbrains.kotlin:kotlin-allopen:1.4.31") implementation("org.jetbrains.kotlinx:kotlinx-benchmark-plugin:0.3.0") implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.4.32") implementation("gradle.plugin.com.github.jengelman.gradle.plugins:shadow:7.0.0") } - -tasks.withType<KotlinCompile>().configureEach { - kotlinOptions { - allWarningsAsErrors = true - } -} diff --git a/buildSrc/src/main/kotlin/kotlin-conventions.gradle.kts b/buildSrc/src/main/kotlin/kotlin-conventions.gradle.kts index 703e9938..7fda64a2 100644 --- a/buildSrc/src/main/kotlin/kotlin-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/kotlin-conventions.gradle.kts @@ -39,6 +39,5 @@ java { tasks.withType<KotlinCompile>().configureEach { kotlinOptions.jvmTarget = Libs.jvmTarget.toString() - kotlinOptions.useIR = true kotlinOptions.freeCompilerArgs += "-Xopt-in=kotlin.RequiresOptIn" } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 12cbfb4e..1d7fdd3e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,13 +1,13 @@ [versions] -junit-jupiter = "5.7.1" -junit-platform = "1.7.1" +junit-jupiter = "5.7.2" +junit-platform = "1.7.2" slf4j = "1.7.30" log4j = "2.14.1" -opentelemetry-main = "1.1.0" -opentelemetry-metrics = "1.1.0-alpha" +opentelemetry-main = "1.2.0" +opentelemetry-metrics = "1.2.0-alpha" [libraries] -kotlinx-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version = "1.4.3" } +kotlinx-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version = "1.5.0" } # Logging kotlin-logging = { module = "io.github.microutils:kotlin-logging", version = "2.0.6" } @@ -30,7 +30,7 @@ junit-platform-engine = { module = "org.junit.platform:junit-platform-engine", v mockk = { module = "io.mockk:mockk", version = "1.11.0" } # CLI -clikt = { module = "com.github.ajalt.clikt:clikt", version = "3.1.0" } +clikt = { module = "com.github.ajalt.clikt:clikt", version = "3.2.0" } progressbar = { module = "me.tongfei:progressbar", version = "0.9.0" } # Format @@ -45,4 +45,4 @@ kotlinx-benchmark-runtime-jvm = { module = "org.jetbrains.kotlinx:kotlinx-benchm # Other mongodb = { module = "org.mongodb:mongodb-driver-sync", version = "4.2.3" } classgraph = { module = "io.github.classgraph:classgraph", version = "4.8.105" } -hadoop-client = { module = "org.apache.hadoop:hadoop-client", version = "3.2.1" } +hadoop-client = { module = "org.apache.hadoop:hadoop-client", version = "3.3.0" } diff --git a/opendc-experiments/opendc-experiments-serverless20/build.gradle.kts b/opendc-experiments/opendc-experiments-serverless20/build.gradle.kts index bdb0d098..88479765 100644 --- a/opendc-experiments/opendc-experiments-serverless20/build.gradle.kts +++ b/opendc-experiments/opendc-experiments-serverless20/build.gradle.kts @@ -38,7 +38,8 @@ dependencies { implementation(libs.kotlin.logging) implementation(libs.config) - implementation(libs.parquet) { + implementation(libs.parquet) + implementation(libs.hadoop.client) { exclude(group = "org.slf4j", module = "slf4j-log4j12") exclude(group = "log4j") } diff --git a/opendc-format/build.gradle.kts b/opendc-format/build.gradle.kts index 2647c834..e95cb666 100644 --- a/opendc-format/build.gradle.kts +++ b/opendc-format/build.gradle.kts @@ -35,7 +35,10 @@ dependencies { api(projects.opendcWorkflow.opendcWorkflowApi) implementation(projects.opendcSimulator.opendcSimulatorCompute) implementation(projects.opendcCompute.opendcComputeSimulator) - api(libs.jackson.module.kotlin) + api(libs.jackson.module.kotlin) { + exclude(group = "org.jetbrains.kotlin", module = "kotlin-reflect") + } + implementation(kotlin("reflect")) implementation(libs.parquet) implementation(libs.hadoop.client) { diff --git a/opendc-web/opendc-web-runner/build.gradle.kts b/opendc-web/opendc-web-runner/build.gradle.kts index b7eb223c..f2b2ba23 100644 --- a/opendc-web/opendc-web-runner/build.gradle.kts +++ b/opendc-web/opendc-web-runner/build.gradle.kts @@ -42,7 +42,10 @@ dependencies { implementation(libs.kotlin.logging) implementation(libs.clikt) - implementation(libs.jackson.module.kotlin) + implementation(libs.jackson.module.kotlin) { + exclude(group = "org.jetbrains.kotlin", module = "kotlin-reflect") + } + implementation(kotlin("reflect")) implementation(libs.sentry.log4j2) implementation(libs.mongodb) diff --git a/opendc-workflow/opendc-workflow-service/build.gradle.kts b/opendc-workflow/opendc-workflow-service/build.gradle.kts index 5e73222c..bc082dbc 100644 --- a/opendc-workflow/opendc-workflow-service/build.gradle.kts +++ b/opendc-workflow/opendc-workflow-service/build.gradle.kts @@ -41,6 +41,9 @@ dependencies { testImplementation(projects.opendcCompute.opendcComputeSimulator) testImplementation(projects.opendcFormat) testImplementation(projects.opendcTelemetry.opendcTelemetrySdk) - testImplementation(libs.jackson.module.kotlin) + testImplementation(libs.jackson.module.kotlin) { + exclude(group = "org.jetbrains.kotlin", module = "kotlin-reflect") + } + testImplementation(kotlin("reflect")) testRuntimeOnly(libs.log4j.slf4j) } |