🔀 post release branch sync (#499)

lejard-h · Sep 2, 2023 · f85eacd · f85eacd
1 parent a0f106d
commit f85eacd
Show file tree

Hide file tree

Showing 8 changed files with 49 additions and 4 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -68,6 +68,19 @@ jobs:
           dart pub get
           echo "IS_VERSION_GREATER=$(dart run compare_versions.dart $THIS_VERSION $BASE_VERSION_${{ matrix.package }})" >> $GITHUB_ENV
           popd || exit
+      - name: Validate pub.dev topics
+        id: validate_pub_dev_topics
+        run: |
+          set -e
+          pushd ${{ matrix.package }} || exit
+          pattern="^[a-z][a-z0-9-]*[a-z0-9]$"
+          for topic in $(yq -r '.topics[]' pubspec.yaml); do
+            if [[ ! $topic =~ $pattern ]]; then
+              echo "Invalid topic: $topic"
+              exit 1
+            fi
+          done
+          popd || exit
       - name: Set up pub credentials
         id: credentials
         if: ${{ env.IS_VERSION_GREATER == 1 }}

diff --git a/.github/workflows/publish_dry_run.yml b/.github/workflows/publish_dry_run.yml
@@ -67,6 +67,19 @@ jobs:
           dart pub get
           echo "IS_VERSION_GREATER=$(dart run compare_versions.dart $THIS_VERSION $BASE_VERSION_${{ matrix.package }})" >> $GITHUB_ENV
           popd || exit
+      - name: Validate pub.dev topics
+        id: validate_pub_dev_topics
+        run: |
+          set -e
+          pushd ${{ matrix.package }} || exit
+          pattern="^[a-z][a-z0-9-]*[a-z0-9]$"
+          for topic in $(yq -r '.topics[]' pubspec.yaml); do
+            if [[ ! $topic =~ $pattern ]]; then
+              echo "Invalid topic: $topic"
+              exit 1
+            fi
+          done
+          popd || exit
       - name: Publish (dry run)
         id: publish_dry_run
         if: ${{ env.IS_VERSION_GREATER == 1 }}

diff --git a/chopper/CHANGELOG.md b/chopper/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 7.0.6
+
+- The @ChopperApi annotation's baseUrl property can be used as a top level constant string variable ([#493](https://github.com/lejard-h/chopper/pull/493))
+- Fix ChopperClient.send() sending wrong request when using an Authenticator ([#497](https://github.com/lejard-h/chopper/pull/497))
+- Add pub.dev topics to package metadata ([#495](https://github.com/lejard-h/chopper/pull/495))
+
 ## 7.0.5
 
 - Fix documentation links in README ([#488](https://github.com/lejard-h/chopper/pull/488))

diff --git a/chopper/pubspec.yaml b/chopper/pubspec.yaml
@@ -1,6 +1,6 @@
 name: chopper
 description: Chopper is an http client generator using source_gen, inspired by Retrofit
-version: 7.0.5
+version: 7.0.6
 documentation: https://hadrien-lejard.gitbook.io/chopper
 repository: https://github.com/lejard-h/chopper
 

diff --git a/chopper_built_value/CHANGELOG.md b/chopper_built_value/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## 2.0.1+1
+
+- Fix pub.dev topic in package metadata ([#498](https://github.com/lejard-h/chopper/pull/498))
+
+## 2.0.1
+
+- Add pub.dev topics to package metadata ([#495](https://github.com/lejard-h/chopper/pull/495))
+
 ## 2.0.0
 
 - Require Dart 3.0 or later

diff --git a/chopper_built_value/pubspec.yaml b/chopper_built_value/pubspec.yaml
@@ -1,6 +1,6 @@
 name: chopper_built_value
 description: A built_value based Converter for Chopper.
-version: 2.0.0
+version: 2.0.1+1
 documentation: https://hadrien-lejard.gitbook.io/chopper/converters/built-value-converter
 repository: https://github.com/lejard-h/chopper
 
@@ -27,4 +27,4 @@ dependency_overrides:
 topics:
   - codegen
   - converter
-  - built_value
+  - built-value
diff --git a/chopper_generator/CHANGELOG.md b/chopper_generator/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 7.0.3
+
+- The @ChopperApi annotation's baseUrl property can be used as a top level constant string variable ([#493](https://github.com/lejard-h/chopper/pull/493))
+- Add pub.dev topics to package metadata ([#495](https://github.com/lejard-h/chopper/pull/495))
+
 ## 7.0.2
 
 - Update analyzer dependency to >=5.13.0 <7.0.0 ([#484](https://github.com/lejard-h/chopper/pull/484))

diff --git a/chopper_generator/pubspec.yaml b/chopper_generator/pubspec.yaml
@@ -1,6 +1,6 @@
 name: chopper_generator
 description: Chopper is an http client generator using source_gen, inspired by Retrofit
-version: 7.0.2
+version: 7.0.3
 documentation: https://hadrien-lejard.gitbook.io/chopper
 repository: https://github.com/lejard-h/chopper