From cc21b71b31ab24d11db6be0cfd157cc3432f2711 Mon Sep 17 00:00:00 2001
From: Niklas Zender <n.zender@famedly.com>
Date: Wed, 14 Oct 2020 07:43:21 +0000
Subject: [PATCH 01/17] Add license-Scanning using ORT

---
 .gitlab-ci.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 99a3cd2..aaa4126 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -129,3 +129,13 @@ pages:
       - public
   only:
     - main
+
+include:
+  - template: Security/License-Scanning.gitlab-ci.yml
+
+license_scanning:
+  image:
+    name: "registry.gitlab.com/gitlab-org/security-products/analyzers/ort/ort:latest"
+  script:
+    - /opt/ort/bin/ort analyze -i $CI_PROJECT_DIR -o $CI_PROJECT_DIR/
+    - /opt/ort/bin/ort report -f GitLabLicenseModel -i $CI_PROJECT_DIR/analyzer-result.yml -o $CI_PROJECT_DIR/

From 2e3326189ffa32267cd53e21aa919491bc9f9f56 Mon Sep 17 00:00:00 2001
From: Niklas Zender <n.zender@famedly.com>
Date: Wed, 14 Oct 2020 07:45:53 +0000
Subject: [PATCH 02/17] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index aaa4126..e7d66a4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -134,6 +134,7 @@ include:
   - template: Security/License-Scanning.gitlab-ci.yml
 
 license_scanning:
+  stage: coverage
   image:
     name: "registry.gitlab.com/gitlab-org/security-products/analyzers/ort/ort:latest"
   script:

From eabef15790154c6150ef60f590c9dd077aeae83d Mon Sep 17 00:00:00 2001
From: Niklas Zender <n.zender@famedly.com>
Date: Wed, 14 Oct 2020 07:54:13 +0000
Subject: [PATCH 03/17] Allow dynamic versions

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e7d66a4..e19a102 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -138,5 +138,5 @@ license_scanning:
   image:
     name: "registry.gitlab.com/gitlab-org/security-products/analyzers/ort/ort:latest"
   script:
-    - /opt/ort/bin/ort analyze -i $CI_PROJECT_DIR -o $CI_PROJECT_DIR/
+    - /opt/ort/bin/ort analyze -i $CI_PROJECT_DIR -o $CI_PROJECT_DIR/ --allow-dynamic-versions
     - /opt/ort/bin/ort report -f GitLabLicenseModel -i $CI_PROJECT_DIR/analyzer-result.yml -o $CI_PROJECT_DIR/

From 01bb3f5b50c74375b7f7e7cf0173dc3c45f7bcf9 Mon Sep 17 00:00:00 2001
From: Sorunome <mail@sorunome.de>
Date: Wed, 14 Oct 2020 12:13:57 +0200
Subject: [PATCH 04/17] fix: Make key backup work in web

---
 lib/src/utils/run_in_background.dart | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/src/utils/run_in_background.dart b/lib/src/utils/run_in_background.dart
index cbc5a40..8d837bb 100644
--- a/lib/src/utils/run_in_background.dart
+++ b/lib/src/utils/run_in_background.dart
@@ -21,7 +21,13 @@ import 'dart:async';
 
 Future<T> runInBackground<T, U>(
     FutureOr<T> Function(U arg) function, U arg) async {
-  final isolate = await IsolateRunner.spawn();
+  IsolateRunner isolate;
+  try {
+    isolate = await IsolateRunner.spawn();
+  } on UnsupportedError {
+    // web does not support isolates (yet), so we fall back to calling the method directly
+    return await function(arg);
+  }
   try {
     return await isolate.run(function, arg);
   } finally {

From fdd32598db125d56396394e84464751b87b570c7 Mon Sep 17 00:00:00 2001
From: Niklas Zender <n.zender@famedly.com>
Date: Wed, 14 Oct 2020 09:48:52 +0000
Subject: [PATCH 05/17] Try show html

---
 .gitlab-ci.yml | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e19a102..3916fce 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -95,7 +95,7 @@ build_api_doc:
     paths:
       - doc/api/
   only:
-    - main
+#    - main
 
 build_doc:
   tags:
@@ -110,7 +110,7 @@ build_doc:
     paths:
       - doc-public
   only:
-    - main
+#    - main
 
 pages:
   tags:
@@ -120,15 +120,17 @@ pages:
   script:
     - mv doc/api/ ./home/api
     - mv doc-public ./home/doc
+    - mv doc/license ./home/license
     - mv home public
   dependencies:
     - build_api_doc
     - build_doc
+    - license_scanning
   artifacts:
     paths:
       - public
   only:
-    - main
+#    - main
 
 include:
   - template: Security/License-Scanning.gitlab-ci.yml
@@ -139,4 +141,7 @@ license_scanning:
     name: "registry.gitlab.com/gitlab-org/security-products/analyzers/ort/ort:latest"
   script:
     - /opt/ort/bin/ort analyze -i $CI_PROJECT_DIR -o $CI_PROJECT_DIR/ --allow-dynamic-versions
-    - /opt/ort/bin/ort report -f GitLabLicenseModel -i $CI_PROJECT_DIR/analyzer-result.yml -o $CI_PROJECT_DIR/
+    - /opt/ort/bin/ort report -f StaticHtml -i $CI_PROJECT_DIR/analyzer-result.yml -o doc/license
+  artifacts:
+    paths:
+      - doc/license

From ef76149c4179ff1f340ad4593747b55ffec5a648 Mon Sep 17 00:00:00 2001
From: Niklas Zender <n.zender@famedly.com>
Date: Wed, 14 Oct 2020 10:08:39 +0000
Subject: [PATCH 06/17] Add Scan stage

---
 .gitlab-ci.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3916fce..55d744d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -141,7 +141,8 @@ license_scanning:
     name: "registry.gitlab.com/gitlab-org/security-products/analyzers/ort/ort:latest"
   script:
     - /opt/ort/bin/ort analyze -i $CI_PROJECT_DIR -o $CI_PROJECT_DIR/ --allow-dynamic-versions
-    - /opt/ort/bin/ort report -f StaticHtml -i $CI_PROJECT_DIR/analyzer-result.yml -o doc/license
+    - /opt/ort/bin/ort scan -i $CI_PROJECT_DIR/analyzer-result.yml -o $CI_PROJECT_DIR/ --skip-excluded
+    - /opt/ort/bin/ort report -f GitLabLicenseModel,StaticHtml -i $CI_PROJECT_DIR/scan-result.yml -o $CI_PROJECT_DIR/
   artifacts:
     paths:
       - doc/license

From ee7567e4f6ba3f5485f8c4582a7f5f15141409aa Mon Sep 17 00:00:00 2001
From: Niklas Zender <n.zender@famedly.com>
Date: Wed, 14 Oct 2020 10:44:52 +0000
Subject: [PATCH 07/17] Remove Gitlab

---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 55d744d..cfef573 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -141,8 +141,8 @@ license_scanning:
     name: "registry.gitlab.com/gitlab-org/security-products/analyzers/ort/ort:latest"
   script:
     - /opt/ort/bin/ort analyze -i $CI_PROJECT_DIR -o $CI_PROJECT_DIR/ --allow-dynamic-versions
-    - /opt/ort/bin/ort scan -i $CI_PROJECT_DIR/analyzer-result.yml -o $CI_PROJECT_DIR/ --skip-excluded
-    - /opt/ort/bin/ort report -f GitLabLicenseModel,StaticHtml -i $CI_PROJECT_DIR/scan-result.yml -o $CI_PROJECT_DIR/
+    - /opt/ort/bin/ort scan -i $CI_PROJECT_DIR/analyzer-result.yml -o $CI_PROJECT_DIR/
+    - /opt/ort/bin/ort report -f StaticHtml -i $CI_PROJECT_DIR/scan-result.yml -o doc/license
   artifacts:
     paths:
       - doc/license

From 971991567d4e9c87028c288eb4e638423dc7979c Mon Sep 17 00:00:00 2001
From: Niklas Zender <n.zender@famedly.com>
Date: Wed, 14 Oct 2020 10:57:06 +0000
Subject: [PATCH 08/17] Always artifacts

---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cfef573..748e7b1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -144,5 +144,6 @@ license_scanning:
     - /opt/ort/bin/ort scan -i $CI_PROJECT_DIR/analyzer-result.yml -o $CI_PROJECT_DIR/
     - /opt/ort/bin/ort report -f StaticHtml -i $CI_PROJECT_DIR/scan-result.yml -o doc/license
   artifacts:
+    when: always
     paths:
       - doc/license

From 8fc7e6bfacf5c5610dadd4df0f996f5f9e7f7f06 Mon Sep 17 00:00:00 2001
From: Niklas Zender <n.zender@famedly.com>
Date: Wed, 14 Oct 2020 11:17:54 +0000
Subject: [PATCH 09/17] disable report job

---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 748e7b1..6c0b910 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -141,8 +141,8 @@ license_scanning:
     name: "registry.gitlab.com/gitlab-org/security-products/analyzers/ort/ort:latest"
   script:
     - /opt/ort/bin/ort analyze -i $CI_PROJECT_DIR -o $CI_PROJECT_DIR/ --allow-dynamic-versions
-    - /opt/ort/bin/ort scan -i $CI_PROJECT_DIR/analyzer-result.yml -o $CI_PROJECT_DIR/
-    - /opt/ort/bin/ort report -f StaticHtml -i $CI_PROJECT_DIR/scan-result.yml -o doc/license
+    - /opt/ort/bin/ort scan -i $CI_PROJECT_DIR/analyzer-result.yml -o doc/license
+#    - /opt/ort/bin/ort report -f StaticHtml -i $CI_PROJECT_DIR/scan-result.yml -o doc/license
   artifacts:
     when: always
     paths:

From b41a385d0969bc71c756f411aabe916f44fc6aac Mon Sep 17 00:00:00 2001
From: Niklas Zender <n.zender@famedly.com>
Date: Wed, 14 Oct 2020 11:43:43 +0000
Subject: [PATCH 10/17] Add evaluate step

---
 .gitlab-ci.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6c0b910..62a26a6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -141,8 +141,9 @@ license_scanning:
     name: "registry.gitlab.com/gitlab-org/security-products/analyzers/ort/ort:latest"
   script:
     - /opt/ort/bin/ort analyze -i $CI_PROJECT_DIR -o $CI_PROJECT_DIR/ --allow-dynamic-versions
-    - /opt/ort/bin/ort scan -i $CI_PROJECT_DIR/analyzer-result.yml -o doc/license
-#    - /opt/ort/bin/ort report -f StaticHtml -i $CI_PROJECT_DIR/scan-result.yml -o doc/license
+    - /opt/ort/bin/ort scan -i $CI_PROJECT_DIR/analyzer-result.yml -o $CI_PROJECT_DIR/
+    - /opt/ort/bin/ort evaluate -i $CI_PROJECT_DIR/scan-result.yml -o $CI_PROJECT_DIR/   
+    - /opt/ort/bin/ort report -f StaticHtml -i $CI_PROJECT_DIR/evaluation-result.yml -o doc/license
   artifacts:
     when: always
     paths:

From 6f237f1f8a23b1f13f16c56034f24541a2c39ffe Mon Sep 17 00:00:00 2001
From: Niklas Zender <n.zender@famedly.com>
Date: Wed, 14 Oct 2020 12:09:57 +0000
Subject: [PATCH 11/17] Force to not fail

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 62a26a6..e48c449 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -141,7 +141,7 @@ license_scanning:
     name: "registry.gitlab.com/gitlab-org/security-products/analyzers/ort/ort:latest"
   script:
     - /opt/ort/bin/ort analyze -i $CI_PROJECT_DIR -o $CI_PROJECT_DIR/ --allow-dynamic-versions
-    - /opt/ort/bin/ort scan -i $CI_PROJECT_DIR/analyzer-result.yml -o $CI_PROJECT_DIR/
+    - /opt/ort/bin/ort scan || true -i $CI_PROJECT_DIR/analyzer-result.yml -o $CI_PROJECT_DIR/
     - /opt/ort/bin/ort evaluate -i $CI_PROJECT_DIR/scan-result.yml -o $CI_PROJECT_DIR/   
     - /opt/ort/bin/ort report -f StaticHtml -i $CI_PROJECT_DIR/evaluation-result.yml -o doc/license
   artifacts:

From 88d507a6568cb8346de2a77fabcd24fe999f2252 Mon Sep 17 00:00:00 2001
From: Niklas Zender <n.zender@famedly.com>
Date: Wed, 14 Oct 2020 12:13:09 +0000
Subject: [PATCH 12/17] Put true somewhere else

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e48c449..b013804 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -141,7 +141,7 @@ license_scanning:
     name: "registry.gitlab.com/gitlab-org/security-products/analyzers/ort/ort:latest"
   script:
     - /opt/ort/bin/ort analyze -i $CI_PROJECT_DIR -o $CI_PROJECT_DIR/ --allow-dynamic-versions
-    - /opt/ort/bin/ort scan || true -i $CI_PROJECT_DIR/analyzer-result.yml -o $CI_PROJECT_DIR/
+    - /opt/ort/bin/ort scan -i $CI_PROJECT_DIR/analyzer-result.yml -o $CI_PROJECT_DIR/ || true
     - /opt/ort/bin/ort evaluate -i $CI_PROJECT_DIR/scan-result.yml -o $CI_PROJECT_DIR/   
     - /opt/ort/bin/ort report -f StaticHtml -i $CI_PROJECT_DIR/evaluation-result.yml -o doc/license
   artifacts:

From a9d889232dfc91b7633b33dd9fe883c440707cf2 Mon Sep 17 00:00:00 2001
From: Niklas Zender <n.zender@famedly.com>
Date: Wed, 14 Oct 2020 12:29:24 +0000
Subject: [PATCH 13/17] Disable evaluation

---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b013804..f0265d1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -142,8 +142,8 @@ license_scanning:
   script:
     - /opt/ort/bin/ort analyze -i $CI_PROJECT_DIR -o $CI_PROJECT_DIR/ --allow-dynamic-versions
     - /opt/ort/bin/ort scan -i $CI_PROJECT_DIR/analyzer-result.yml -o $CI_PROJECT_DIR/ || true
-    - /opt/ort/bin/ort evaluate -i $CI_PROJECT_DIR/scan-result.yml -o $CI_PROJECT_DIR/   
-    - /opt/ort/bin/ort report -f StaticHtml -i $CI_PROJECT_DIR/evaluation-result.yml -o doc/license
+#    - /opt/ort/bin/ort evaluate -i $CI_PROJECT_DIR/scan-result.yml -o $CI_PROJECT_DIR/   
+    - /opt/ort/bin/ort report -f StaticHtml -i $CI_PROJECT_DIR/scan-result.yml -o doc/license
   artifacts:
     when: always
     paths:

From 89176e434735472239485d678d8bdf15a8c961be Mon Sep 17 00:00:00 2001
From: Niklas Zender <n.zender@famedly.com>
Date: Wed, 14 Oct 2020 12:47:32 +0000
Subject: [PATCH 14/17] Activate Gitlab License Tooling

---
 .gitlab-ci.yml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f0265d1..4b632a6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -142,9 +142,4 @@ license_scanning:
   script:
     - /opt/ort/bin/ort analyze -i $CI_PROJECT_DIR -o $CI_PROJECT_DIR/ --allow-dynamic-versions
     - /opt/ort/bin/ort scan -i $CI_PROJECT_DIR/analyzer-result.yml -o $CI_PROJECT_DIR/ || true
-#    - /opt/ort/bin/ort evaluate -i $CI_PROJECT_DIR/scan-result.yml -o $CI_PROJECT_DIR/   
-    - /opt/ort/bin/ort report -f StaticHtml -i $CI_PROJECT_DIR/scan-result.yml -o doc/license
-  artifacts:
-    when: always
-    paths:
-      - doc/license
+    - /opt/ort/bin/ort report -f GitLabLicenseModel -i $CI_PROJECT_DIR/scan-result.yml -o $CI_PROJECT_DIR/

From 8f65a83224369e6153fda61274982e571442cba9 Mon Sep 17 00:00:00 2001
From: Niklas Zender <n.zender@famedly.com>
Date: Wed, 14 Oct 2020 13:24:20 +0000
Subject: [PATCH 15/17] Cleanup

---
 .gitlab-ci.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4b632a6..fcadc8a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -95,7 +95,7 @@ build_api_doc:
     paths:
       - doc/api/
   only:
-#    - main
+    - main
 
 build_doc:
   tags:
@@ -110,7 +110,7 @@ build_doc:
     paths:
       - doc-public
   only:
-#    - main
+    - main
 
 pages:
   tags:
@@ -120,17 +120,15 @@ pages:
   script:
     - mv doc/api/ ./home/api
     - mv doc-public ./home/doc
-    - mv doc/license ./home/license
     - mv home public
   dependencies:
     - build_api_doc
     - build_doc
-    - license_scanning
   artifacts:
     paths:
       - public
   only:
-#    - main
+    - main
 
 include:
   - template: Security/License-Scanning.gitlab-ci.yml
@@ -143,3 +141,5 @@ license_scanning:
     - /opt/ort/bin/ort analyze -i $CI_PROJECT_DIR -o $CI_PROJECT_DIR/ --allow-dynamic-versions
     - /opt/ort/bin/ort scan -i $CI_PROJECT_DIR/analyzer-result.yml -o $CI_PROJECT_DIR/ || true
     - /opt/ort/bin/ort report -f GitLabLicenseModel -i $CI_PROJECT_DIR/scan-result.yml -o $CI_PROJECT_DIR/
+  only:
+    - main

From 37c60cdc26f30136887064f0ce82e8d8e62a68de Mon Sep 17 00:00:00 2001
From: Niklas Zender <n.zender@famedly.com>
Date: Wed, 14 Oct 2020 13:26:38 +0000
Subject: [PATCH 16/17] Cleanup

---
 .gitlab-ci.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fcadc8a..99bd412 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -130,6 +130,9 @@ pages:
   only:
     - main
 
+# Adds license-scanning job. Because Gitlab does not support pub.dev
+# we added https://github.com/oss-review-toolkit/ort
+
 include:
   - template: Security/License-Scanning.gitlab-ci.yml
 

From 2fac61f59bd3486713a7a28300c45991b74fc0e3 Mon Sep 17 00:00:00 2001
From: Niklas Zender <n.zender@famedly.com>
Date: Wed, 14 Oct 2020 13:30:52 +0000
Subject: [PATCH 17/17] Fix: Pipeline

---
 .gitlab-ci.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 99bd412..6154c0f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -144,5 +144,3 @@ license_scanning:
     - /opt/ort/bin/ort analyze -i $CI_PROJECT_DIR -o $CI_PROJECT_DIR/ --allow-dynamic-versions
     - /opt/ort/bin/ort scan -i $CI_PROJECT_DIR/analyzer-result.yml -o $CI_PROJECT_DIR/ || true
     - /opt/ort/bin/ort report -f GitLabLicenseModel -i $CI_PROJECT_DIR/scan-result.yml -o $CI_PROJECT_DIR/
-  only:
-    - main