fix dependency violation

.github/workflows/merge.yml

@@ -1,34 +1,33 @@
 name: "Merge"
 
 on:
+  push:
   pull_request:
     types: [closed]
+    branches:
+      - main
 
 jobs:
   changes:
     runs-on: ubuntu-latest
     timeout-minutes: 5
-    if: github.event.pull_request.merged
+    outputs:
+      any_changed: ${{ steps.changed-files.outputs.all_changed_files_count }}
+    # if: github.event.pull_request.mergedTODO
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Get all changed *.dart, files in docs or pubspec.yaml
         id: changed-files
-        uses: tj-actions/changed-files@v37
-        with:
-          base_sha: ${{ github.event.pull_request.base.sha }}
-          sha: ${{ github.event.pull_request.head.sha }}
-          files: |
-            **/*.dart
-            pubspec.yaml
-  merge:
+        uses: tj-actions/changed-files@v41
+  bump_and_tag:
     runs-on: ubuntu-latest
     timeout-minutes: 20
     needs: changes
-    if: needs.changes.outputs.files == 'true'
+    if: needs.changes.outputs.any_changed != '0'
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
           ref: ${{ github.head_ref }}
@@ -38,15 +37,7 @@ jobs:
         run: dart pub global activate cider
       - name: Change flutter version tag
         run: |
-          echo "FLUTTER_BUILD_VERSION=$(cider bump patch --bump-build)" >> "$GITHUB_ENV"
-      - name: Update CHANGELOG
-        id: changelog
-        uses: requarks/changelog-action@v1
-        with:
-          token: ${{ secrets.PAT }}
-          tag: ${{ steps.read-version.outputs.version-number }}
-          excludeTypes: ""
-          includeInvalidCommits: true
+          echo "FLUTTER_BUILD_VERSION=$(cider bump patch)" >> "$GITHUB_ENV"
       - name: Update
         id: update
         run: |
@@ -55,48 +46,29 @@ jobs:
           git add -A
           git commit --amend --no-edit
           git push -f
-          echo "newSha=$(git rev-parse ${{github.event.pull_request.head.sha}})" >>  $GITHUB_ENV
+          echo "newSha=$(git rev-parse HEAD)" >>  $GITHUB_ENV
       - name: Create tag
-        uses: actions/github-script@v6
+        id: tag
+        uses: mathieudutour/[email protected]
         with:
-          script: |
-            github.rest.git.createRef({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              ref: 'refs/tags/${{env.FLUTTER_BUILD_VERSION}}',
-              sha: "${{env.newSha}}"
-            })
-      - name: release
-        uses: actions/github-script@v5
-        if: ${{ (steps.bump.outputs.release == 'true') && (env.modified == 'true') }}
-        with:
-          script: |
-            github.rest.repos.createRelease({
-                draft: false,
-                generate_release_notes: true,
-                name: "${{steps.bump.outputs.version}}",
-                owner: context.repo.owner,
-                prerelease: false,
-                repo: context.repo.repo,
-                tag_name: "${{steps.bump.outputs.version}}",
-              });
-  build_and_deploy:
-    if: github.event.pull_request.merged
-    runs-on: ubuntu-latest
-    needs: merge
-    steps:
-      - uses: actions/checkout@v3
-      - uses: subosito/flutter-action@v2
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          custom_tag: ${{env.FLUTTER_BUILD_VERSION}}
+          tag_prefix: ""
+      - name: Update CHANGELOG
+        id: changelog
+        uses: requarks/changelog-action@v1
         with:
-          flutter-version: "3.13.x"
-          channel: "stable"
-      - name: Setup flutter
-        run: flutter pub get
-      - name: build
+          token: ${{ github.token }}
+          tag: ${{env.FLUTTER_BUILD_VERSION}}
+          excludeTypes: ""
+          includeInvalidCommits: true
+      - name: Push changelog
         run: |
-          cd example
-          flutter build web -o ../build --no-tree-shake-icons --base-href "/zds_flutter/"
-      - name: Deploy
-        uses: JamesIves/github-pages-deploy-action@v4
+          git add .
+          git commit --amend --no-edit
+          git push -f
+      - name: Release
+        uses: softprops/action-gh-release@v1
         with:
-          folder: build
+          body: "https://pub.dev/packages/zds_flutter/versions/${{env.FLUTTER_BUILD_VERSION}}"
+          tag_name: ${{env.FLUTTER_BUILD_VERSION}}

.github/workflows/pr.yml

@@ -10,7 +10,7 @@ jobs:
     outputs:
       files: ${{steps.changed-files.outputs.any_changed}}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
           ref: ${{ github.event.pull_request.head.sha }}
@@ -40,7 +40,7 @@ jobs:
     needs: changes
     if: needs.changes.outputs.files == 'true'
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
           ref: ${{ github.head_ref }}

.github/workflows/release.yml

@@ -0,0 +1,31 @@
+# name: "Release"
+
+# on:
+#   push:
+#     # tags:
+#     #   - "**"±TODO:
+
+# jobs:
+#   build_and_deploy:
+#     runs-on: ubuntu-latest
+#     steps:
+#       - uses: actions/checkout@v4
+#       - uses: subosito/flutter-action@v2
+#         with:
+#           flutter-version: "3.13.x"
+#           channel: "stable"
+#       - name: Setup flutter
+#         run: flutter pub get
+#       - name: build
+#         run: |
+#           cd example
+#           flutter build web -o ../build --no-tree-shake-icons --base-href "/zds_flutter/"
+#       - name: Deploy
+#         uses: JamesIves/github-pages-deploy-action@v4
+#         with:
+#           folder: build
+#       - name: Publish
+#         run: |
+#           dart format .
+#           dart fix --apply
+#           dart pub publish

.pubignore

@@ -1,3 +1,3 @@
 test/
 build/
-localizations/
+_localizations/

CHANGELOG.md

@@ -1,3 +1,26 @@
+## [1.0.3] - 2024-01-11
+### :flying_saucer: Other Changes
+- [`23fd937`](https://github.com/ZebraDevs/zds_flutter/commit/23fd93762d4efb1ba31292a9c68818581b357d6e) - Add all changes from v1.0.0 internal *(PR [#2](https://github.com/ZebraDevs/zds_flutter/pull/2) by [@thelukewalton](https://github.com/thelukewalton))*
+- [`d736ecd`](https://github.com/ZebraDevs/zds_flutter/commit/d736ecdb10f1edbb5e0afed004c3583701c8ea3c) - Update to latest version of flu/tter and update InAppWebView *(commit by [@thelukewalton](https://github.com/thelukewalton))*
+- [`6862ac0`](https://github.com/ZebraDevs/zds_flutter/commit/6862ac0811773e6adc4bf6aa1b1901e404eb6b2e) - actions *(commit by [@thelukewalton](https://github.com/thelukewalton))*
+- [`531d0d9`](https://github.com/ZebraDevs/zds_flutter/commit/531d0d950ef025961456866c59e3013b8b5d706f) - actions *(commit by [@thelukewalton](https://github.com/thelukewalton))*
+- [`88db187`](https://github.com/ZebraDevs/zds_flutter/commit/88db187d791efc8458e4b572e68318d2f8099831) - Fix pupignore *(commit by [@thelukewalton](https://github.com/thelukewalton))*
+- [`cfe31db`](https://github.com/ZebraDevs/zds_flutter/commit/cfe31db202f1b843fca246cf705b384d17b0b1ff) - quill update part 1 *(commit by [@thelukewalton](https://github.com/thelukewalton))*
+- [`805ba4d`](https://github.com/ZebraDevs/zds_flutter/commit/805ba4d693e1c6ae80d5d8d96dc19c2bb8942c25) - Merge branch 'bug/publish-bugs' of https://github.com/ZebraDevs/zds_flutter into bug/publish-bugs *(commit by [@thelukewalton](https://github.com/thelukewalton))*
+
+
+## [1.0.2] - 2024-01-03
+
+### :flying_saucer: Other Changes
+
+- [`6862ac0`](https://github.com/ZebraDevs/zds_flutter/commit/6862ac0811773e6adc4bf6aa1b1901e404eb6b2e) - actions _(commit by [@thelukewalton](https://github.com/thelukewalton))_
+
+## [1.0.1] - 2024-01-03
+
+### :flying_saucer: Other Changes
+
+- [`e8628a1`](https://github.com/ZebraDevs/zds_flutter/commit/e8628a1a8cf76ada08a64a0312c1f7efd23c6cd5) - actions _(commit by [@thelukewalton](https://github.com/thelukewalton))_
+
 ## [1.0.0] - 2024-01-02
 
 ### :sparkles: New features
@@ -9,3 +32,9 @@
 ### :sparkles: New Features
 
 - [`885fa19`](https://github.com/zebradevs/zds-flutter/commit/885fa19d4d0ec4426a259b61cb828b6c9fac175e) - init. _(commit by [@thelukewalton](https://github.com/thelukewalton))_
+
+[1.0.1]: https://github.com/ZebraDevs/zds_flutter/compare/v1.0.2...1.0.1
+[1.0.1]: https://github.com/ZebraDevs/zds_flutter/compare/v1.0.2...1.0.1
+[1.0.2]: https://github.com/ZebraDevs/zds_flutter/compare/1.0.1...1.0.2
+
+[1.0.3]: https://github.com/ZebraDevs/zds_flutter/compare/1.0.0...1.0.3

example/.gitignore

@@ -33,7 +33,6 @@ migrate_working_dir/
 /build/
 
 # Web related
-lib/generated_plugin_registrant.dart
 
 # Symbolication related
 app.*.symbols

example/pubspec.yaml

@@ -5,7 +5,7 @@ version: 1.0.0+1
 
 environment:
   sdk: ">=3.0.0 <4.0.0"
-  flutter: ">=3.7.0"
+  flutter: ">=3.0.0 <3.16.0"
 
 dependencies:
   flutter:

example/web/index.html

@@ -12,7 +12,9 @@
     Fore more details:
     * https://developer.mozilla.org/en-US/doc/Web/HTML/Element/base
   -->
-  <base href="/">
+  <base href="$FLUTTER_BASE_HREF">
+  <script type="application/javascript" src="/assets/packages/flutter_inappwebview/assets/web/web_support.js"
+    defer></script>
 
   <meta charset="UTF-8">
   <meta content="IE=Edge" http-equiv="X-UA-Compatible">
@@ -31,6 +33,8 @@
   <link rel="manifest" href="manifest.json">
   <script type="application/javascript" src="assets/packages/flutter_inappwebview/assets/web/web_support.js"
     defer=""></script>
+  <script type="application/javascript" src="/assets/packages/flutter_inappwebview_web/assets/web/web_support.js"
+    defer></script>
 </head>
 
 <body>

pubspec.yaml

@@ -1,6 +1,6 @@
 name: zds_flutter
 description: Zebra Design System components for Flutter. A selection of UI components from Zebra Technologies.
-version: 1.0.0
+version: 1.0.3
 homepage: https://github.com/zebradevs/zds_flutter
 repository: https://github.com/zebradevs/zds_flutter
 issue_tracker: https://github.com/zebradevs/zds_flutter/issues
@@ -15,7 +15,7 @@ platforms:
 
 environment:
   sdk: ">=3.0.0 <4.0.0"
-  flutter: ">=3.7.0"
+  flutter: ">=3.0.0 <3.16.0"
 
 dependencies:
   cached_network_image: ^3.2.1