4 files changed, 64 insertions(+), 60 deletions(-)

M cmake/modules/DownloadAsset.cmake
M harmony_changelog.md
M products/BellHybrid/CMakeLists.txt
M products/BellHybrid/assets/assets_proprietary.json

@@ 25,7 25,7 @@ function(download_asset_release_json
         target
         json
         install_path
-        asset_repo
+        repository
         version
         cache_dir
         )


@@ 35,7 35,7 @@ function(download_asset_release_json
             --cache_dir ${cache_dir}
             github
             --owner mudita
-            --repository ${asset_repo}
+            --repository ${repository}
             --install_dir ${install_path}
             download
             --json ${json}

@@ 7,6 7,7 @@
 ### Added
 * Added label with the name of the application on the countdown screens
 * Added What's New section shown after update
+* Added versioning for private assets
 
 ### Changed / Improved
 

@@ 135,11 135,12 @@ add_hex_target(BellHybrid)
 
 include(DownloadAsset)
 # copy all assets required to build catalog under current folder as in json recipe
-download_asset_json(json-proprietary-target
-                    ${CMAKE_CURRENT_SOURCE_DIR}/assets/assets_proprietary.json
-                    ${SYSROOT_PATH}/system_a/
-                    MuditaOSAssets
-                    ${MUDITA_CACHE_DIR}
+download_asset_release_json(json-proprietary-target
+                            ${CMAKE_CURRENT_SOURCE_DIR}/assets/assets_proprietary.json
+                            ${SYSROOT_PATH}/system_a/
+                            MuditaOSAssets
+                            0.0.1
+                            ${MUDITA_CACHE_DIR}
     )
 download_asset_release_json(json-common-target
                             ${CMAKE_CURRENT_SOURCE_DIR}/assets/assets_common.json

@@ 2,97 2,99 @@
     "comment": "This is kiss structure - asset path & sha",
     "assets": [
         {
-            "name": "./fonts/fontmap.json",
+            "name": "release.tgz",
+            "tarfile": "./release/fonts/fontmap.json",
             "output": "assets/fonts/fontmap.json"
         },
         {
-            "name": "./fonts/pure/dejavu_sans_bold_27.mpf",
+            "name": "release.tgz",
+            "tarfile": "./release/fonts/pure/dejavu_sans_bold_27.mpf",
             "output": "assets/fonts/dejavu_sans_bold_27.mpf"
         },
         {
-            "name": "./fonts/common/gt_pressura_light_30.mpf",
-            "output": "assets/fonts/gt_pressura/gt_pressura_light_30.mpf",
-            "ref": "10c74fcb09c2022325767cad735c0183b6f5393a"
+            "name": "release.tgz",
+            "tarfile": "./release/fonts/common/gt_pressura_light_30.mpf",
+            "output": "assets/fonts/gt_pressura/gt_pressura_light_30.mpf"
         },
         {
-            "name": "./fonts/common/gt_pressura_regular_30.mpf",
-            "output": "assets/fonts/gt_pressura/gt_pressura_regular_30.mpf",
-            "ref": "10c74fcb09c2022325767cad735c0183b6f5393a"
+            "name": "release.tgz",
+            "tarfile": "./release/fonts/common/gt_pressura_regular_30.mpf",
+            "output": "assets/fonts/gt_pressura/gt_pressura_regular_30.mpf"
         },
         {
-            "name": "./fonts/common/gt_pressura_bold_30.mpf",
-            "output": "assets/fonts/gt_pressura/gt_pressura_bold_30.mpf",
-            "ref": "10c74fcb09c2022325767cad735c0183b6f5393a"
+            "name": "release.tgz",
+            "tarfile": "./release/fonts/common/gt_pressura_bold_30.mpf",
+            "output": "assets/fonts/gt_pressura/gt_pressura_bold_30.mpf"
         },
         {
-            "name": "./fonts/bell/gt_pressura_light_32.mpf",
-            "output": "assets/fonts/gt_pressura/gt_pressura_light_32.mpf",
-            "ref": "bb0da198fd4711072bf69e19136feae28db4e375"
+            "name": "release.tgz",
+            "tarfile": "./release/fonts/bell/gt_pressura_light_32.mpf",
+            "output": "assets/fonts/gt_pressura/gt_pressura_light_32.mpf"
         },
         {
-            "name": "./fonts/bell/gt_pressura_regular_32.mpf",
-            "output": "assets/fonts/gt_pressura/gt_pressura_regular_32.mpf",
-            "ref": "05658e95aacde53d9c4bd02636d1ee41c128e8bc"
+            "name": "release.tgz",
+            "tarfile": "./release/fonts/bell/gt_pressura_regular_32.mpf",
+            "output": "assets/fonts/gt_pressura/gt_pressura_regular_32.mpf"
         },
         {
-            "name": "./fonts/pure/gt_pressura_bold_32.mpf",
-            "output":"assets/fonts/gt_pressura/gt_pressura_bold_32.mpf",
-            "ref": "10c74fcb09c2022325767cad735c0183b6f5393a"
+            "name": "release.tgz",
+            "tarfile": "./release/fonts/pure/gt_pressura_bold_32.mpf",
+            "output":"assets/fonts/gt_pressura/gt_pressura_bold_32.mpf"
         },
         {
-            "name": "./fonts/bell/gt_pressura_light_38.mpf",
-            "output": "assets/fonts/gt_pressura/gt_pressura_light_38.mpf",
-            "ref": "10c74fcb09c2022325767cad735c0183b6f5393a"
+            "name": "release.tgz",
+            "tarfile": "./release/fonts/bell/gt_pressura_light_38.mpf",
+            "output": "assets/fonts/gt_pressura/gt_pressura_light_38.mpf"
         },
         {
-            "name": "./fonts/bell/gt_pressura_regular_38.mpf",
-            "output": "assets/fonts/gt_pressura/gt_pressura_regular_38.mpf",
-            "ref": "fd168040c5d1216d457e6cf223e8ea9bb76bf7b"
+            "name": "release.tgz",
+            "tarfile": "./release/fonts/bell/gt_pressura_regular_38.mpf",
+            "output": "assets/fonts/gt_pressura/gt_pressura_regular_38.mpf"
         },
         {
-            "name": "./fonts/bell/gt_pressura_bold_38.mpf",
-            "output": "assets/fonts/gt_pressura/gt_pressura_bold_38.mpf",
-            "ref": "a5a432e1330f2728d7f943ccc9dbb678c3f9ebca"
+            "name": "release.tgz",
+            "tarfile": "./release/fonts/bell/gt_pressura_bold_38.mpf",
+            "output": "assets/fonts/gt_pressura/gt_pressura_bold_38.mpf"
         },
         {
-            "name": "./fonts/bell/gt_pressura_light_40.mpf",
-            "output": "assets/fonts/gt_pressura/gt_pressura_light_40.mpf",
-            "ref": "594167d42d7881e3d7c6fa28db945cd5409db69c"
+            "name": "release.tgz",
+            "tarfile": "./release/fonts/bell/gt_pressura_light_40.mpf",
+            "output": "assets/fonts/gt_pressura/gt_pressura_light_40.mpf"
         },
         {
-            "name": "./fonts/common/gt_pressura_regular_46.mpf",
-            "output": "assets/fonts/gt_pressura/gt_pressura_regular_46.mpf",
-            "ref": "10c74fcb09c2022325767cad735c0183b6f5393a"
+            "name": "release.tgz",
+            "tarfile": "./release/fonts/common/gt_pressura_regular_46.mpf",
+            "output": "assets/fonts/gt_pressura/gt_pressura_regular_46.mpf"
         },
         {
-            "name": "./fonts/common/gt_pressura_light_46.mpf",
-            "output": "assets/fonts/gt_pressura/gt_pressura_light_46.mpf",
-            "ref": "ed63632610bf34e7238126d0c798e1695846b02a"
+            "name": "release.tgz",
+            "tarfile": "./release/fonts/common/gt_pressura_light_46.mpf",
+            "output": "assets/fonts/gt_pressura/gt_pressura_light_46.mpf"
         },
         {
-            "name": "./fonts/common/gt_pressura_light_90.mpf",
-            "output": "assets/fonts/gt_pressura/gt_pressura_light_90.mpf",
-            "ref": "10c74fcb09c2022325767cad735c0183b6f5393a"
+            "name": "release.tgz",
+            "tarfile": "./release/fonts/common/gt_pressura_light_90.mpf",
+            "output": "assets/fonts/gt_pressura/gt_pressura_light_90.mpf"
         },
         {
-            "name": "./fonts/bell/gt_pressura_regular_90.mpf",
-            "output": "assets/fonts/gt_pressura/gt_pressura_regular_90.mpf",
-            "ref": "10c74fcb09c2022325767cad735c0183b6f5393a"
+            "name": "release.tgz",
+            "tarfile": "./release/fonts/bell/gt_pressura_regular_90.mpf",
+            "output": "assets/fonts/gt_pressura/gt_pressura_regular_90.mpf"
         },
         {
-            "name": "./fonts/bell/gt_pressura_regular_170.mpf",
-            "output": "assets/fonts/gt_pressura/gt_pressura_regular_170.mpf",
-            "ref": "a495a5acbbb19e8b5c1d670a3041cfc1f046db33"
+            "name": "release.tgz",
+            "tarfile": "./release/fonts/bell/gt_pressura_regular_170.mpf",
+            "output": "assets/fonts/gt_pressura/gt_pressura_regular_170.mpf"
         },
         {
-            "name": "./fonts/bell/gt_pressura_light_200.mpf",
-            "output": "assets/fonts/gt_pressura/gt_pressura_light_200.mpf",
-            "ref": "6e0731ffcc08a682010bb7724a5e1f230a273e2a"
+            "name": "release.tgz",
+            "tarfile": "./release/fonts/bell/gt_pressura_light_200.mpf",
+            "output": "assets/fonts/gt_pressura/gt_pressura_light_200.mpf"
         },
         {
-            "name": "./fonts/bell/gt_pressura_regular_220_altered.mpf",
-            "output": "assets/fonts/gt_pressura/gt_pressura_regular_220_altered.mpf",
-            "ref": "5df11a03b9b9b5b9ff4cb99d09091670f5a6361d"
+            "name": "release.tgz",
+            "tarfile": "./release/fonts/bell/gt_pressura_regular_220_altered.mpf",
+            "output": "assets/fonts/gt_pressura/gt_pressura_regular_220_altered.mpf"
         }
     ]
 }