aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLouis Pilfold <louis@lpil.uk>2023-11-05 18:19:18 +0000
committerLouis Pilfold <louis@lpil.uk>2023-11-05 18:20:46 +0000
commit2bfa03d0fa32764fbb429a7eb60159da6e262d33 (patch)
tree8e1cde3e70d7ecfc36a409dee2e987a58ec49f39
parent56c8e4942c2da73e0468dea4bbe63d9edb981ba5 (diff)
downloadgleam_json-2bfa03d0fa32764fbb429a7eb60159da6e262d33.tar.gz
gleam_json-2bfa03d0fa32764fbb429a7eb60159da6e262d33.zip
Update for Gleam v0.32
-rw-r--r--gleam.toml4
-rw-r--r--manifest.toml10
-rw-r--r--src/gleam/json.gleam18
-rw-r--r--test/gleam_json_js_ffi_test.gleam2
-rw-r--r--test/gleam_json_test.gleam2
5 files changed, 18 insertions, 18 deletions
diff --git a/gleam.toml b/gleam.toml
index 0f1844e..a1d22bb 100644
--- a/gleam.toml
+++ b/gleam.toml
@@ -1,6 +1,6 @@
name = "gleam_json"
version = "0.6.0"
-gleam = ">= 0.30.0"
+gleam = ">= 0.32.0"
licences = ["Apache-2.0"]
description = "Work with JSON in Gleam"
@@ -16,4 +16,4 @@ gleam_stdlib = "~> 0.19"
thoas = "~> 0.2"
[dev-dependencies]
-gleeunit = "~> 0.6"
+gleeunit = "~> 1.0"
diff --git a/manifest.toml b/manifest.toml
index 40edfd3..518a5fe 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -2,12 +2,12 @@
# You typically do not need to edit this file
packages = [
- { name = "gleam_stdlib", version = "0.27.0", build_tools = ["gleam"], requirements = [], otp_app = "gleam_stdlib", source = "hex", outer_checksum = "9DBDD21B48C654182CDD8AA15ACF85E8E74A0438583C68BD7EF08BE89F999C6F" },
- { name = "gleeunit", version = "0.10.1", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "gleeunit", source = "hex", outer_checksum = "ECEA2DE4BE6528D36AFE74F42A21CDF99966EC36D7F25DEB34D47DD0F7977BAF" },
+ { name = "gleam_stdlib", version = "0.32.0", build_tools = ["gleam"], requirements = [], otp_app = "gleam_stdlib", source = "hex", outer_checksum = "07D64C26D014CF570F8ACADCE602761EA2E74C842D26F2FD49B0D61973D9966F" },
+ { name = "gleeunit", version = "1.0.0", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "gleeunit", source = "hex", outer_checksum = "D3682ED8C5F9CAE1C928F2506DE91625588CC752495988CBE0F5653A42A6F334" },
{ name = "thoas", version = "0.4.1", build_tools = ["rebar3"], requirements = [], otp_app = "thoas", source = "hex", outer_checksum = "4918D50026C073C4AB1388437132C77A6F6F7C8AC43C60C13758CC0ADCE2134E" },
]
[requirements]
-gleam_stdlib = "~> 0.19"
-gleeunit = "~> 0.6"
-thoas = "~> 0.2"
+gleam_stdlib = { version = "~> 0.19" }
+gleeunit = { version = "~> 1.0" }
+thoas = { version = "~> 0.2" }
diff --git a/src/gleam/json.gleam b/src/gleam/json.gleam
index 71c685c..e83a318 100644
--- a/src/gleam/json.gleam
+++ b/src/gleam/json.gleam
@@ -1,9 +1,9 @@
import gleam/list
import gleam/result
-import gleam/bit_string
-import gleam/option.{None, Option, Some}
-import gleam/dynamic.{Dynamic}
-import gleam/string_builder.{StringBuilder}
+import gleam/bit_array
+import gleam/option.{type Option, None, Some}
+import gleam/dynamic.{type Dynamic}
+import gleam/string_builder.{type StringBuilder}
pub type Json
@@ -46,7 +46,7 @@ fn do_decode(
from json: String,
using decoder: dynamic.Decoder(t),
) -> Result(t, DecodeError) {
- let bits = bit_string.from_string(json)
+ let bits = bit_array.from_string(json)
decode_bits(bits, decoder)
}
@@ -85,7 +85,7 @@ fn decode_string(a: String) -> Result(Dynamic, DecodeError)
/// ```
///
pub fn decode_bits(
- from json: BitString,
+ from json: BitArray,
using decoder: dynamic.Decoder(t),
) -> Result(t, DecodeError) {
use dynamic_value <- result.then(decode_to_dynamic(json))
@@ -95,11 +95,11 @@ pub fn decode_bits(
@target(erlang)
@external(erlang, "gleam_json_ffi", "decode")
-fn decode_to_dynamic(a: BitString) -> Result(Dynamic, DecodeError)
+fn decode_to_dynamic(a: BitArray) -> Result(Dynamic, DecodeError)
@target(javascript)
-fn decode_to_dynamic(json: BitString) -> Result(Dynamic, DecodeError) {
- case bit_string.to_string(json) {
+fn decode_to_dynamic(json: BitArray) -> Result(Dynamic, DecodeError) {
+ case bit_array.to_string(json) {
Ok(string) -> decode_string(string)
Error(Nil) -> Error(UnexpectedByte("", 0))
}
diff --git a/test/gleam_json_js_ffi_test.gleam b/test/gleam_json_js_ffi_test.gleam
index df1b763..cecfe20 100644
--- a/test/gleam_json_js_ffi_test.gleam
+++ b/test/gleam_json_js_ffi_test.gleam
@@ -1,5 +1,5 @@
@target(javascript)
-import gleam/json.{DecodeError, UnexpectedByte, UnexpectedEndOfInput}
+import gleam/json.{type DecodeError, UnexpectedByte, UnexpectedEndOfInput}
@target(javascript)
import gleeunit/should
diff --git a/test/gleam_json_test.gleam b/test/gleam_json_test.gleam
index f27edce..3e22f00 100644
--- a/test/gleam_json_test.gleam
+++ b/test/gleam_json_test.gleam
@@ -1,5 +1,5 @@
import gleam/dynamic
-import gleam/json.{Json}
+import gleam/json.{type Json}
import gleam/option.{None, Some}
import gleam/string_builder
import gleeunit