mirror of
https://github.com/github/codeql.git
synced 2025-12-17 01:03:14 +01:00
Merge branch 'main' into redsun82/swift-doc-for-schema-doc
This commit is contained in:
Paolo Tranquilli
@@ -106,36 +106,6 @@ namespace Semmle.BuildAnalyser
|
||||
return result;
|
||||
}
|
||||
|
||||
// Attempt to load the reference from the GAC.
|
||||
try
|
||||
{
|
||||
var loadedAssembly = System.Reflection.Assembly.ReflectionOnlyLoad(id);
|
||||
|
||||
if (loadedAssembly is not null)
|
||||
{
|
||||
// The assembly was somewhere we haven't indexed before.
|
||||
// Add this assembly to our index so that subsequent lookups are faster.
|
||||
|
||||
result = AssemblyInfo.MakeFromAssembly(loadedAssembly);
|
||||
assemblyInfoById[id] = result;
|
||||
assemblyInfoByFileName[loadedAssembly.Location] = result;
|
||||
return result;
|
||||
}
|
||||
}
|
||||
catch (FileNotFoundException)
|
||||
{
|
||||
// A suitable assembly could not be found
|
||||
}
|
||||
catch (FileLoadException)
|
||||
{
|
||||
// The assembly cannot be loaded for some reason
|
||||
// e.g. The name is malformed.
|
||||
}
|
||||
catch (PlatformNotSupportedException)
|
||||
{
|
||||
// .NET Core does not have a GAC.
|
||||
}
|
||||
|
||||
// Fallback position - locate the assembly by its lower-case name only.
|
||||
var asmName = assemblyName.ToLowerInvariant();
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
Java,"Java 7 to 19 [4]_","javac (OpenJDK and Oracle JDK),
|
||||
|
||||
Eclipse compiler for Java (ECJ) [5]_",``.java``
|
||||
Kotlin [6]_,"Kotlin 1.5.0 to 1.8.0","kotlinc",``.kt``
|
||||
Kotlin [6]_,"Kotlin 1.5.0 to 1.8.20","kotlinc",``.kt``
|
||||
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]_"
|
||||
Python [8]_,"2.7, 3.5, 3.6, 3.7, 3.8, 3.9, 3.10, 3.11",Not applicable,``.py``
|
||||
Ruby [9]_,"up to 3.1",Not applicable,"``.rb``, ``.erb``, ``.gemspec``, ``Gemfile``"
|
||||
|
||||
@@ -21,8 +21,8 @@ def version_string_to_tuple(version):
|
||||
m = re.match(r'([0-9]+)\.([0-9]+)\.([0-9]+)(.*)', version)
|
||||
return tuple([int(m.group(i)) for i in range(1, 4)] + [m.group(4)])
|
||||
|
||||
# Version number used by CI. It needs to be one of the versions in many_versions.
|
||||
ci_version = '1.8.0'
|
||||
# Version number used by CI.
|
||||
ci_version = '1.8.10'
|
||||
|
||||
# Version numbers in the list need to be in semantically increasing order
|
||||
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):
|
||||
raise Exception(f'No suitable kotlinc version found for {current_version} (got {versionOutput}; know about {str(many_versions)})')
|
||||
|
||||
def get_latest_url():
|
||||
if ci_version not in many_versions:
|
||||
raise Exception('CI version must be one of many_versions')
|
||||
url = 'https://github.com/JetBrains/kotlin/releases/download/v' + ci_version + '/kotlin-compiler-' + ci_version + '.zip'
|
||||
return url
|
||||
|
||||
|
||||
4
java/ql/lib/change-notes/2023-02-08-kotlin-1.8.20.md
Normal file
4
java/ql/lib/change-notes/2023-02-08-kotlin-1.8.20.md
Normal file
@@ -0,0 +1,4 @@
|
||||
---
|
||||
category: feature
|
||||
---
|
||||
* Kotlin versions up to 1.8.20 are now supported.
|
||||
@@ -1,17 +0,0 @@
|
||||
class IterableDeclContext extends @decl {
|
||||
IterableDeclContext() {
|
||||
this instanceof @extension_decl
|
||||
or
|
||||
this instanceof @nominal_type_decl
|
||||
}
|
||||
|
||||
string toString() { none() }
|
||||
}
|
||||
|
||||
class DeclOrNone extends @decl_or_none {
|
||||
string toString() { none() }
|
||||
}
|
||||
|
||||
query predicate iterable_decl_context_members(IterableDeclContext id, int index, DeclOrNone member) {
|
||||
decl_members(id, index, member)
|
||||
}
|
||||
@@ -1,5 +1,5 @@
|
||||
description: revert removal of IterableDeclContext
|
||||
compatibility: partial
|
||||
|
||||
iterable_decl_context_members.rel: run iterable_decl_context_members.qlo
|
||||
iterable_decl_context_members.rel: reorder decl_members.rel (int id, int index, int member) id index member
|
||||
decl_members.rel: delete
|
||||
|
||||
@@ -1,5 +0,0 @@
|
||||
class Callable extends @callable, @abstract_function_decl {
|
||||
string toString() { result = "" }
|
||||
}
|
||||
|
||||
query predicate abstract_function_decls(Callable id, string name) { callable_names(id, name) }
|
||||
@@ -2,5 +2,5 @@ description: Revert moving getName() from AbstractFunctionDecl to Callable
|
||||
compatibility: backwards
|
||||
|
||||
// Rename callable_names to abstract_function_decls
|
||||
abstract_function_decls.rel: run abstract_function_decls.qlo
|
||||
abstract_function_decls.rel: reorder callable_names.rel (int id, string name) id name
|
||||
callable_names.rel: delete
|
||||
|
||||
@@ -1,7 +0,0 @@
|
||||
class AbstractFunctionDecl extends @abstract_function_decl {
|
||||
string toString() { result = "" }
|
||||
}
|
||||
|
||||
query predicate callable_names(AbstractFunctionDecl id, string name) {
|
||||
abstract_function_decls(id, name)
|
||||
}
|
||||
@@ -2,5 +2,5 @@ description: Move getName() from AbstractFunctionDecl to Callable
|
||||
compatibility: full
|
||||
|
||||
// Rename abstract_function_decls to callable_names
|
||||
callable_names.rel: run callable_names.qlo
|
||||
callable_names.rel: reorder abstract_function_decls.rel (int id, string name) id name
|
||||
abstract_function_decls.rel: delete
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
description: remove IterableDeclContext
|
||||
compatibility: full
|
||||
|
||||
decl_members.rel: reorder iterable_decl_context_members.rel (int id, int index, int member) id index member
|
||||
iterable_decl_context_members.rel: delete
|
||||
decl_members.rel: run decl_members.qlo
|
||||
|
||||
Reference in New Issue
Block a user