Merge branch 'master' into amazon-support

CHANGELOG.md

@@ -2,13 +2,14 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## [6.0.0] - TBD
+## [6.0.0] - 2019-09-24
 
 ### Added
 * Push to Amazon support
 
 ### Fixed
 * Focus and Klar were sent in the same transaction, which cannot happen.
+* False positive exception about multiple architectures
 
 ### Removed
 * `update_apk_description.py`: https://l10n.mozilla-community.org/stores_l10n/ is now retired making the script useless.

mozapkpublisher/common/apk/extractor.py

@@ -59,7 +59,7 @@ def extract_metadata(original_apk_path, extract_architecture_metadata, extract_l
 def _extract_architecture(apk_zip, original_apk_path):
     files_with_architecture_in_path = [
         name for name in apk_zip.namelist()
-        if _DIRECTORY_WITH_ARCHITECTURE_METADATA in name
+        if name.startswith(_DIRECTORY_WITH_ARCHITECTURE_METADATA)
     ]
 
     if not files_with_architecture_in_path:

mozapkpublisher/test/common/apk/test_extractor.py

@@ -44,7 +44,7 @@ def _create_apk_with_locale_content(temp_dir, manifest_content):
 
 
 def _create_apk_with_architecture_content(temp_dir, architecture=None):
-    random_file_in_lib = os.path.join(temp_dir, 'libmozglue.so')
+    random_file_in_lib = os.path.join(temp_dir, 'some_random_file')
     with open(random_file_in_lib, 'w'):
         pass
 
@@ -53,6 +53,9 @@ def _create_apk_with_architecture_content(temp_dir, architecture=None):
         if architecture is not None:
             apk_zip.write(random_file_in_lib, 'lib/{}/libmozglue.so'.format(architecture))
 
+        # Add content which was previously been detected as "architectures"
+        apk_zip.write(random_file_in_lib, 'assets/extensions/webcompat/lib/about_compat_broker.js')
+
     return apk_path
 
 

version.txt

@@ -1 +1 @@
-5.0.0
+6.0.0