diff options
| author | Fabian Mastenbroek <mail.fabianm@gmail.com> | 2021-05-18 15:51:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-18 15:51:13 +0200 |
| commit | 02776c958a3254735b2be7d9fb1627f75e7f80cd (patch) | |
| tree | 155d96b0f1a5173e4ac884ac6c9cbccea011918f /opendc-format | |
| parent | 1ce710ebaa8b071a3b30447d431f4af422f25156 (diff) | |
| parent | 7cbb401a0939cc58daae8b481a97f4b05140ec3b (diff) | |
build: Add support for Java 16
This pull request adds support for building OpenDC using Java 16.
To make this possible, we have upgraded the following dependencies:
- Kotlin from 1.4.3 to 1.5.0
- Jacoco from 0.8.6 to 0.8.7
- Gradle from 7.0 to 7.0.2
Diffstat (limited to 'opendc-format')
| -rw-r--r-- | opendc-format/build.gradle.kts | 5 | ||||
| -rw-r--r-- | opendc-format/src/main/kotlin/org/opendc/format/trace/swf/SwfTraceReader.kt | 4 |
2 files changed, 4 insertions, 5 deletions
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-format/src/main/kotlin/org/opendc/format/trace/swf/SwfTraceReader.kt b/opendc-format/src/main/kotlin/org/opendc/format/trace/swf/SwfTraceReader.kt index 0d1f3cea..50ab652e 100644 --- a/opendc-format/src/main/kotlin/org/opendc/format/trace/swf/SwfTraceReader.kt +++ b/opendc-format/src/main/kotlin/org/opendc/format/trace/swf/SwfTraceReader.kt @@ -69,8 +69,6 @@ public class SwfTraceReader( var cores: Int var memory: Long var slicedWaitTime: Long - var flopsPerSecond: Long - var flopsPartialSlice: Long var runtimePartialSliceRemainder: Long BufferedReader(FileReader(file)).use { reader -> @@ -121,9 +119,7 @@ public class SwfTraceReader( // Insert run time slices - flopsPerSecond = 4_000L * cores runtimePartialSliceRemainder = runTime % sliceDuration - flopsPartialSlice = flopsPerSecond * runtimePartialSliceRemainder for ( tick in (submitTime + slicedWaitTime) |