diff options
| author | Fabian Mastenbroek <mail.fabianm@gmail.com> | 2021-04-12 13:38:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-12 13:38:16 +0200 |
| commit | af3546a9d658ccce0d59400a7218c8edf5a7ce5c (patch) | |
| tree | fade89bbfa00622eaa6888d0633b8e040d041033 | |
| parent | d08c3a340dee64bfb2925e5f8b59a1193dc2dbcd (diff) | |
Migrate to Gradle 7.0 (#115)
This pull request updates the Kotlin project to build with Gradle 7.0.
This is necessary to support building the project with Java 16.
| -rw-r--r-- | simulator/buildSrc/build.gradle.kts | 7 | ||||
| -rw-r--r-- | simulator/buildSrc/src/main/kotlin/kotlin-library-conventions.gradle.kts | 1 | ||||
| -rw-r--r-- | simulator/gradle.properties | 8 | ||||
| -rw-r--r-- | simulator/gradle/wrapper/gradle-wrapper.properties | 2 |
4 files changed, 6 insertions, 12 deletions
diff --git a/simulator/buildSrc/build.gradle.kts b/simulator/buildSrc/build.gradle.kts index a71e18cf..dc115999 100644 --- a/simulator/buildSrc/build.gradle.kts +++ b/simulator/buildSrc/build.gradle.kts @@ -28,7 +28,6 @@ plugins { /* Project configuration */ repositories { - jcenter() gradlePluginPortal() } @@ -36,14 +35,10 @@ dependencies { implementation(kotlin("gradle-plugin", version = "1.4.31")) implementation("org.jlleitschuh.gradle:ktlint-gradle:10.0.0") implementation("org.jetbrains.dokka:dokka-gradle-plugin:0.10.1") - implementation("org.jetbrains.kotlin:kotlin-allopen:1.4.30") + implementation("org.jetbrains.kotlin:kotlin-allopen:1.4.31") implementation("org.jetbrains.kotlinx:kotlinx-benchmark-plugin:0.3.0") } -kotlinDslPluginOptions { - experimentalWarning.set(false) -} - tasks.withType<KotlinCompile>().configureEach { kotlinOptions { allWarningsAsErrors = true diff --git a/simulator/buildSrc/src/main/kotlin/kotlin-library-conventions.gradle.kts b/simulator/buildSrc/src/main/kotlin/kotlin-library-conventions.gradle.kts index ab13215b..cf3f2569 100644 --- a/simulator/buildSrc/src/main/kotlin/kotlin-library-conventions.gradle.kts +++ b/simulator/buildSrc/src/main/kotlin/kotlin-library-conventions.gradle.kts @@ -33,7 +33,6 @@ plugins { /* Project configuration */ repositories { mavenCentral() - jcenter() } java { diff --git a/simulator/gradle.properties b/simulator/gradle.properties index 99b08bb2..cbe19a08 100644 --- a/simulator/gradle.properties +++ b/simulator/gradle.properties @@ -29,10 +29,10 @@ slf4j.version = 1.7.30 log4j.version = 2.14.1 # Dependencies (Telemetry) -opentelemetry-api.version = 1.0.1 -opentelemetry-api-metrics.version = 1.0.1-alpha -opentelemetry-sdk.version = 1.0.1 -opentelemetry-sdk-metrics.version = 1.0.1-alpha +opentelemetry-api.version = 1.1.0 +opentelemetry-api-metrics.version = 1.1.0-alpha +opentelemetry-sdk.version = 1.1.0 +opentelemetry-sdk-metrics.version = 1.1.0-alpha # Dependencies (CLI) clikt.version = 3.1.0 diff --git a/simulator/gradle/wrapper/gradle-wrapper.properties b/simulator/gradle/wrapper/gradle-wrapper.properties index 442d9132..f371643e 100644 --- a/simulator/gradle/wrapper/gradle-wrapper.properties +++ b/simulator/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists |
