diff options
| -rw-r--r-- | buildSrc/src/main/kotlin/benchmark-conventions.gradle.kts | 4 | ||||
| -rw-r--r-- | buildSrc/src/main/kotlin/testing-conventions.gradle.kts | 6 | ||||
| -rw-r--r-- | gradle/libs.versions.toml | 53 | ||||
| -rw-r--r-- | gradle/wrapper/gradle-wrapper.jar | bin | 59203 -> 59536 bytes | |||
| -rw-r--r-- | gradle/wrapper/gradle-wrapper.properties | 2 | ||||
| -rwxr-xr-x | gradlew | 2 | ||||
| -rw-r--r-- | opendc-format/build.gradle.kts | 47 |
7 files changed, 40 insertions, 74 deletions
diff --git a/buildSrc/src/main/kotlin/benchmark-conventions.gradle.kts b/buildSrc/src/main/kotlin/benchmark-conventions.gradle.kts index 78ed5d1f..590f51cf 100644 --- a/buildSrc/src/main/kotlin/benchmark-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/benchmark-conventions.gradle.kts @@ -50,14 +50,14 @@ benchmark { targets { register("jmh") { this as JvmBenchmarkTarget - jmhVersion = "1.32" + jmhVersion = "1.33" } } } dependencies { val libs = Libs(project) - implementation(libs["kotlinx-benchmark-runtime-jvm"]) + implementation(libs["kotlinx.benchmark.runtime.jvm"]) } // Workaround for https://github.com/Kotlin/kotlinx-benchmark/issues/39 diff --git a/buildSrc/src/main/kotlin/testing-conventions.gradle.kts b/buildSrc/src/main/kotlin/testing-conventions.gradle.kts index bceb9e00..ebeb58a4 100644 --- a/buildSrc/src/main/kotlin/testing-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/testing-conventions.gradle.kts @@ -36,8 +36,8 @@ tasks.test { dependencies { val libs = Libs(project) - testImplementation(libs["junit-jupiter-api"]) - testImplementation(libs["junit-jupiter-params"]) + testImplementation(libs["junit.jupiter.api"]) + testImplementation(libs["junit.jupiter.params"]) testImplementation(libs["mockk"]) - testRuntimeOnly(libs["junit-jupiter-engine"]) + testRuntimeOnly(libs["junit.jupiter.engine"]) } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index fd737393..76846104 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,23 +1,35 @@ [versions] +classgraph = "4.8.115" +clikt = "3.2.0" +config = "1.4.1" +hadoop = "3.3.1" +jackson = "2.12.5" junit-jupiter = "5.7.2" junit-platform = "1.7.2" -slf4j = "1.7.32" +kotlin-logging = "2.0.11" +kotlinx-benchmark = "0.3.1" +kotlinx-coroutines = "1.5.1" +ktor = "1.6.3" log4j = "2.14.1" +mockk = "1.12.0" opentelemetry-main = "1.5.0" opentelemetry-metrics = "1.5.0-alpha" opentelemetry-semconv = "1.5.0-alpha" -hadoop = "3.3.1" -ktor = "1.6.3" -jackson = "2.12.5" +parquet = "1.12.0" +progressbar = "0.9.0" +sentry = "5.1.2" +slf4j = "1.7.32" +yaml = "1.29" [libraries] -kotlinx-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version = "1.5.1" } +# Kotlin +kotlinx-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" } # Logging -kotlin-logging = { module = "io.github.microutils:kotlin-logging", version = "2.0.11" } +kotlin-logging = { module = "io.github.microutils:kotlin-logging", version.ref = "kotlin-logging" } slf4j-simple = { module = "org.slf4j:slf4j-simple", version.ref = "slf4j" } log4j-slf4j = { module = "org.apache.logging.log4j:log4j-slf4j-impl", version.ref = "log4j" } -sentry-log4j2 = { module = "io.sentry:sentry-log4j2", version = "4.3.0" } +sentry-log4j2 = { module = "io.sentry:sentry-log4j2", version.ref = "sentry" } # Telemetry opentelemetry-api-main = { module = "io.opentelemetry:opentelemetry-api", version.ref = "opentelemetry-main" } @@ -26,35 +38,36 @@ opentelemetry-api-metrics = { module = "io.opentelemetry:opentelemetry-api-metri opentelemetry-sdk-metrics = { module = "io.opentelemetry:opentelemetry-sdk-metrics", version.ref = "opentelemetry-metrics" } opentelemetry-semconv = { module = "io.opentelemetry:opentelemetry-semconv", version.ref = "opentelemetry-semconv" } - # Testing junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit-jupiter" } junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit-jupiter" } junit-jupiter-params = { module = "org.junit.jupiter:junit-jupiter-params", version.ref = "junit-jupiter" } junit-platform-commons = { module = "org.junit.platform:junit-platform-commons", version.ref = "junit-platform" } junit-platform-engine = { module = "org.junit.platform:junit-platform-engine", version.ref = "junit-platform" } -mockk = { module = "io.mockk:mockk", version = "1.12.0" } +mockk = { module = "io.mockk:mockk", version.ref = "mockk" } # CLI -clikt = { module = "com.github.ajalt.clikt:clikt", version = "3.2.0" } -progressbar = { module = "me.tongfei:progressbar", version = "0.9.0" } +clikt = { module = "com.github.ajalt.clikt:clikt", version.ref = "clikt" } +progressbar = { module = "me.tongfei:progressbar", version.ref = "progressbar" } # Format jackson-module-kotlin = { module = "com.fasterxml.jackson.module:jackson-module-kotlin", version.ref = "jackson" } jackson-datatype-jsr310 = { module = "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", version.ref = "jackson" } jackson-dataformat-csv = { module = "com.fasterxml.jackson.dataformat:jackson-dataformat-csv", version.ref = "jackson" } -parquet = { module = "org.apache.parquet:parquet-avro", version = "1.12.0" } -yaml = { module = "org.yaml:snakeyaml", version = "1.29" } -config = { module = "com.typesafe:config", version = "1.4.1" } +parquet = { module = "org.apache.parquet:parquet-avro", version.ref = "parquet" } +yaml = { module = "org.yaml:snakeyaml", version.ref = "yaml" } +config = { module = "com.typesafe:config", version.ref = "config" } + +# HTTP client +ktor-client-cio = { module = "io.ktor:ktor-client-cio", version.ref = "ktor" } +ktor-client-auth = { module = "io.ktor:ktor-client-auth", version.ref = "ktor" } +ktor-client-jackson = { module = "io.ktor:ktor-client-jackson", version.ref = "ktor" } +ktor-client-mock = { module = "io.ktor:ktor-client-mock", version.ref = "ktor" } # Benchmark -kotlinx-benchmark-runtime-jvm = { module = "org.jetbrains.kotlinx:kotlinx-benchmark-runtime-jvm", version = "0.3.1" } +kotlinx-benchmark-runtime-jvm = { module = "org.jetbrains.kotlinx:kotlinx-benchmark-runtime-jvm", version.ref = "kotlinx-benchmark" } # Other -classgraph = { module = "io.github.classgraph:classgraph", version = "4.8.115" } +classgraph = { module = "io.github.classgraph:classgraph", version.ref = "classgraph" } hadoop-common = { module = "org.apache.hadoop:hadoop-common", version.ref = "hadoop" } hadoop-mapreduce-client-core = { module = "org.apache.hadoop:hadoop-mapreduce-client-core", version.ref = "hadoop" } -ktor-client-cio = { module = "io.ktor:ktor-client-cio", version.ref = "ktor" } -ktor-client-auth = { module = "io.ktor:ktor-client-auth", version.ref = "ktor" } -ktor-client-jackson = { module = "io.ktor:ktor-client-jackson", version.ref = "ktor" } -ktor-client-mock = { module = "io.ktor:ktor-client-mock", version.ref = "ktor" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar Binary files differindex e708b1c0..7454180f 100644 --- a/gradle/wrapper/gradle-wrapper.jar +++ b/gradle/wrapper/gradle-wrapper.jar diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 69a97150..ffed3a25 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.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists @@ -72,7 +72,7 @@ case "`uname`" in Darwin* ) darwin=true ;; - MINGW* ) + MSYS* | MINGW* ) msys=true ;; NONSTOP* ) diff --git a/opendc-format/build.gradle.kts b/opendc-format/build.gradle.kts deleted file mode 100644 index 0c7f2a51..00000000 --- a/opendc-format/build.gradle.kts +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (c) 2019 AtLarge Research - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -description = "Library for reading common data formats for topology simulation" - -/* Build configuration */ -plugins { - `kotlin-library-conventions` - `testing-conventions` - `jacoco-conventions` -} - -dependencies { - api(platform(projects.opendcPlatform)) - api(projects.opendcCompute.opendcComputeApi) - api(projects.opendcWorkflow.opendcWorkflowApi) - implementation(projects.opendcSimulator.opendcSimulatorCompute) - implementation(projects.opendcCompute.opendcComputeSimulator) - api(libs.jackson.module.kotlin) { - exclude(group = "org.jetbrains.kotlin", module = "kotlin-reflect") - } - implementation(libs.jackson.dataformat.csv) - implementation("org.jetbrains.kotlin:kotlin-reflect:1.5.30") - - implementation(projects.opendcTrace.opendcTraceParquet) - - testRuntimeOnly(libs.slf4j.simple) -} |