Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update Kotlin to 1.5.20 version. #1175

Merged
merged 1 commit into from
Jun 24, 2021
Merged

Update Kotlin to 1.5.20 version. #1175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
- Fix KtLint dependency variant selection ([#1114](https://github.com/pinterest/ktlint/issues/1114))
### Changed
- Updated to dokka 1.4.32 ([#1148](https://github.com/pinterest/ktlint/pull/1148))
- Updated Kotlin to 1.5.20 version
### Removed

## [0.41.0] - 2021-03-16
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ plugins {
}

ext.versions = [
'kotlin': gradle.ext.isKotlinDev ? "1.5.0-M1" : "1.4.31",
'kotlin': gradle.ext.isKotlinDev ? "1.5.20" : "1.5.20",
'gradle': '6.8.3',
'gradle-sha256': '7faa7198769f872826c8ef4f1450f839ec27f0b4d5d1e51bade63667cbccd205'
]
Expand Down
15 changes: 14 additions & 1 deletion gradle/verification-metadata.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,12 @@
<trusted-key id="160a7a9cf46221a56b06ad64461a804f2609fd89" group="com.github.shyiko.klob" name="klob" version="0.2.1"/>
<trusted-key id="184454fad8697760f3e00d2e4a51a45b944ffd51" group="org.apache.tika"/>
<trusted-key id="190d5a957ff22273e601f7a7c92c5fec70161c62" group="org.apache" name="apache" version="18"/>
<trusted-key id="19beab2d799c020f17c69126b16698a4adf4d638" group="org.checkerframework" name="checker-qual" version="2.11.1"/>
<trusted-key id="1be2dd4b1fcf252fe4f0a1d103281aa0289ff53a" group="com.soywiz.korlibs.korte"/>
<trusted-key id="1fa37fbe4453c1073e7ef61d6449005f96bc97a3" group="de.undercouch" name="gradle-download-task" version="4.0.2"/>
<trusted-key id="1fa37fbe4453c1073e7ef61d6449005f96bc97a3">
<trusting group="de.undercouch" name="gradle-download-task" version="4.0.2"/>
<trusting group="de.undercouch" name="gradle-download-task" version="4.1.1"/>
</trusted-key>
<trusted-key id="2e3a1affe42b5f53af19f780bcf4173966770193" group="org.jetbrains" name="annotations" version="13.0"/>
<trusted-key id="2e92113263fc31c74ccbaab20e91c2de43b72bb1" group="org.ec4j.core"/>
<trusted-key id="31fae244a81d64507b47182e1b2718089ce964b8" group="com.thoughtworks.qdox" name="qdox" version="1.12.1"/>
Expand Down Expand Up @@ -56,6 +60,8 @@
<trusting group="org.jetbrains.kotlin"/>
<trusting group="^org[.]jetbrains[.]kotlin($|([.].*))" regex="true"/>
</trusted-key>
<trusted-key id="7615ad56144df2376f49d98b1669c4bb543e0445" group="com.google.errorprone"/>
<trusted-key id="7616eb882daf57a11477aaf559a252fb1199d873" group="com.google.code.findbugs" name="jsr305" version="3.0.2"/>
<trusted-key id="7faa0f2206de228f0db01ad741321490758aad6f" group="org.codehaus.groovy"/>
<trusted-key id="8569c95cadc508b09fe90f3002216ed811210daa" group="io.github.detekt.sarif4k" name="sarif4k" version="0.0.1"/>
<trusted-key id="8756c4f765c9ac3cb6b85d62379ce192d401ab61">
Expand All @@ -80,6 +86,8 @@
</trusted-key>
<trusted-key id="ae9e53fc28ff2ab1012273d0bf1518e0160788a2" group="org.apache" name="apache" version="17"/>
<trusted-key id="afcc4c7594d09e2182c60e0f7a01b0f236e5430f" group="com.google.code.gson"/>
<trusted-key id="b801e2f8ef035068ec1139cc29579f18fa8fd93b" group="com.google.j2objc" name="j2objc-annotations" version="1.3"/>
<trusted-key id="bdb5fa4fe719d787fb3d3197f6d4a1d411e9d1ae" group="com.google.guava"/>
<trusted-key id="cd5464315f0b98c77e6e8ecd9daadc1c9fcc82d0">
<trusting group="commons-cli"/>
<trusting group="commons-io"/>
Expand Down Expand Up @@ -1491,6 +1499,11 @@
<sha256 value="1aa291701fd20b0e0e7ae312041359bbd192ef2b47f6ae4229d6670ba8b29d9c" origin="Generated by Gradle because artifact wasn't signed"/>
</artifact>
</component>
<component group="org.jetbrains.kotlin.jvm" name="org.jetbrains.kotlin.jvm.gradle.plugin" version="1.5.20">
<artifact name="org.jetbrains.kotlin.jvm.gradle.plugin-1.5.20.pom">
<sha256 value="2307dac79e7deae9ffc0c13f4daf20711e7af78f4b80ffa03a4b3697dbb88f00" origin="Generated by Gradle because artifact wasn't signed"/>
</artifact>
</component>
<component group="org.jetbrains.kotlinx" name="kotlinx-coroutines-core" version="1.2.1">
<artifact name="kotlinx-coroutines-core-1.2.1.jar">
<sha256 value="7177ed4629704537e0252537629886f5409526ecd041d8d8e308e20624b14394" origin="Generated by Gradle"/>
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ pluginManagement {
}

plugins {
def kotlinVersion = settings.hasProperty("kotlinDev") ? "1.5.0-M1" : "1.4.31"
def kotlinVersion = settings.hasProperty("kotlinDev") ? "1.5.20" : "1.5.20"
id 'org.jetbrains.kotlin.jvm' version kotlinVersion
id 'com.github.breadmoirai.github-release' version '2.2.12'
id 'com.github.johnrengelman.shadow' version '6.1.0'
Expand Down