Skip to content

Commit 968f588

Browse files
authored
Merge pull request github#12090 from igfoo/igfoo/kotlin-1.8.10
Kotlin: 1.8.10 and 1.8.20 are supported, and use 1.8.10 for CI
2 parents 80a397b + 844e372 commit 968f588

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

docs/codeql/reusables/supported-versions-compilers.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
Java,"Java 7 to 19 [4]_","javac (OpenJDK and Oracle JDK),
2121

2222
Eclipse compiler for Java (ECJ) [5]_",``.java``
23-
Kotlin [6]_,"Kotlin 1.5.0 to 1.8.0","kotlinc",``.kt``
23+
Kotlin [6]_,"Kotlin 1.5.0 to 1.8.20","kotlinc",``.kt``
2424
JavaScript,ECMAScript 2022 or lower,Not applicable,"``.js``, ``.jsx``, ``.mjs``, ``.es``, ``.es6``, ``.htm``, ``.html``, ``.xhtm``, ``.xhtml``, ``.vue``, ``.hbs``, ``.ejs``, ``.njk``, ``.json``, ``.yaml``, ``.yml``, ``.raml``, ``.xml`` [7]_"
2525
Python [8]_,"2.7, 3.5, 3.6, 3.7, 3.8, 3.9, 3.10, 3.11",Not applicable,``.py``
2626
Ruby [9]_,"up to 3.1",Not applicable,"``.rb``, ``.erb``, ``.gemspec``, ``Gemfile``"

java/kotlin-extractor/kotlin_plugin_versions.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ def version_string_to_tuple(version):
2121
m = re.match(r'([0-9]+)\.([0-9]+)\.([0-9]+)(.*)', version)
2222
return tuple([int(m.group(i)) for i in range(1, 4)] + [m.group(4)])
2323

24-
# Version number used by CI. It needs to be one of the versions in many_versions.
25-
ci_version = '1.8.0'
24+
# Version number used by CI.
25+
ci_version = '1.8.10'
2626

2727
# Version numbers in the list need to be in semantically increasing order
2828
many_versions = [ '1.4.32', '1.5.0', '1.5.10', '1.5.20', '1.5.30', '1.6.0', '1.6.20', '1.7.0', '1.7.20', '1.8.0' ]
@@ -57,8 +57,6 @@ def get_single_version(fakeVersionOutput = None):
5757
raise Exception(f'No suitable kotlinc version found for {current_version} (got {versionOutput}; know about {str(many_versions)})')
5858

5959
def get_latest_url():
60-
if ci_version not in many_versions:
61-
raise Exception('CI version must be one of many_versions')
6260
url = 'https://github.com/JetBrains/kotlin/releases/download/v' + ci_version + '/kotlin-compiler-' + ci_version + '.zip'
6361
return url
6462

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
category: feature
3+
---
4+
* Kotlin versions up to 1.8.20 are now supported.

0 commit comments

Comments
 (0)