support gleam v1-rc1

TanklesXL · Feb 11, 2024 · 350dc4c · 350dc4c
1 parent 8c2aa99
commit 350dc4c
Show file tree

Hide file tree

Showing 10 changed files with 156 additions and 153 deletions.
diff --git a/.github/actions/test/action.yml b/.github/actions/test/action.yml
@@ -9,7 +9,7 @@ inputs:
   erlang-version:
     description: erlang-otp version
     required: false
-    default: 25.0.2
+    default: 26.2.2
   node-version:
     description: nodeJS version
     required: false

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -7,8 +7,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        erlang: ["25.3.2.3", "26.0.2"]
-        gleam: ["0.34.1"]
+        erlang: ["25.3.2.3", "26.2.2"]
+        gleam: ["0.34.1","1.0.0-rc1"]
     steps:
       - uses: actions/checkout@v2
       - uses: ./.github/actions/test

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -20,7 +20,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: ./.github/actions/test
         with:
-          gleam-version: "0.34.1"
+          gleam-version: "1.0.0-rc1"
       - name: publish to hex
         env:
           HEXPM_USER: ${{ secrets.HEXPM_USER }}

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## [Unreleased](https://github.com/TanklesXL/glint/compare/v0.14.0...HEAD)
 
+## [0.15.0-rc1](https://github.com/TanklesXL/glint/compare/v0.14.0...v0.15.0-rc1)
+- support gleam >=0.34 or 1.0.x
+
 ## [0.15.0-rc1](https://github.com/TanklesXL/glint/compare/v0.14.0...v0.15.0-rc1)
 
 - refactor of help generation logic, no change to help text output

diff --git a/gleam.toml b/gleam.toml
@@ -11,7 +11,7 @@ links = [
     { title = "Hex", href = "https://hex.pm/packages/glint" },
     { title = "Docs", href = "https://hexdocs.pm/glint/" },
 ]
-gleam = ">= 0.33.0"
+gleam = ">=0.34.1 or ~> 1.0"
 
 [dependencies]
 gleam_stdlib = "~> 0.19"

diff --git a/src/glint.gleam b/src/glint.gleam
@@ -652,8 +652,8 @@ fn build_subcommands_help(
     Metadata(
       name: name,
       description: cmd.contents
-      |> option.map(fn(command) { command.description })
-      |> option.unwrap(""),
+        |> option.map(fn(command) { command.description })
+        |> option.unwrap(""),
     ),
     ..acc
   ]

diff --git a/src/glint/flag/constraint.gleam b/src/glint/flag/constraint.gleam
@@ -20,14 +20,14 @@ pub fn one_of(allowed: List(a)) -> Constraint(a) {
       False ->
         snag.error(
           "invalid value '"
-            <> string.inspect(val)
-            <> "', must be one of: ["
-            <> {
-              allowed
-              |> list.map(fn(a) { "'" <> string.inspect(a) <> "'" })
-              |> string.join(", ")
-            }
-            <> "]",
+          <> string.inspect(val)
+          <> "', must be one of: ["
+          <> {
+            allowed
+            |> list.map(fn(a) { "'" <> string.inspect(a) <> "'" })
+            |> string.join(", ")
+          }
+          <> "]",
         )
     }
   }
@@ -43,16 +43,16 @@ pub fn none_of(disallowed: List(a)) -> Constraint(a) {
       True ->
         snag.error(
           "invalid value '"
-            <> string.inspect(val)
-            <> "', must not be one of: ["
-            <> {
-              {
-                disallowed
-                |> list.map(fn(a) { "'" <> string.inspect(a) <> "'" })
-                |> string.join(", ")
-                <> "]"
-              }
-            },
+          <> string.inspect(val)
+          <> "', must not be one of: ["
+          <> {
+            {
+              disallowed
+              |> list.map(fn(a) { "'" <> string.inspect(a) <> "'" })
+              |> string.join(", ")
+              <> "]"
+            }
+          },
         )
     }
   }

diff --git a/test/glint/flag/contraint_test.gleam b/test/glint/flag/contraint_test.gleam
@@ -60,78 +60,78 @@ pub fn flag_one_of_none_of_test() {
     #(
       "i",
       flag.int()
-      |> flag.constraint(one_of([1, 2, 3]))
-      |> flag.constraint(none_of([4, 5, 6]))
-      |> flag.build,
+        |> flag.constraint(one_of([1, 2, 3]))
+        |> flag.constraint(none_of([4, 5, 6]))
+        |> flag.build,
       "1",
       "6",
     ),
     #(
       "li",
       flag.int_list()
-      |> flag.constraint(
-        [1, 2, 3]
-        |> one_of
-        |> each,
-      )
-      |> flag.constraint(
-        [4, 5, 6]
-        |> none_of
-        |> each,
-      )
-      |> flag.build,
+        |> flag.constraint(
+          [1, 2, 3]
+          |> one_of
+          |> each,
+        )
+        |> flag.constraint(
+          [4, 5, 6]
+          |> none_of
+          |> each,
+        )
+        |> flag.build,
       "1,1,1",
       "2,2,6",
     ),
     #(
       "f",
       flag.float()
-      |> flag.constraint(one_of([1.0, 2.0, 3.0]))
-      |> flag.constraint(none_of([4.0, 5.0, 6.0]))
-      |> flag.build,
+        |> flag.constraint(one_of([1.0, 2.0, 3.0]))
+        |> flag.constraint(none_of([4.0, 5.0, 6.0]))
+        |> flag.build,
       "1.0",
       "6.0",
     ),
     #(
       "lf",
       flag.float_list()
-      |> flag.constraint(
-        [1.0, 2.0, 3.0]
-        |> one_of()
-        |> each,
-      )
-      |> flag.constraint(
-        [4.0, 5.0, 6.0]
-        |> none_of()
-        |> each,
-      )
-      |> flag.build,
+        |> flag.constraint(
+          [1.0, 2.0, 3.0]
+          |> one_of()
+          |> each,
+        )
+        |> flag.constraint(
+          [4.0, 5.0, 6.0]
+          |> none_of()
+          |> each,
+        )
+        |> flag.build,
       "3.0,2.0,1.0",
       "2.0,3.0,6.0",
     ),
     #(
       "s",
       flag.string()
-      |> flag.constraint(one_of(["t1", "t2", "t3"]))
-      |> flag.constraint(none_of(["t4", "t5", "t6"]))
-      |> flag.build,
+        |> flag.constraint(one_of(["t1", "t2", "t3"]))
+        |> flag.constraint(none_of(["t4", "t5", "t6"]))
+        |> flag.build,
       "t3",
       "t4",
     ),
     #(
       "ls",
       flag.string_list()
-      |> flag.constraint(
-        ["t1", "t2", "t3"]
-        |> one_of
-        |> each,
-      )
-      |> flag.constraint(
-        ["t4", "t5", "t6"]
-        |> none_of
-        |> each,
-      )
-      |> flag.build,
+        |> flag.constraint(
+          ["t1", "t2", "t3"]
+          |> one_of
+          |> each,
+        )
+        |> flag.constraint(
+          ["t4", "t5", "t6"]
+          |> none_of
+          |> each,
+        )
+        |> flag.build,
       "t3,t2,t1",
       "t2,t4,t1",
     ),