diff --git a/Changelog.md b/Changelog.md index a242392a..0a9c687b 100644 --- a/Changelog.md +++ b/Changelog.md @@ -6,8 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +## Changed +- Update Kotlin plugin to _1.5.30_, see [release notes](https://github.com/JetBrains/kotlin/releases/tag/v1.5.30) -## [0.31.0] - 2021-07-28 +## [0.33.0] - 2021-08-21 ## Changed - Update _Android Gradle Plugin_ to _7.0.1_, see [release notes](https://developer.android.com/studio/releases/gradle-plugin) diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index 6659e5b7..bfe0c626 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java-gradle-plugin' id "org.jmailen.kotlinter" version "3.5.0" - id 'org.jetbrains.kotlin.jvm' version '1.5.21' + id 'org.jetbrains.kotlin.jvm' version '1.5.30' } repositories { @@ -11,7 +11,13 @@ repositories { dependencies { implementation 'org.jetbrains.kotlin:kotlin-gradle-plugin' implementation "com.gradle.publish:plugin-publish-plugin:0.15.0" - implementation "com.project.starter:jvm:0.32.0" + implementation "com.project.starter:jvm:0.33.0" +} + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(11) + } } gradlePlugin { diff --git a/buildSrc/src/main/groovy/myproject.java-conventions.gradle b/buildSrc/src/main/groovy/myproject.java-conventions.gradle index 5dd38970..682ebd9f 100644 --- a/buildSrc/src/main/groovy/myproject.java-conventions.gradle +++ b/buildSrc/src/main/groovy/myproject.java-conventions.gradle @@ -1,5 +1,5 @@ java { toolchain { - languageVersion = JavaLanguageVersion.of(8) + languageVersion = JavaLanguageVersion.of(11) } } diff --git a/quality/build.gradle b/quality/build.gradle index 197a744c..5ca79a86 100644 --- a/quality/build.gradle +++ b/quality/build.gradle @@ -13,7 +13,7 @@ dependencies { api 'org.jmailen.gradle:kotlinter-gradle:3.5.0' api 'io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.18.0' api 'org.jetbrains.kotlin:kotlin-gradle-plugin' - compileOnly 'com.android.tools.build:gradle:7.0.0' + compileOnly 'com.android.tools.build:gradle:7.0.1' implementation 'com.github.usefulness:issuechecker:0.3.0' implementation project(":config") diff --git a/versioning/build.gradle b/versioning/build.gradle index d422a729..befab2e0 100644 --- a/versioning/build.gradle +++ b/versioning/build.gradle @@ -18,7 +18,7 @@ repositories { } dependencies { - compileOnly 'com.android.tools.build:gradle:7.0.0' + compileOnly 'com.android.tools.build:gradle:7.0.1' implementation 'pl.allegro.tech.build:axion-release-plugin:1.13.3' implementation project(":config") diff --git a/versioning/src/test/kotlin/com/project/starter/versioning/VersioningPluginTest.kt b/versioning/src/test/kotlin/com/project/starter/versioning/VersioningPluginTest.kt index 431fdbd9..013161a1 100644 --- a/versioning/src/test/kotlin/com/project/starter/versioning/VersioningPluginTest.kt +++ b/versioning/src/test/kotlin/com/project/starter/versioning/VersioningPluginTest.kt @@ -40,7 +40,7 @@ internal class VersioningPluginTest : WithGradleProjectTest() { writeText( """ plugins { - id 'org.jetbrains.kotlin.jvm' version "1.5.0" + id 'org.jetbrains.kotlin.jvm' version "1.5.30" } """.trimIndent(), ) @@ -51,7 +51,7 @@ internal class VersioningPluginTest : WithGradleProjectTest() { writeText( """ plugins { - id 'org.jetbrains.kotlin.jvm' version "1.5.0" + id 'org.jetbrains.kotlin.jvm' version "1.5.30" } """.trimIndent(), )