new freeze version

PharmaLedger-IMI · May 20, 2022 · cdd5a13 · cdd5a13
1 parent 8ca7a5f
commit cdd5a13
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 28 deletions.
diff --git a/apihub-root/lightweight-pwa/lib/zxing-wrapper b/apihub-root/lightweight-pwa/lib/zxing-wrapper
diff --git a/octopus-freeze.json b/octopus-freeze.json
@@ -47,8 +47,8 @@
                     "type": "smartClone",
                     "target": ".",
                     "collectLog": false,
-                    "commit": "b163b9b127cd4cbc5e69e3d2094c1c14691bbbad",
-                    "tag": "v1.0.2"
+                    "commit": "8ecc10fc1697c65a305f82d65cce9714605ad58a",
+                    "tag": "v1.0.3"
                 },
                 {
                     "type": "execute",
@@ -73,8 +73,8 @@
                     "type": "smartClone",
                     "target": ".",
                     "collectLog": false,
-                    "commit": "983a9249e201f42c825b8a5b1a623f1da6fb4ff1",
-                    "tag": "v1.0.2"
+                    "commit": "5c34b8e37466244491085c2cbdc1d6ecfeea2a44",
+                    "tag": "v1.0.3"
                 },
                 {
                     "type": "execute",
@@ -90,8 +90,8 @@
                     "type": "smartClone",
                     "target": ".",
                     "collectLog": false,
-                    "commit": "c3085173834d4bcbd473552a2afdca581507871f",
-                    "tag": "v1.0.2"
+                    "commit": "2071457e1cc56573974acc763d1204bb7fcd46fc",
+                    "tag": "v1.0.3"
                 },
                 {
                     "type": "execute",
@@ -271,8 +271,8 @@
                     "type": "smartClone",
                     "target": ".",
                     "collectLog": false,
-                    "commit": "5def7fad9357579ea9941d7c8674b05cfd5aee79",
-                    "tag": "v1.0.2"
+                    "commit": "60daccbde68de966b6337b45f52de9902d49e630",
+                    "tag": "v1.0.3"
                 },
                 {
                     "type": "execute",
@@ -285,7 +285,7 @@
             ]
         },
         {
-            "name": "acdc-reporting",
+            "name": "dfm-reporting",
             "src": "",
             "actions": [
                 {
@@ -403,6 +403,19 @@
                     "cmd": "cd dsu-fabric-ssapp && npm install"
                 }
             ]
+        },
+        {
+            "name": "zxing-wrapper",
+            "src": "http://github.com/webcardinal/zxing-wrapper.git",
+            "actions": [
+                {
+                    "type": "smartClone",
+                    "target": "./apihub-root/lightweight-pwa/lib",
+                    "collectLog": false,
+                    "commit": "e9ec10b58d9ad3c9c07d3868ecf8f918aa440d9c",
+                    "tag": "v1.0.0"
+                }
+            ]
         }
     ],
     "patch": [
@@ -479,7 +492,7 @@
             ]
         },
         {
-            "name": "acdc-reporting",
+            "name": "dfm-reporting",
             "src": "",
             "actions": [
                 {
@@ -694,7 +707,7 @@
             ]
         },
         {
-            "name": "acdc-reporting",
+            "name": "dfm-reporting",
             "src": "",
             "actions": [
                 {
@@ -704,7 +717,7 @@
             ]
         },
         {
-            "name": "acdc-native-integration-build",
+            "name": "dfm-native-integration-build",
             "src": "",
             "actions": [
                 {
@@ -936,14 +949,6 @@
                         "overwrite": true
                     }
                 },
-                {
-                    "type": "execute",
-                    "cmd": "node ./node_modules/octopus/scripts/setEnv --file=../../../env.json \"node ./bin/octopusRun.js build-acf-ssapps\"",
-                    "options": {
-                        "overwrite": true,
-                        "ignoreErrors": true
-                    }
-                },
                 {
                     "type": "copy",
                     "src": "./trust-loader-config",
@@ -969,6 +974,17 @@
                 }
             ]
         },
+        {
+            "name": "prepare-phase",
+            "actions": [
+                {
+                    "type": "execute",
+                    "cmd": "node ./node_modules/octopus/scripts/setEnv --file=../../../env.json \"node ./bin/octopusRun.js patching-mobile\""
+                }
+            ]
+        }
+    ],
+    "patching-mobile": [
         {
             "name": "build-android-app",
             "actions": [
@@ -1109,7 +1125,7 @@
     "install-acf-ssapps": [
         {
             "name": "delayv-auth-feat-ssapp",
-            "src": "https://github.com/asaccool/acdc-authentication-feature-59k3",
+            "src": "https://github.com/delayv/acdc-authentication-feature-59k3.git",
             "actions": [
                 {
                     "type": "smartClone",
@@ -1153,7 +1169,7 @@
             ]
         }
     ],
-    "install-acdc": [
+    "install-dfm": [
         {
             "name": "acdc",
             "src": "https://github.com/PharmaLedger-IMI/acdc-components.git",
@@ -1190,7 +1206,7 @@
             ]
         },
         {
-            "name": "acdc-reporting",
+            "name": "dfm-reporting",
             "src": "",
             "actions": [
                 {
@@ -1200,9 +1216,9 @@
             ]
         }
     ],
-    "build-acdc": [
+    "build-dfm": [
         {
-            "name": "acdc-reporting",
+            "name": "dfm-reporting",
             "src": "",
             "actions": [
                 {
@@ -1212,7 +1228,7 @@
             ]
         },
         {
-            "name": "acdc-native-integration-build",
+            "name": "dfm-native-integration-build",
             "src": "",
             "actions": [
                 {
@@ -1245,11 +1261,11 @@
     ],
     "build-acf-ssapps": [
         {
-            "name": "build-acdc",
+            "name": "build-dfm",
             "actions": [
                 {
                     "type": "execute",
-                    "cmd": "node ./node_modules/octopus/scripts/setEnv --file=../../../env.json \"node ./bin/octopusRun.js build-acdc\""
+                    "cmd": "node ./node_modules/octopus/scripts/setEnv --file=../../../env.json \"node ./bin/octopusRun.js build-dfm\""
                 },
                 {
                     "type": "execute",
@@ -1258,6 +1274,10 @@
                 {
                     "type": "execute",
                     "cmd": "cd truemedhemo-auth-feat-ssapp && npm run build"
+                },
+                {
+                    "type": "execute",
+                    "cmd": "node ./node_modules/octopus/scripts/setEnv --file=../../../env.json \"node ./bin/octopusRun.js patching-mobile\""
                 }
             ]
         }