diff options
| author | Fabian Mastenbroek <mail.fabianm@gmail.com> | 2022-01-11 17:23:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-11 17:23:42 +0100 |
| commit | 33b9f1d73210c50fdc944c93cf87cebf45bd0cf5 (patch) | |
| tree | 774d9d259b7accb4910baf37cfc114c5c40175ad | |
| parent | e0150bbd81c6f1f53f041882942786747894e9f0 (diff) | |
| parent | d0515c3a1fd21b82a595b717678cc85f7ba123b8 (diff) | |
merge: Update to Kotlin 1.6.10
This pull request updates the OpenDC codebase to use Kotlin 1.6.10 for building the project.
* Update to Kotlin 1.6.10
* Update build dependencies to their latest version
* Update project dependencies to their latest version where possible.
* Add Dependabot configuration
| -rw-r--r-- | .github/dependabot.yml | 7 | ||||
| -rw-r--r-- | buildSrc/build.gradle.kts | 10 | ||||
| -rw-r--r-- | gradle/libs.versions.toml | 2 |
3 files changed, 13 insertions, 6 deletions
diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 00000000..2c932a9d --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,7 @@ +# Set update schedule for GitHub Actions +version: 2 +updates: + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "weekly"
\ No newline at end of file diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index f38919fd..760f0cab 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -31,10 +31,10 @@ repositories { } dependencies { - implementation(kotlin("gradle-plugin", version = "1.6.0")) - implementation("org.jlleitschuh.gradle:ktlint-gradle:10.2.0") - implementation("org.jetbrains.kotlin:kotlin-allopen:1.6.0") + implementation(kotlin("gradle-plugin", version = "1.6.10")) + implementation("org.jlleitschuh.gradle:ktlint-gradle:10.2.1") + implementation("org.jetbrains.kotlin:kotlin-allopen:1.6.10") implementation("me.champeau.jmh:jmh-gradle-plugin:0.6.6") - implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.5.30") - implementation("gradle.plugin.com.github.jengelman.gradle.plugins:shadow:7.0.0") + implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.6.10") + implementation("gradle.plugin.com.github.johnrengelman:shadow:7.1.2") } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 9ab16ed2..16bf22dc 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -11,7 +11,7 @@ kotlin-logging = "2.1.21" kotlinx-coroutines = "1.6.0" ktor = "1.6.7" log4j = "2.17.1" -mockk = "1.12.1" +mockk = "1.12.2" opentelemetry-main = "1.6.0" opentelemetry-metrics = "1.6.0-alpha" opentelemetry-semconv = "1.6.0-alpha" |