Upgrade pana

dart-lang · Jul 10, 2023 · 6204b90 · 6204b90
1 parent 2fbebbc
commit 6204b90
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 68 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,8 @@ Important changes to data models, configuration, and migrations between each
 AppEngine version, listed here to ease deployment and troubleshooting.
 
 ## Next Release (replace with git tag when deployed)
- * Disable sandboxed output for sandboxed screenshots and dartdoc
+ * Bumped runtimeVersion to `2023.07.10`.
+ * Upgraded pana to `0.21.35`.
 
 ## `20230709t025700-all`
  * Disable sandboxed output for sandboxed screenshots and dartdoc

diff --git a/app/lib/shared/tool_env.dart b/app/lib/shared/tool_env.dart
@@ -108,8 +108,6 @@ Future<_ToolEnvRef> _createToolEnvRef() async {
       'CI': 'true',
       'PUB_HOSTED_URL': 'https://pub.dartlang.org',
     },
-    futureDartSdkDir: activeConfiguration.tools?.stableDartSdkPath,
-    futureFlutterSdkDir: activeConfiguration.tools?.stableFlutterSdkPath,
   );
   final previewToolEnv = await ToolEnvironment.create(
     dartSdkDir: activeConfiguration.tools?.previewDartSdkPath,
@@ -119,8 +117,6 @@ Future<_ToolEnvRef> _createToolEnvRef() async {
       'CI': 'true',
       'PUB_HOSTED_URL': 'https://pub.dartlang.org',
     },
-    futureDartSdkDir: activeConfiguration.tools?.previewDartSdkPath,
-    futureFlutterSdkDir: activeConfiguration.tools?.previewFlutterSdkPath,
   );
   return _ToolEnvRef(cacheDir, stableToolEnv, previewToolEnv);
 }

diff --git a/app/lib/shared/versions.dart b/app/lib/shared/versions.dart
@@ -22,8 +22,9 @@ final RegExp runtimeVersionPattern = RegExp(r'^\d{4}\.\d{2}\.\d{2}$');
 /// when the version switch happens.
 const acceptedRuntimeVersions = <String>[
   // The current [runtimeVersion].
-  '2023.07.06',
+  '2023.07.10',
   // Fallback runtime versions.
+  '2023.07.06',
   // NOTE: 2 previous runtimeVersions are disabled, enable as 2023.07.06 ages
   // TODO: Update gcBeforeRuntimeVersion later
 ];

diff --git a/app/pubspec.lock b/app/pubspec.lock
@@ -544,10 +544,10 @@ packages:
     dependency: "direct main"
     description:
       name: pana
-      sha256: a9c03df79c6dde15848efbfb49b07065c30cc13e828e517c2a36eb83d4cffc41
+      sha256: ef2fc23bba7e4c6a9537accfcceb301124586d8c05973a11cd258a2270deb74f
       url: "https://pub.dev"
     source: hosted
-    version: "0.21.33"
+    version: "0.21.35"
   path:
     dependency: "direct main"
     description:

diff --git a/app/pubspec.yaml b/app/pubspec.yaml
@@ -53,7 +53,7 @@ dependencies:
   watcher: ^1.0.0
   yaml: '^3.0.0'
   # pana version to be pinned
-  pana: '0.21.33'
+  pana: '0.21.35'
   # 3rd-party packages with pinned versions
   mailer: '6.0.1'
   ulid: '2.0.0'

diff --git a/app/test/task/testdata/goldens/packages/oxygen/score.html b/app/test/task/testdata/goldens/packages/oxygen/score.html
@@ -442,9 +442,9 @@ <h3>
                         </div>
                         <div class="pkg-report-header-title">Pass static analysis</div>
                         <div class="pkg-report-header-score">
-                          <span class="pkg-report-header-score-granted">30</span>
+                          <span class="pkg-report-header-score-granted">50</span>
                           /
-                          <span class="pkg-report-header-score-max">30</span>
+                          <span class="pkg-report-header-score-max">50</span>
                           <img class="foldable-icon" src="/static/hash-%%etag%%/img/report-foldable-icon.svg" alt="icon to trigger folding of the section" width="13" height="6"/>
                         </div>
                       </div>
@@ -453,7 +453,7 @@ <h3>
                           <div class="pkg-report-content-summary markdown-body">
                             <h3>
                               <img class="report-summary-icon" src="/static/hash-%%etag%%/img/report-ok-icon-green.svg"/>
-                              30/30 points: code has no errors, warnings, lints, or formatting issues
+                              50/50 points: code has no errors, warnings, lints, or formatting issues
                             </h3>
                           </div>
                         </div>
@@ -493,30 +493,6 @@ <h3>
                         </div>
                       </div>
                     </div>
-                    <div class="pkg-report-section foldable">
-                      <div class="pkg-report-header foldable-button" data-ga-click-event="toggle-report-section-dart3-compatibility">
-                        <div class="pkg-report-header-icon">
-                          <img class="pkg-report-icon" src="/static/hash-%%etag%%/img/report-ok-icon-green.svg" alt="icon indicating section status" width="18" height="18"/>
-                        </div>
-                        <div class="pkg-report-header-title">Dart 3 compatibility</div>
-                        <div class="pkg-report-header-score">
-                          <span class="pkg-report-header-score-granted">20</span>
-                          /
-                          <span class="pkg-report-header-score-max">20</span>
-                          <img class="foldable-icon" src="/static/hash-%%etag%%/img/report-foldable-icon.svg" alt="icon to trigger folding of the section" width="13" height="6"/>
-                        </div>
-                      </div>
-                      <div class="foldable-content">
-                        <div class="pkg-report-content">
-                          <div class="pkg-report-content-summary markdown-body">
-                            <h3>
-                              <img class="report-summary-icon" src="/static/hash-%%etag%%/img/report-ok-icon-green.svg"/>
-                              20/20 points: Package is Dart 3 compatible!
-                            </h3>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
                   </div>
                   <p class="tool-env-info">
                     Analysed with Pana

diff --git a/app/test/task/testdata/goldens/packages/oxygen/versions/1.0.0/score.html b/app/test/task/testdata/goldens/packages/oxygen/versions/1.0.0/score.html
@@ -446,9 +446,9 @@ <h3>
                         </div>
                         <div class="pkg-report-header-title">Pass static analysis</div>
                         <div class="pkg-report-header-score">
-                          <span class="pkg-report-header-score-granted">30</span>
+                          <span class="pkg-report-header-score-granted">50</span>
                           /
-                          <span class="pkg-report-header-score-max">30</span>
+                          <span class="pkg-report-header-score-max">50</span>
                           <img class="foldable-icon" src="/static/hash-%%etag%%/img/report-foldable-icon.svg" alt="icon to trigger folding of the section" width="13" height="6"/>
                         </div>
                       </div>
@@ -457,7 +457,7 @@ <h3>
                           <div class="pkg-report-content-summary markdown-body">
                             <h3>
                               <img class="report-summary-icon" src="/static/hash-%%etag%%/img/report-ok-icon-green.svg"/>
-                              30/30 points: code has no errors, warnings, lints, or formatting issues
+                              50/50 points: code has no errors, warnings, lints, or formatting issues
                             </h3>
                           </div>
                         </div>
@@ -497,30 +497,6 @@ <h3>
                         </div>
                       </div>
                     </div>
-                    <div class="pkg-report-section foldable">
-                      <div class="pkg-report-header foldable-button" data-ga-click-event="toggle-report-section-dart3-compatibility">
-                        <div class="pkg-report-header-icon">
-                          <img class="pkg-report-icon" src="/static/hash-%%etag%%/img/report-ok-icon-green.svg" alt="icon indicating section status" width="18" height="18"/>
-                        </div>
-                        <div class="pkg-report-header-title">Dart 3 compatibility</div>
-                        <div class="pkg-report-header-score">
-                          <span class="pkg-report-header-score-granted">20</span>
-                          /
-                          <span class="pkg-report-header-score-max">20</span>
-                          <img class="foldable-icon" src="/static/hash-%%etag%%/img/report-foldable-icon.svg" alt="icon to trigger folding of the section" width="13" height="6"/>
-                        </div>
-                      </div>
-                      <div class="foldable-content">
-                        <div class="pkg-report-content">
-                          <div class="pkg-report-content-summary markdown-body">
-                            <h3>
-                              <img class="report-summary-icon" src="/static/hash-%%etag%%/img/report-ok-icon-green.svg"/>
-                              20/20 points: Package is Dart 3 compatible!
-                            </h3>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
                   </div>
                   <p class="tool-env-info">
                     Analysed with Pana

diff --git a/pkg/pub_worker/lib/src/bin/pana_wrapper.dart b/pkg/pub_worker/lib/src/bin/pana_wrapper.dart
@@ -89,8 +89,6 @@ Future<void> main(List<String> args) async {
   final toolEnv = await ToolEnvironment.create(
     dartSdkDir: dartSdk?.path,
     flutterSdkDir: flutterSdk?.path,
-    futureDartSdkDir: InstalledSdk.futureSdk(dartSdks)?.path,
-    futureFlutterSdkDir: InstalledSdk.futureSdk(flutterSdks)?.path,
     pubCacheDir: pubCache,
     panaCacheDir: Platform.environment['PANA_CACHE'],
     environment: {'CI': 'true'},

diff --git a/pkg/pub_worker/pubspec.lock b/pkg/pub_worker/pubspec.lock
@@ -402,10 +402,10 @@ packages:
     dependency: "direct main"
     description:
       name: pana
-      sha256: a9c03df79c6dde15848efbfb49b07065c30cc13e828e517c2a36eb83d4cffc41
+      sha256: ef2fc23bba7e4c6a9537accfcceb301124586d8c05973a11cd258a2270deb74f
       url: "https://pub.dev"
     source: hosted
-    version: "0.21.33"
+    version: "0.21.35"
   path:
     dependency: transitive
     description:

diff --git a/pkg/pub_worker/pubspec.yaml b/pkg/pub_worker/pubspec.yaml
@@ -8,7 +8,7 @@ environment:
 dependencies:
   json_annotation: ^4.3.0
   jsontool: ^1.1.0
-  pana: ^0.21.33
+  pana: ^0.21.35
   lints: ^2.0.0 # required for pana
   meta: ^1.7.0
   api_builder: