Skip to content

Commit

Permalink
Update Kotlin to 1.6.21
Browse files Browse the repository at this point in the history
Note: Kotlin is a new dependency in JMeter 5.5.

See https://kotlinlang.org/docs/whatsnew1620.html
  • Loading branch information
vlsi committed May 9, 2022
1 parent 4f05afc commit 49f6668
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 6 deletions.
1 change: 1 addition & 0 deletions checksum.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
<trusted-key id='353a436e043e3145' group='com.google.code.findbugs' />
<trusted-key id='59a252fb1199d873' group='com.google.code.findbugs' />
<trusted-key id='7a01b0f236e5430f' group='com.google.code.gson' />
<trusted-key id='b0f3710fa64900e7' group='com.google.code.gson' />
<trusted-key id='1669c4bb543e0445' group='com.google.errorprone' />
<trusted-key id='912d2c0eccda55c0' group='com.google.errorprone' />
<trusted-key id='9a259c7ee636c5ed' group='com.google.errorprone' />
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ com.github.spotbugs.version=4.5.0
com.github.vlsi.checksum-dependency.sha512=84572B7F654D1F9842DDD7E0D4331461DC55B92CDC1DA8EBA2269870CE027B021AB91D1942043145825B00521A92029C969BFA388A27BD63CC509BF7AB18E35F
com.github.vlsi.checksum-dependency.version=1.77
com.github.vlsi.vlsi-release-plugins.version=1.77
kotlin.version=1.6.0
kotlin.version=1.6.21
# Restrict uses of Kotlin APIs to 1.5 only, so projects that use Kotlin 1.5 can use JMeter
kotlin.api.version=1.5
# See https://kotlinlang.org/docs/whatsnew14.html#explicit-api-mode-for-library-authors
Expand Down
8 changes: 4 additions & 4 deletions src/dist/src/dist/expected_release_jars.csv
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,10 @@
249924,jtidy-r938.jar
384581,junit-4.13.2.jar
32033,kotlin-logging-jvm-2.0.5.jar
1508076,kotlin-stdlib-1.6.0.jar
200616,kotlin-stdlib-common-1.6.0.jar
22357,kotlin-stdlib-jdk7-1.6.0.jar
16201,kotlin-stdlib-jdk8-1.6.0.jar
1509405,kotlin-stdlib-1.6.21.jar
200631,kotlin-stdlib-common-1.6.21.jar
23898,kotlin-stdlib-jdk7-1.6.21.jar
17772,kotlin-stdlib-jdk8-1.6.21.jar
792176,kotlinx-html-jvm-0.7.3.jar
181223,lets-plot-batik-2.2.1.jar
4025480,lets-plot-common-2.2.1.jar
Expand Down
2 changes: 1 addition & 1 deletion xdocs/changes.xml
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ however, the profile can't be updated while the test is running.

<ch_section>Non-functional changes</ch_section>
<ul>
<li>Added Kotlin 1.6.0 for JMeter engine implementation (apiVersion=1.5). The set of JSR 223 languages is intact.</li>
<li>Added Kotlin 1.6.21 for JMeter engine implementation (apiVersion=1.5). The set of JSR 223 languages is intact.</li>
<li><bug>65128</bug><pr>643</pr>Add missing documentation about <code>Same user on each iteration</code> for Thread Groups. Contributed by njkuzas.</li>
<li><pr>648</pr>Updated xmlgraphics-commons to 2.6 (from 2.3). Contributed by Stefan Seide (stefan at trilobyte-se.de)</li>
<li><pr>655</pr><pr>667</pr><pr>675</pr><pr>698</pr>Updated x-stream to 1.4.19 (from 1.4.15). Contributed by Stefan Seide (stefan at trilobyte-se.de)</li>
Expand Down

0 comments on commit 49f6668

Please sign in to comment.