summaryrefslogtreecommitdiff
path: root/mesonbuild/dependencies/dev.py
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2024-12-06 13:03:16 -0800
committerDylan Baker <dylan@pnwbakers.com>2025-10-20 15:15:53 -0700
commitac49d7e2a8183d4e68c9b006318c4ed4c2efabae (patch)
tree35ddf374d40aed3de187f940a23944f0cc56e9ac /mesonbuild/dependencies/dev.py
parentb7d2e1778c24057b4c20d87996568f6a72a46d73 (diff)
downloadmeson-ac49d7e2a8183d4e68c9b006318c4ed4c2efabae.tar.gz
interpreter: port dependency version to typed_kwargs
Diffstat (limited to 'mesonbuild/dependencies/dev.py')
-rw-r--r--mesonbuild/dependencies/dev.py9
1 files changed, 3 insertions, 6 deletions
diff --git a/mesonbuild/dependencies/dev.py b/mesonbuild/dependencies/dev.py
index 62583880f..d9f8fb1ee 100644
--- a/mesonbuild/dependencies/dev.py
+++ b/mesonbuild/dependencies/dev.py
@@ -33,9 +33,6 @@ if T.TYPE_CHECKING:
from ..interpreter.type_checking import PkgConfigDefineType
from .base import DependencyObjectKWs
- class JNISystemDependencyKW(DependencyObjectKWs):
- version: T.Optional[str]
-
def get_shared_library_suffix(environment: 'Environment', for_machine: MachineChoice) -> str:
"""This is only guaranteed to work for languages that compile to machine
@@ -557,7 +554,7 @@ class ZlibSystemDependency(SystemDependency):
class JNISystemDependency(SystemDependency):
- def __init__(self, environment: 'Environment', kwargs: JNISystemDependencyKW):
+ def __init__(self, environment: 'Environment', kwargs: DependencyObjectKWs):
super().__init__('jni', environment, kwargs)
self.feature_since = ('0.62.0', '')
@@ -580,7 +577,7 @@ class JNISystemDependency(SystemDependency):
self.is_found = False
return
- if 'version' in kwargs and not version_compare_many(self.version, kwargs['version'])[0]:
+ if kwargs.get('version') and not version_compare_many(self.version, kwargs['version'])[0]:
mlog.error(f'Incorrect JDK version found ({self.version}), wanted {kwargs["version"]}')
self.is_found = False
return
@@ -685,7 +682,7 @@ packages['jni'] = JNISystemDependency
class JDKSystemDependency(JNISystemDependency):
- def __init__(self, environment: 'Environment', kwargs: JNISystemDependencyKW):
+ def __init__(self, environment: 'Environment', kwargs: DependencyObjectKWs):
super().__init__(environment, kwargs)
self.feature_since = ('0.59.0', '')