diff options
| author | Julian Kast <Julian.kast@livio.io> | 2020-08-17 07:28:01 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-17 07:28:01 -0700 |
| commit | 68b9e47af491c9c1bc06ff80dee8b25aa16c1822 (patch) | |
| tree | 5d3cd717e276d9c6c4660981bab033ea915b84d7 /generator/transformers | |
| parent | 84e8ef3940b7f2e8e3cfeeb6f432230a5918d53f (diff) | |
| parent | 9c2c295fd68ed4cd9cb715f9b4fd3e7bfb2afead (diff) | |
| download | sdl_android-68b9e47af491c9c1bc06ff80dee8b25aa16c1822.tar.gz | |
Merge pull request #1445 from smartdevicelink/feature/issue_1444_fix_generated_imports
Update RPC Generator to generate correct Android X imports
Diffstat (limited to 'generator/transformers')
| -rw-r--r-- | generator/transformers/functions_producer.py | 10 | ||||
| -rw-r--r-- | generator/transformers/structs_producer.py | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/generator/transformers/functions_producer.py b/generator/transformers/functions_producer.py index 8b5a83aee..c121de557 100644 --- a/generator/transformers/functions_producer.py +++ b/generator/transformers/functions_producer.py @@ -46,7 +46,7 @@ class FunctionsProducer(InterfaceProducerCommon): if not class_name.endswith("Response"): class_name += 'Response' imports.add('com.smartdevicelink.proxy.rpc.enums.Result') - imports.add('android.support.annotation.NonNull') + imports.add('androidx.annotation.NonNull') elif item.message_type.name == 'request': extends_class = self.request_class elif item.message_type.name == 'notification': @@ -87,9 +87,9 @@ class FunctionsProducer(InterfaceProducerCommon): def sort_imports(self, imports: set): sorted_imports = [] - if 'android.support.annotation.NonNull' in imports: - sorted_imports.append('android.support.annotation.NonNull') - imports.remove('android.support.annotation.NonNull') + if 'androidx.annotation.NonNull' in imports: + sorted_imports.append('androidx.annotation.NonNull') + imports.remove('androidx.annotation.NonNull') sorted_imports.append('') sorted_imports.append('com.smartdevicelink.protocol.enums.FunctionID') imports.remove('com.smartdevicelink.protocol.enums.FunctionID') @@ -144,7 +144,7 @@ class FunctionsProducer(InterfaceProducerCommon): if tr in self.struct_names: imports.add('{}.{}'.format(self.structs_package, tr)) if param.is_mandatory: - imports.add('android.support.annotation.NonNull') + imports.add('androidx.annotation.NonNull') Params = namedtuple('Params', sorted(p)) return imports, Params(**p) diff --git a/generator/transformers/structs_producer.py b/generator/transformers/structs_producer.py index c7c5a3058..400e36800 100644 --- a/generator/transformers/structs_producer.py +++ b/generator/transformers/structs_producer.py @@ -76,9 +76,9 @@ class StructsProducer(InterfaceProducerCommon): def sort_imports(self, imports: set): sorted_imports = [] - if 'android.support.annotation.NonNull' in imports: - sorted_imports.append('android.support.annotation.NonNull') - imports.remove('android.support.annotation.NonNull') + if 'androidx.annotation.NonNull' in imports: + sorted_imports.append('androidx.annotation.NonNull') + imports.remove('androidx.annotation.NonNull') sorted_imports.append('') tmp = [] for i in imports: @@ -124,7 +124,7 @@ class StructsProducer(InterfaceProducerCommon): if tr in self.struct_names: imports.add('{}.{}'.format(self.structs_package, tr)) if param.is_mandatory: - imports.add('android.support.annotation.NonNull') + imports.add('androidx.annotation.NonNull') Params = namedtuple('Params', sorted(p)) return imports, Params(**p) |