diff options
| author | Bilal Alsharifi <bilal.alsharifi@gmail.com> | 2020-08-13 13:17:03 -0400 |
|---|---|---|
| committer | Bilal Alsharifi <bilal.alsharifi@gmail.com> | 2020-08-13 13:17:03 -0400 |
| commit | ba8b418776159a64576f3a434c0e70ac7029fa5a (patch) | |
| tree | 9680047e84a3fd76d4e001a330ffcc69de75f848 | |
| parent | 25a849c9c1e852c24356f569f8877e7bf5193f0b (diff) | |
| download | sdl_android-ba8b418776159a64576f3a434c0e70ac7029fa5a.tar.gz | |
Fix android x imports in RPC generator
| -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 df8ab2936..361042e30 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') @@ -143,7 +143,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 a1af54fe8..0c5cbca9d 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) |