From f3310ff1035a159d8abb736bfa10626a7f5abe19 Mon Sep 17 00:00:00 2001
From: Filip Filmar <fmil@google.com>
Date: Wed, 9 Feb 2022 17:07:30 -0800
Subject: [PATCH] Manual roll of ICU (flutter/engine#31132)

* [licenses] Updates ICU license regexp and URL

New file in the ICU library use the https scheme for the URL
instead of prior http to declare the license, leading to
the 'unmatched potential copyright' message.

This change removes the issue.

* [icu] Upgrades the ICU library version in use

This change brings in ICU 70.1 which is the latest and greatest of ICU releases.
It sync up with the latest ICU milestone in use in Chromium.

Issue: #flutter/97412
---
 DEPS                                                 | 2 +-
 engine/src/flutter/ci/licenses_golden/tool_signature | 2 +-
 engine/src/flutter/tools/licenses/lib/licenses.dart  | 1 +
 engine/src/flutter/tools/licenses/lib/patterns.dart  | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/DEPS b/DEPS
index d137d06a5b..bed8eb15d0 100644
--- a/DEPS
+++ b/DEPS
@@ -155,7 +155,7 @@ deps = {
    # Chromium-style dependencies.
 
   'src/third_party/icu':
-   Var('chromium_git') + '/chromium/deps/icu.git' + '@' + '2b50fa94b07b601293d7c1f791e853bba8ffbb84',
+   Var('chromium_git') + '/chromium/deps/icu.git' + '@' + '2e0f2989441ec2f55abec30f48e89981dbac2c34',
 
   'src/third_party/khronos':
    Var('chromium_git') + '/chromium/src/third_party/khronos.git' + '@' + '7122230e90547962e0f0c627f62eeed3c701f275',
diff --git a/engine/src/flutter/ci/licenses_golden/tool_signature b/engine/src/flutter/ci/licenses_golden/tool_signature
index 5d687d86c1..bf58388216 100644
--- a/engine/src/flutter/ci/licenses_golden/tool_signature
+++ b/engine/src/flutter/ci/licenses_golden/tool_signature
@@ -1,2 +1,2 @@
-Signature: c42608d945a7c27e30c484ea93636956
+Signature: fd70aa1b20bfff1d7147a26138a14a9f
 
diff --git a/engine/src/flutter/tools/licenses/lib/licenses.dart b/engine/src/flutter/tools/licenses/lib/licenses.dart
index a678630e53..2faabcc8ef 100644
--- a/engine/src/flutter/tools/licenses/lib/licenses.dart
+++ b/engine/src/flutter/tools/licenses/lib/licenses.dart
@@ -307,6 +307,7 @@ abstract class License implements Comparable<License> {
         body = system.File('data/mit').readAsStringSync();
         type = LicenseType.mit;
         break;
+      case 'https://www.unicode.org/copyright.html':
       case 'http://www.unicode.org/copyright.html':
         body = system.File('data/unicode').readAsStringSync();
         type = LicenseType.icu;
diff --git a/engine/src/flutter/tools/licenses/lib/patterns.dart b/engine/src/flutter/tools/licenses/lib/patterns.dart
index 805c18e4c9..beeb4a8eac 100644
--- a/engine/src/flutter/tools/licenses/lib/patterns.dart
+++ b/engine/src/flutter/tools/licenses/lib/patterns.dart
@@ -1156,7 +1156,7 @@ final List<MultipleVersionedLicenseReferencePattern> csReferencesByUrl = <Multip
     pattern: RegExp(
       kIndent +
       r'(?:©|Copyright (©|\(C\))) 20.. and later: Unicode, Inc. and others.[ *]*\n'
-      r'^\1\2License & terms of use: (http://www.unicode.org/copyright.html)',
+      r'^\1\2License & terms of use: (https?://www.unicode.org/copyright.html)',
       multiLine: true,
       caseSensitive: false,
     )