Melos の導入 && Formatter実行 (#354)

* ran: bootstrap * fix: dependencies * chore(release): publish packages - lat_lng@1.0.1 * add: melos config * add: format shell scropt * add: formatter * formatter: * fix: import && format * fix: actions * chore(release): publish packages - eq_map@1.0.1 - eqapi_schema@1.0.1 - eqmonitor@2.1.0 - topo_map@1.0.1 - topojson@1.0.1 * remove: melos pub get * Restyle Melos の導入 && Formatter実行 (#355) * Restyled by prettier-markdown * Restyled by shellharden * Restyled by shfmt --------- Co-authored-by: Restyled.io <commits@restyled.io> --------- Co-authored-by: restyled-io[bot] <32688539+restyled-io[bot]@users.noreply.github.com> Co-authored-by: Restyled.io <commits@restyled.io>
YumNumm · Jul 26, 2023 · d5d234e · d5d234e
1 parent 437d762
commit d5d234e
Show file tree

Hide file tree

Showing 80 changed files with 1,237 additions and 370 deletions.
diff --git a/.dart_tool/package_config.json b/.dart_tool/package_config.json
@@ -25,6 +25,12 @@
       "packageUri": "lib/",
       "languageVersion": "2.17"
     },
+    {
+      "name": "ansi_styles",
+      "rootUri": "file:///Users/r_onoue/.pub-cache/hosted/pub.dev/ansi_styles-0.3.2+1",
+      "packageUri": "lib/",
+      "languageVersion": "2.12"
+    },
     {
       "name": "ansicolor",
       "rootUri": "file:///Users/r_onoue/.pub-cache/hosted/pub.dev/ansicolor-2.0.1",
@@ -127,6 +133,12 @@
       "packageUri": "lib/",
       "languageVersion": "2.12"
     },
+    {
+      "name": "charcode",
+      "rootUri": "file:///Users/r_onoue/.pub-cache/hosted/pub.dev/charcode-1.3.1",
+      "packageUri": "lib/",
+      "languageVersion": "2.12"
+    },
     {
       "name": "checked_yaml",
       "rootUri": "file:///Users/r_onoue/.pub-cache/hosted/pub.dev/checked_yaml-2.0.3",
@@ -139,6 +151,12 @@
       "packageUri": "lib/",
       "languageVersion": "2.12"
     },
+    {
+      "name": "cli_launcher",
+      "rootUri": "file:///Users/r_onoue/.pub-cache/hosted/pub.dev/cli_launcher-0.3.1",
+      "packageUri": "lib/",
+      "languageVersion": "2.18"
+    },
     {
       "name": "cli_util",
       "rootUri": "file:///Users/r_onoue/.pub-cache/hosted/pub.dev/cli_util-0.4.0",
@@ -169,6 +187,12 @@
       "packageUri": "lib/",
       "languageVersion": "2.12"
     },
+    {
+      "name": "conventional_commit",
+      "rootUri": "file:///Users/r_onoue/.pub-cache/hosted/pub.dev/conventional_commit-0.6.0+1",
+      "packageUri": "lib/",
+      "languageVersion": "2.18"
+    },
     {
       "name": "convert",
       "rootUri": "file:///Users/r_onoue/.pub-cache/hosted/pub.dev/convert-3.1.1",
@@ -613,6 +637,12 @@
       "packageUri": "lib/",
       "languageVersion": "2.13"
     },
+    {
+      "name": "melos",
+      "rootUri": "file:///Users/r_onoue/.pub-cache/hosted/pub.dev/melos-3.1.1",
+      "packageUri": "lib/",
+      "languageVersion": "2.18"
+    },
     {
       "name": "meta",
       "rootUri": "file:///Users/r_onoue/.pub-cache/hosted/pub.dev/meta-1.9.1",
@@ -625,6 +655,12 @@
       "packageUri": "lib/",
       "languageVersion": "2.18"
     },
+    {
+      "name": "mustache_template",
+      "rootUri": "file:///Users/r_onoue/.pub-cache/hosted/pub.dev/mustache_template-2.0.0",
+      "packageUri": "lib/",
+      "languageVersion": "2.12"
+    },
     {
       "name": "native_shared_preferences",
       "rootUri": "file:///Users/r_onoue/.pub-cache/hosted/pub.dev/native_shared_preferences-2.0.7",
@@ -693,7 +729,7 @@
     },
     {
       "name": "pedantic_mono",
-      "rootUri": "file:///Users/r_onoue/.pub-cache/hosted/pub.dev/pedantic_mono-1.22.0",
+      "rootUri": "file:///Users/r_onoue/.pub-cache/hosted/pub.dev/pedantic_mono-1.23.0",
       "packageUri": "lib/",
       "languageVersion": "3.0"
     },
@@ -763,18 +799,42 @@
       "packageUri": "lib/",
       "languageVersion": "2.14"
     },
+    {
+      "name": "prompts",
+      "rootUri": "file:///Users/r_onoue/.pub-cache/hosted/pub.dev/prompts-2.0.0",
+      "packageUri": "lib/",
+      "languageVersion": "2.12"
+    },
     {
       "name": "pub_semver",
       "rootUri": "file:///Users/r_onoue/.pub-cache/hosted/pub.dev/pub_semver-2.1.4",
       "packageUri": "lib/",
       "languageVersion": "2.17"
     },
+    {
+      "name": "pub_updater",
+      "rootUri": "file:///Users/r_onoue/.pub-cache/hosted/pub.dev/pub_updater-0.3.1",
+      "packageUri": "lib/",
+      "languageVersion": "3.0"
+    },
+    {
+      "name": "pubspec",
+      "rootUri": "file:///Users/r_onoue/.pub-cache/hosted/pub.dev/pubspec-2.3.0",
+      "packageUri": "lib/",
+      "languageVersion": "2.12"
+    },
     {
       "name": "pubspec_parse",
       "rootUri": "file:///Users/r_onoue/.pub-cache/hosted/pub.dev/pubspec_parse-1.2.3",
       "packageUri": "lib/",
       "languageVersion": "2.18"
     },
+    {
+      "name": "quiver",
+      "rootUri": "file:///Users/r_onoue/.pub-cache/hosted/pub.dev/quiver-3.2.1",
+      "packageUri": "lib/",
+      "languageVersion": "2.17"
+    },
     {
       "name": "retrofit",
       "rootUri": "file:///Users/r_onoue/.pub-cache/hosted/pub.dev/retrofit-4.0.1",
@@ -1051,6 +1111,12 @@
       "packageUri": "lib/",
       "languageVersion": "2.17"
     },
+    {
+      "name": "uri",
+      "rootUri": "file:///Users/r_onoue/.pub-cache/hosted/pub.dev/uri-1.0.0",
+      "packageUri": "lib/",
+      "languageVersion": "2.12"
+    },
     {
       "name": "url_launcher_linux",
       "rootUri": "file:///Users/r_onoue/.pub-cache/hosted/pub.dev/url_launcher_linux-3.0.5",
@@ -1135,14 +1201,20 @@
       "packageUri": "lib/",
       "languageVersion": "2.19"
     },
+    {
+      "name": "yaml_edit",
+      "rootUri": "file:///Users/r_onoue/.pub-cache/hosted/pub.dev/yaml_edit-2.1.1",
+      "packageUri": "lib/",
+      "languageVersion": "2.19"
+    },
     {
       "name": "eqmonitor",
       "rootUri": "../",
       "packageUri": "lib/",
       "languageVersion": "3.0"
     }
   ],
-  "generated": "2023-07-26T15:25:22.779398Z",
+  "generated": "2023-07-26T17:06:50.907246Z",
   "generator": "pub",
   "generatorVersion": "3.0.6"
 }
diff --git a/.github/workflows/android-release.yaml b/.github/workflows/android-release.yaml
@@ -65,10 +65,13 @@ jobs:
       - name: Flutter dependencies install
         run: flutter pub get
 
-      - name: Generate codes with build_runner
+      - name: Install Melos
+        run: pub global activate melos && melos bootstrap
+
+      - name: build_runner
         run: |
           echo '${{ secrets.ENV }}' | base64 -d > .env
-          flutter pub run build_runner build -d
+          melos run build_runner
 
       - name: Accept Android License
         run: yes | flutter doctor --android-licenses

diff --git a/.github/workflows/auto-format.yaml b/.github/workflows/auto-format.yaml
@@ -15,26 +15,19 @@ jobs:
       - name: Setup Flutter
         uses: subosito/flutter-action@v2
         with:
-          flutter-version: ${{ env.FLUTTER_VERSION }}
-          channel: ${{ env.FLUTTER_CHANNEL }}
           cache: true
       - name: Install dependencies
-        run: |
-          flutter pub get
+        run: flutter pub get
+      - name: Install Melos
+        run: pub global activate melos && melos bootstrap
 
-      - name: Format
+      - name: build_runner
         run: |
-          files=$(find lib test -name "*.dart" -not \( -name "*.*freezed.dart" -o -name "*.*g.dart" -o -name "*.gen.dart" \))
-          for file in $files; do
-            # limit jobs to 5
-            if [ "$(jobs -r | wc -l)" -ge 5 ]; then
-              wait "$(jobs -r -p | head -1)"
-            fi
-            dart fix --apply "$file" &
-          done
-          wait
+          echo '${{ secrets.ENV }}' | base64 -d > .env
+          melos run build_runner
 
-          dart format "$files"
+      - name: format
+        run: melos run format
 
       # 変更が発生した場合は プルリクエストを作成
       - name: Create pull request

diff --git a/.github/workflows/ios-beta.yaml b/.github/workflows/ios-beta.yaml
@@ -45,10 +45,13 @@ jobs:
       - name: Flutter dependencies install
         run: flutter pub get
 
-      - name: Generate codes with build_runner
+      - name: Install Melos
+        run: pub global activate melos && melos bootstrap
+
+      - name: build_runner
         run: |
           echo '${{ secrets.ENV }}' | base64 -d > .env
-          flutter pub run build_runner build -d
+          melos run build_runner
 
       - name: Cache Pods
         uses: actions/cache@v2

diff --git a/.github/workflows/tag-release.yaml b/.github/workflows/tag-release.yaml
@@ -71,10 +71,14 @@ jobs:
       - name: Flutter dependencies install
         run: flutter pub get
 
-      - name: Generate codes with build_runner
+      - name: Install Melos
+        run: pub global activate melos && melos bootstrap
+
+      - name: build_runner
         run: |
           echo '${{ secrets.ENV }}' | base64 -d > .env
-          flutter pub run build_runner build --delete-conflicting-outputs
+          melos run build_runner
+
 
       - name: Generate LauncherIcon
         run: flutter pub run flutter_launcher_icons:main