update lints and sdk deps (#623)

google · May 29, 2024 · 0a8120f · 0a8120f
1 parent 0c28d45
commit 0a8120f
Show file tree

Hide file tree

Showing 27 changed files with 142 additions and 152 deletions.
diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml
@@ -40,23 +40,23 @@ jobs:
       - name: mono_repo self validate
         run: dart pub global run mono_repo generate --validate
   job_002:
-    name: "analyze_and_format; Dart 3.0.0; PKGS: _test, _test_package, discoveryapis_commons, discoveryapis_generator, generated/googleapis, generated/googleapis_beta, generator; `dart analyze`"
+    name: "analyze_and_format; Dart 3.4.0; PKGS: _test, _test_package, discoveryapis_commons, discoveryapis_generator, generated/googleapis, generated/googleapis_beta, generator, googleapis_auth, test_integration; `dart analyze`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0;packages:_test-_test_package-discoveryapis_commons-discoveryapis_generator-generated/googleapis-generated/googleapis_beta-generator;commands:analyze_1"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:_test-_test_package-discoveryapis_commons-discoveryapis_generator-generated/googleapis-generated/googleapis_beta-generator-googleapis_auth-test_integration;commands:analyze_1"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0;packages:_test-_test_package-discoveryapis_commons-discoveryapis_generator-generated/googleapis-generated/googleapis_beta-generator
-            os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0
+            os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:_test-_test_package-discoveryapis_commons-discoveryapis_generator-generated/googleapis-generated/googleapis_beta-generator-googleapis_auth-test_integration
+            os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
       - name: Setup Dart SDK
         uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30
         with:
-          sdk: "3.0.0"
+          sdk: "3.4.0"
       - id: checkout
         name: Checkout repository
         uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b
@@ -123,27 +123,6 @@ jobs:
         run: dart analyze
         if: "always() && steps.generator_pub_upgrade.conclusion == 'success'"
         working-directory: generator
-  job_003:
-    name: "analyze_and_format; Dart 3.2.0; PKGS: googleapis_auth, test_integration; `dart analyze`"
-    runs-on: ubuntu-latest
-    steps:
-      - name: Cache Pub hosted dependencies
-        uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9
-        with:
-          path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0;packages:googleapis_auth-test_integration;commands:analyze_1"
-          restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0;packages:googleapis_auth-test_integration
-            os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0
-            os:ubuntu-latest;pub-cache-hosted
-            os:ubuntu-latest
-      - name: Setup Dart SDK
-        uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30
-        with:
-          sdk: "3.2.0"
-      - id: checkout
-        name: Checkout repository
-        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b
       - id: googleapis_auth_pub_upgrade
         name: googleapis_auth; dart pub upgrade
         run: dart pub upgrade
@@ -162,7 +141,7 @@ jobs:
         run: dart analyze
         if: "always() && steps.test_integration_pub_upgrade.conclusion == 'success'"
         working-directory: test_integration
-  job_004:
+  job_003:
     name: "analyze_and_format; Dart dev; PKGS: _test, _test_package, discoveryapis_commons, discoveryapis_generator, generated/googleapis, generated/googleapis_beta, generator, googleapis_auth, test_integration; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos .`"
     runs-on: ubuntu-latest
     steps:
@@ -300,24 +279,24 @@ jobs:
         run: dart analyze --fatal-infos .
         if: "always() && steps.test_integration_pub_upgrade.conclusion == 'success'"
         working-directory: test_integration
-  job_005:
-    name: "unittest; Dart 3.0.0; PKG: _test_package; `dart test`"
+  job_004:
+    name: "unittest; Dart 3.4.0; PKG: _test_package; `dart test`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0;packages:_test_package;commands:test_0"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:_test_package;commands:test_0"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0;packages:_test_package
-            os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0
+            os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:_test_package
+            os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
       - name: Setup Dart SDK
         uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30
         with:
-          sdk: "3.0.0"
+          sdk: "3.4.0"
       - id: checkout
         name: Checkout repository
         uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b
@@ -334,25 +313,24 @@ jobs:
       - job_001
       - job_002
       - job_003
-      - job_004
-  job_006:
-    name: "unittest; Dart 3.0.0; PKG: discoveryapis_commons; `dart test`"
+  job_005:
+    name: "unittest; Dart 3.4.0; PKG: discoveryapis_commons; `dart test`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0;packages:discoveryapis_commons;commands:test_0"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:discoveryapis_commons;commands:test_0"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0;packages:discoveryapis_commons
-            os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0
+            os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:discoveryapis_commons
+            os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
       - name: Setup Dart SDK
         uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30
         with:
-          sdk: "3.0.0"
+          sdk: "3.4.0"
       - id: checkout
         name: Checkout repository
         uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b
@@ -369,25 +347,24 @@ jobs:
       - job_001
       - job_002
       - job_003
-      - job_004
-  job_007:
-    name: "unittest; Dart 3.0.0; PKG: discoveryapis_generator; `dart test`"
+  job_006:
+    name: "unittest; Dart 3.4.0; PKG: discoveryapis_generator; `dart test`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0;packages:discoveryapis_generator;commands:test_0"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:discoveryapis_generator;commands:test_0"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0;packages:discoveryapis_generator
-            os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0
+            os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:discoveryapis_generator
+            os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
       - name: Setup Dart SDK
         uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30
         with:
-          sdk: "3.0.0"
+          sdk: "3.4.0"
       - id: checkout
         name: Checkout repository
         uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b
@@ -404,25 +381,24 @@ jobs:
       - job_001
       - job_002
       - job_003
-      - job_004
-  job_008:
-    name: "unittest; Dart 3.0.0; PKG: generated/googleapis; `dart test`"
+  job_007:
+    name: "unittest; Dart 3.4.0; PKG: generated/googleapis; `dart test`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0;packages:generated/googleapis;commands:test_0"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:generated/googleapis;commands:test_0"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0;packages:generated/googleapis
-            os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0
+            os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:generated/googleapis
+            os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
       - name: Setup Dart SDK
         uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30
         with:
-          sdk: "3.0.0"
+          sdk: "3.4.0"
       - id: checkout
         name: Checkout repository
         uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b
@@ -439,25 +415,24 @@ jobs:
       - job_001
       - job_002
       - job_003
-      - job_004
-  job_009:
-    name: "unittest; Dart 3.0.0; PKG: generated/googleapis_beta; `dart test`"
+  job_008:
+    name: "unittest; Dart 3.4.0; PKG: generated/googleapis_beta; `dart test`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0;packages:generated/googleapis_beta;commands:test_0"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:generated/googleapis_beta;commands:test_0"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0;packages:generated/googleapis_beta
-            os:ubuntu-latest;pub-cache-hosted;sdk:3.0.0
+            os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:generated/googleapis_beta
+            os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
       - name: Setup Dart SDK
         uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30
         with:
-          sdk: "3.0.0"
+          sdk: "3.4.0"
       - id: checkout
         name: Checkout repository
         uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b
@@ -474,25 +449,24 @@ jobs:
       - job_001
       - job_002
       - job_003
-      - job_004
-  job_010:
-    name: "unittest; Dart 3.2.0; PKG: googleapis_auth; `dart test -p chrome`"
+  job_009:
+    name: "unittest; Dart 3.4.0; PKG: googleapis_auth; `dart test -p chrome`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0;packages:googleapis_auth;commands:test_2"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:googleapis_auth;commands:test_2"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0;packages:googleapis_auth
-            os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0
+            os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:googleapis_auth
+            os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
       - name: Setup Dart SDK
         uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30
         with:
-          sdk: "3.2.0"
+          sdk: "3.4.0"
       - id: checkout
         name: Checkout repository
         uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b
@@ -509,25 +483,24 @@ jobs:
       - job_001
       - job_002
       - job_003
-      - job_004
-  job_011:
-    name: "unittest; Dart 3.2.0; PKG: googleapis_auth; `dart test -p vm`"
+  job_010:
+    name: "unittest; Dart 3.4.0; PKG: googleapis_auth; `dart test -p vm`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0;packages:googleapis_auth;commands:test_1"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:googleapis_auth;commands:test_1"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0;packages:googleapis_auth
-            os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0
+            os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:googleapis_auth
+            os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
       - name: Setup Dart SDK
         uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30
         with:
-          sdk: "3.2.0"
+          sdk: "3.4.0"
       - id: checkout
         name: Checkout repository
         uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b
@@ -544,8 +517,7 @@ jobs:
       - job_001
       - job_002
       - job_003
-      - job_004
-  job_012:
+  job_011:
     name: "unittest; Dart dev; PKG: _test_package; `dart test`"
     runs-on: ubuntu-latest
     steps:
@@ -579,8 +551,7 @@ jobs:
       - job_001
       - job_002
       - job_003
-      - job_004
-  job_013:
+  job_012:
     name: "unittest; Dart dev; PKG: discoveryapis_commons; `dart test`"
     runs-on: ubuntu-latest
     steps:
@@ -614,8 +585,7 @@ jobs:
       - job_001
       - job_002
       - job_003
-      - job_004
-  job_014:
+  job_013:
     name: "unittest; Dart dev; PKG: discoveryapis_generator; `dart test`"
     runs-on: ubuntu-latest
     steps:
@@ -649,8 +619,7 @@ jobs:
       - job_001
       - job_002
       - job_003
-      - job_004
-  job_015:
+  job_014:
     name: "unittest; Dart dev; PKG: generated/googleapis; `dart test`"
     runs-on: ubuntu-latest
     steps:
@@ -684,8 +653,7 @@ jobs:
       - job_001
       - job_002
       - job_003
-      - job_004
-  job_016:
+  job_015:
     name: "unittest; Dart dev; PKG: generated/googleapis_beta; `dart test`"
     runs-on: ubuntu-latest
     steps:
@@ -719,8 +687,7 @@ jobs:
       - job_001
       - job_002
       - job_003
-      - job_004
-  job_017:
+  job_016:
     name: "unittest; Dart dev; PKG: googleapis_auth; `dart test -p chrome`"
     runs-on: ubuntu-latest
     steps:
@@ -754,8 +721,7 @@ jobs:
       - job_001
       - job_002
       - job_003
-      - job_004
-  job_018:
+  job_017:
     name: "unittest; Dart dev; PKG: googleapis_auth; `dart test -p vm`"
     runs-on: ubuntu-latest
     steps:
@@ -789,4 +755,3 @@ jobs:
       - job_001
       - job_002
       - job_003
-      - job_004
diff --git a/_test/pubspec.yaml b/_test/pubspec.yaml
@@ -2,14 +2,14 @@ name: file_test_package
 description: Pubspec used for unittesting of the discoveryapis_generator package.
 publish_to: none
 environment:
-  sdk: ^3.0.0
+  sdk: ^3.4.0
 
 dependencies:
   _discoveryapis_commons: ^1.0.0
   http: any
 
 dev_dependencies:
-  dart_flutter_team_lints: ^2.0.0
+  dart_flutter_team_lints: ^3.0.0
 
 dependency_overrides:
   _discoveryapis_commons:

diff --git a/_test_package/pubspec.yaml b/_test_package/pubspec.yaml
@@ -2,10 +2,10 @@ name: test_package
 publish_to: none
 description: Auto-generated client libraries.
 environment:
-  sdk: '^3.0.0'
+  sdk: '^3.4.0'
 dependencies:
   # This is a private package dependency used by the generated client stubs.
   _discoveryapis_commons: ^1.0.0
-  http: ">=0.13.0 <2.0.0"
+  http: ^1.0.0
 dev_dependencies:
   test: ^1.16.0