From 4766e32df78b5613a9b3a974f502947320c85d02 Mon Sep 17 00:00:00 2001
From: Joscha <34318751+josxha@users.noreply.github.com>
Date: Tue, 21 May 2024 22:52:52 +0200
Subject: [PATCH] chore: fix publish ci, update .gitignore (#424)

---
 .github/workflows/publish-single.yml | 13 ++--
 .github/workflows/publish.yml        |  8 +--
 .gitignore                           | 98 ++++------------------------
 example/ios/Flutter/.last_build_id   |  1 -
 4 files changed, 24 insertions(+), 96 deletions(-)
 delete mode 100644 example/ios/Flutter/.last_build_id

diff --git a/.github/workflows/publish-single.yml b/.github/workflows/publish-single.yml
index b5f91a6ca..0ddab1378 100644
--- a/.github/workflows/publish-single.yml
+++ b/.github/workflows/publish-single.yml
@@ -17,13 +17,14 @@ jobs:
     permissions:
       id-token: write # This is required for requesting the OIDC
     runs-on: ubuntu-latest
+    if: github.repository_owner == 'maplibre'
     steps:
       - uses: actions/checkout@v4
-      # Setup Dart SDK with JWT token
-      - uses: dart-lang/setup-dart@v1
+      - uses: subosito/flutter-action@v2
+        with:
+          cache: true
       - name: Install dependencies
-        run: dart pub get
-      # Publishing...
-      # skip validation due to https://github.com/dart-lang/setup-dart/issues/68
+        run: flutter pub get
+        # --force skips the y/N confirmation
       - name: Publish to pub.dev
-        run: dart pub publish --force --skip-validation
+        run: flutter pub publish --force
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 8434b2e52..10cb4f515 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -1,4 +1,4 @@
-name: Publish maplibre_gl packages to pub.dev
+name: Publish packages to pub.dev
 
 on:
   push:
@@ -10,16 +10,16 @@ permissions:
 
 jobs:
   publish_maplibre_gl_platform_interface:
-    uses: ./.github/workflows/publish_single.yml
+    uses: ./.github/workflows/publish-single.yml
     with:
       working-directory: maplibre_gl_platform_interface
   publish_maplibre_gl_web:
     needs: [publish_maplibre_gl_platform_interface]
-    uses: ./.github/workflows/publish_single.yml
+    uses: ./.github/workflows/publish-single.yml
     with:
       working-directory: maplibre_gl_web
   publish_maplibre_gl:
     needs: [publish_maplibre_gl_platform_interface, publish_maplibre_gl_web]
-    uses: ./.github/workflows/publish_single.yml
+    uses: ./.github/workflows/publish-single.yml
     with:
       working-directory: .
diff --git a/.gitignore b/.gitignore
index e8237d431..d30bd0311 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@
 .buildlog/
 .history
 .svn/
+migrate_working_dir/
 
 # IntelliJ related
 *.iml
@@ -21,103 +22,30 @@
 .settings/
 .vscode/
 
-# Flutter repo-specific
-/bin/cache/
-/bin/mingit/
-/dev/benchmarks/mega_gallery/
-/dev/bots/.recipe_deps
-/dev/bots/android_tools/
-/dev/docs/doc/
-/dev/docs/flutter.docs.zip
-/dev/docs/lib/
-/dev/docs/pubspec.yaml
-/dev/integration_tests/**/xcuserdata
-/dev/integration_tests/**/Pods
-/packages/flutter/coverage/
-version
-
-# packages file containing multi-root paths
-.packages.generated
-
 # Flutter/Dart/Pub related
 **/doc/api/
+**/ios/Flutter/.last_build_id
 .dart_tool/
 .flutter-plugins
 .flutter-plugins-dependencies
-.packages
 .pub-cache/
 .pub/
-**/pubspec.lock
-build/
-flutter_*.png
-linked_*.ds
-unlinked.ds
-unlinked_spec.ds
-
-# Android related
-**/android/**/gradle-wrapper.jar
-**/android/.gradle
-**/android/captures/
-**/android/gradlew
-**/android/gradlew.bat
-**/android/local.properties
-**/android/**/GeneratedPluginRegistrant.java
-**/android/key.properties
-*.jks
-
-# iOS/XCode related
-**/ios/**/*.mode1v3
-**/ios/**/*.mode2v3
-**/ios/**/*.moved-aside
-**/ios/**/*.pbxuser
-**/ios/**/*.perspectivev3
-**/ios/**/*sync/
-**/ios/**/.sconsign.dblite
-**/ios/**/.tags*
-**/ios/**/.vagrant/
-**/ios/**/DerivedData/
-**/ios/**/Icon?
-**/ios/**/Pods/
-**/ios/**/.symlinks/
-**/ios/**/profile
-**/ios/**/xcuserdata
-**/ios/.generated/
-**/ios/Flutter/App.framework
-**/ios/Flutter/Flutter.framework
-**/ios/Flutter/Flutter.podspec
-**/ios/Flutter/Generated.xcconfig
-**/ios/Flutter/app.flx
-**/ios/Flutter/app.zip
-**/ios/Flutter/flutter_assets/
-**/ios/Flutter/flutter_export_environment.sh
-**/ios/ServiceDefinitions.json
-**/ios/Runner/GeneratedPluginRegistrant.*
-
-# macOS
-**/macos/Flutter/GeneratedPluginRegistrant.swift
-**/macos/Flutter/Flutter-Debug.xcconfig
-**/macos/Flutter/Flutter-Release.xcconfig
-**/macos/Flutter/Flutter-Profile.xcconfig
+/build/
+pubspec.lock
 
 # Coverage
 coverage/
 
-# Symbols
+# Symbolication related
 app.*.symbols
 
-# Exceptions to above rules.
-!**/ios/**/default.mode1v3
-!**/ios/**/default.mode2v3
-!**/ios/**/default.pbxuser
-!**/ios/**/default.perspectivev3
-!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
-!/dev/ci/**/Gemfile.lock
-google-java-format-1.13.0-all-deps.jar
+# Obfuscation related
+app.*.map.json
 
-# Ruby/CocoaPods
-Gemfile*
-.ruby-version
+# Android Studio will place build artifacts here
+/android/app/debug
+/android/app/profile
+/android/app/release
 
-# FVM Version Cache
-.fvm/
-.fvmrc
\ No newline at end of file
+# Misc
+GeneratedPluginRegistrant.swift
\ No newline at end of file
diff --git a/example/ios/Flutter/.last_build_id b/example/ios/Flutter/.last_build_id
deleted file mode 100644
index 1345a4034..000000000
--- a/example/ios/Flutter/.last_build_id
+++ /dev/null
@@ -1 +0,0 @@
-03fcf93a7807ed5ca7e1593e013555e0