Skip to content

Commit adf47b9

Browse files
authored
Merge branch 'main' into redsun82/swift-doc-for-schema-doc
2 parents 1e27912 + c92fd97 commit adf47b9

File tree

11 files changed

+11
-68
lines changed

11 files changed

+11
-68
lines changed

csharp/extractor/Semmle.Extraction.CSharp.Standalone/AssemblyCache.cs

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -106,36 +106,6 @@ public AssemblyInfo ResolveReference(string id)
106106
return result;
107107
}
108108

109-
// Attempt to load the reference from the GAC.
110-
try
111-
{
112-
var loadedAssembly = System.Reflection.Assembly.ReflectionOnlyLoad(id);
113-
114-
if (loadedAssembly is not null)
115-
{
116-
// The assembly was somewhere we haven't indexed before.
117-
// Add this assembly to our index so that subsequent lookups are faster.
118-
119-
result = AssemblyInfo.MakeFromAssembly(loadedAssembly);
120-
assemblyInfoById[id] = result;
121-
assemblyInfoByFileName[loadedAssembly.Location] = result;
122-
return result;
123-
}
124-
}
125-
catch (FileNotFoundException)
126-
{
127-
// A suitable assembly could not be found
128-
}
129-
catch (FileLoadException)
130-
{
131-
// The assembly cannot be loaded for some reason
132-
// e.g. The name is malformed.
133-
}
134-
catch (PlatformNotSupportedException)
135-
{
136-
// .NET Core does not have a GAC.
137-
}
138-
139109
// Fallback position - locate the assembly by its lower-case name only.
140110
var asmName = assemblyName.ToLowerInvariant();
141111

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.

swift/downgrades/15d0da3a76b9dbffb921ae6d585f8a8de8945a0b/iterable_decl_context_members.ql

Lines changed: 0 additions & 17 deletions
This file was deleted.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
description: revert removal of IterableDeclContext
22
compatibility: partial
33

4-
iterable_decl_context_members.rel: run iterable_decl_context_members.qlo
4+
iterable_decl_context_members.rel: reorder decl_members.rel (int id, int index, int member) id index member
55
decl_members.rel: delete

swift/downgrades/5559b5a367524777b3f6ef3fc285ae81031ca1da/abstract_function_decls.ql

Lines changed: 0 additions & 5 deletions
This file was deleted.

swift/downgrades/5559b5a367524777b3f6ef3fc285ae81031ca1da/upgrade.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ description: Revert moving getName() from AbstractFunctionDecl to Callable
22
compatibility: backwards
33

44
// Rename callable_names to abstract_function_decls
5-
abstract_function_decls.rel: run abstract_function_decls.qlo
5+
abstract_function_decls.rel: reorder callable_names.rel (int id, string name) id name
66
callable_names.rel: delete

swift/ql/lib/upgrades/62fc609c1ab6ae748ff51362ffa5c368ba834ddf/callable_names.ql

Lines changed: 0 additions & 7 deletions
This file was deleted.

swift/ql/lib/upgrades/62fc609c1ab6ae748ff51362ffa5c368ba834ddf/upgrade.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ description: Move getName() from AbstractFunctionDecl to Callable
22
compatibility: full
33

44
// Rename abstract_function_decls to callable_names
5-
callable_names.rel: run callable_names.qlo
5+
callable_names.rel: reorder abstract_function_decls.rel (int id, string name) id name
66
abstract_function_decls.rel: delete

0 commit comments

Comments
 (0)