diff --git a/server/gleam.toml b/server/gleam.toml index 25deac7..a9bd161 100644 --- a/server/gleam.toml +++ b/server/gleam.toml @@ -11,7 +11,7 @@ gleam_httpc = ">= 5.0.0 and < 6.0.0" gleam_json = ">= 3.1.0 and < 4.0.0" gleam_erlang = ">= 1.3.0 and < 2.0.0" at_record_shared = { path = "../shared" } -atproto_client = { path = "../../gleam-atproto/atproto_client" } +atproto_client = ">= 0.3.0 and < 1.0.0" gleam_time = ">= 1.8.0 and < 2.0.0" gleam_http = ">= 4.3.0 and < 5.0.0" envoy = ">= 1.0.0 and < 2.0.0" @@ -22,8 +22,7 @@ gleam_otp = ">= 1.2.0 and < 2.0.0" pog = ">= 4.1.0 and < 5.0.0" simplifile = ">= 2.5.0 and < 3.0.0" stratus = ">= 3.0.0 and < 4.0.0" -# WIP path dep pending the gleam-atproto Hex publish (breaking XrpcError). -atproto_core = { path = "../../gleam-atproto/atproto_core" } +atproto_core = ">= 0.1.1 and < 1.0.0" [dev_dependencies] gleeunit = ">= 1.0.0 and < 2.0.0" diff --git a/server/manifest.toml b/server/manifest.toml index 6953cb0..c533541 100644 --- a/server/manifest.toml +++ b/server/manifest.toml @@ -8,8 +8,8 @@ packages = [ { name = "at_record_shared", version = "1.0.0", build_tools = ["gleam"], requirements = ["atproto_client", "atproto_core", "gleam_json", "gleam_stdlib"], source = "local", path = "../shared" }, - { name = "atproto_client", version = "0.3.0", build_tools = ["gleam"], requirements = ["atproto_core", "gleam_crypto", "gleam_http", "gleam_json", "gleam_stdlib", "gleam_time", "gose", "kryptos"], source = "local", path = "../../gleam-atproto/atproto_client" }, - { name = "atproto_core", version = "0.1.1", build_tools = ["gleam"], requirements = ["gleam_http", "gleam_json", "gleam_stdlib"], source = "local", path = "../../gleam-atproto/atproto_core" }, + { name = "atproto_client", version = "0.3.0", build_tools = ["gleam"], requirements = ["atproto_core", "gleam_crypto", "gleam_http", "gleam_json", "gleam_stdlib", "gleam_time", "gose", "kryptos"], otp_app = "atproto_client", source = "hex", outer_checksum = "EF865263E9B1F3F7DFCF474C2C193D328A8E2A2F4D4612D48B31DE14944863EC" }, + { name = "atproto_core", version = "0.1.1", build_tools = ["gleam"], requirements = ["gleam_http", "gleam_json", "gleam_stdlib"], otp_app = "atproto_core", source = "hex", outer_checksum = "A06B327466847AC6ABB05EC81428C02A1B77E651788DFFA390D66C69EB2F3875" }, { name = "backoff", version = "1.1.6", build_tools = ["rebar3"], requirements = [], otp_app = "backoff", source = "hex", outer_checksum = "CF0CFFF8995FB20562F822E5CC47D8CCF664C5ECDC26A684CBE85C225F9D7C39" }, { name = "bigi", version = "4.1.1", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "bigi", source = "hex", outer_checksum = "44FEDF1DF5C1F426A80B67C32B976D0828D66524E11BDC2DD22B78D37C883BA7" }, { name = "directories", version = "1.2.0", build_tools = ["gleam"], requirements = ["envoy", "gleam_stdlib", "platform", "simplifile"], otp_app = "directories", source = "hex", outer_checksum = "D13090CFCDF6759B87217E8DDD73A75903A700148A82C1D33799F333E249BF9E" }, @@ -46,8 +46,8 @@ packages = [ [requirements] at_record_shared = { path = "../shared" } -atproto_client = { path = "../../gleam-atproto/atproto_client" } -atproto_core = { path = "../../gleam-atproto/atproto_core" } +atproto_client = { version = ">= 0.3.0 and < 1.0.0" } +atproto_core = { version = ">= 0.1.1 and < 1.0.0" } envoy = { version = ">= 1.0.0 and < 2.0.0" } exception = { version = ">= 2.1.0 and < 3.0.0" } gleam_crypto = { version = ">= 1.6.0 and < 2.0.0" } diff --git a/shared/gleam.toml b/shared/gleam.toml index fdbff7e..785b354 100644 --- a/shared/gleam.toml +++ b/shared/gleam.toml @@ -6,16 +6,14 @@ licences = ["MIT"] [dependencies] gleam_stdlib = ">= 1.0.0 and < 2.0.0" gleam_json = ">= 3.1.0 and < 4.0.0" -# WIP path deps pending the gleam-atproto Hex publish (breaking XrpcError in -# atproto_core). Swap back to Hex once published. -atproto_client = { path = "../../gleam-atproto/atproto_client" } -atproto_core = { path = "../../gleam-atproto/atproto_core" } +atproto_client = ">= 0.3.0 and < 1.0.0" +atproto_core = ">= 0.1.1 and < 1.0.0" [dev_dependencies] gleeunit = ">= 1.0.0 and < 2.0.0" -atproto_codegen = { path = "../../gleam-atproto/atproto_codegen" } -atproto_sdl = { path = "../../gleam-atproto/atproto_sdl" } -atproto_lexicon = { path = "../../gleam-atproto/atproto_lexicon" } +atproto_codegen = ">= 0.4.2 and < 1.0.0" +atproto_sdl = ">= 0.3.0 and < 1.0.0" +atproto_lexicon = ">= 0.2.0 and < 1.0.0" argv = ">= 1.1.0 and < 2.0.0" simplifile = ">= 2.4.0 and < 3.0.0" gleam_http = ">= 4.3.0 and < 5.0.0" diff --git a/shared/manifest.toml b/shared/manifest.toml index 3c45efd..e7f5e99 100644 --- a/shared/manifest.toml +++ b/shared/manifest.toml @@ -8,11 +8,11 @@ packages = [ { name = "argv", version = "1.1.0", build_tools = ["gleam"], requirements = [], otp_app = "argv", source = "hex", outer_checksum = "3277D100448BDB4A29B6D58C0F36F631CBC349E8BDD09766C6309DF202831140" }, - { name = "atproto_client", version = "0.3.0", build_tools = ["gleam"], requirements = ["atproto_core", "gleam_crypto", "gleam_http", "gleam_json", "gleam_stdlib", "gleam_time", "gose", "kryptos"], source = "local", path = "../../gleam-atproto/atproto_client" }, - { name = "atproto_codegen", version = "0.4.2", build_tools = ["gleam"], requirements = ["argv", "atproto_lexicon", "gleam_erlang", "gleam_stdlib", "justin", "simplifile"], source = "local", path = "../../gleam-atproto/atproto_codegen" }, - { name = "atproto_core", version = "0.1.1", build_tools = ["gleam"], requirements = ["gleam_http", "gleam_json", "gleam_stdlib"], source = "local", path = "../../gleam-atproto/atproto_core" }, - { name = "atproto_lexicon", version = "0.2.1", build_tools = ["gleam"], requirements = ["gleam_http", "gleam_json", "gleam_stdlib", "simplifile"], source = "local", path = "../../gleam-atproto/atproto_lexicon" }, - { name = "atproto_sdl", version = "0.3.1", build_tools = ["gleam"], requirements = ["argv", "atproto_lexicon", "filepath", "gleam_stdlib", "simplifile"], source = "local", path = "../../gleam-atproto/atproto_sdl" }, + { name = "atproto_client", version = "0.3.0", build_tools = ["gleam"], requirements = ["atproto_core", "gleam_crypto", "gleam_http", "gleam_json", "gleam_stdlib", "gleam_time", "gose", "kryptos"], otp_app = "atproto_client", source = "hex", outer_checksum = "EF865263E9B1F3F7DFCF474C2C193D328A8E2A2F4D4612D48B31DE14944863EC" }, + { name = "atproto_codegen", version = "0.5.0", build_tools = ["gleam"], requirements = ["argv", "atproto_lexicon", "gleam_erlang", "gleam_stdlib", "justin", "simplifile"], otp_app = "atproto_codegen", source = "hex", outer_checksum = "32C7A6B89C6FCEA862A7683343AB0CE92E1C21656B1C67593535AF67533859AE" }, + { name = "atproto_core", version = "0.1.1", build_tools = ["gleam"], requirements = ["gleam_http", "gleam_json", "gleam_stdlib"], otp_app = "atproto_core", source = "hex", outer_checksum = "A06B327466847AC6ABB05EC81428C02A1B77E651788DFFA390D66C69EB2F3875" }, + { name = "atproto_lexicon", version = "0.3.0", build_tools = ["gleam"], requirements = ["atproto_core", "gleam_http", "gleam_json", "gleam_stdlib", "simplifile"], otp_app = "atproto_lexicon", source = "hex", outer_checksum = "163FA300E908924893DFF6A98FCC8263B012A3FBB8F0F59B773BC53CFBA2208D" }, + { name = "atproto_sdl", version = "0.4.0", build_tools = ["gleam"], requirements = ["argv", "atproto_lexicon", "filepath", "gleam_stdlib", "simplifile"], otp_app = "atproto_sdl", source = "hex", outer_checksum = "D305866FBA7903B9802901644C50F2B59733A49F66FAB3263ADE6B4041BA69A9" }, { name = "bigi", version = "4.1.1", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "bigi", source = "hex", outer_checksum = "44FEDF1DF5C1F426A80B67C32B976D0828D66524E11BDC2DD22B78D37C883BA7" }, { name = "filepath", version = "1.1.2", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "filepath", source = "hex", outer_checksum = "B06A9AF0BF10E51401D64B98E4B627F1D2E48C154967DA7AF4D0914780A6D40A" }, { name = "gleam_crypto", version = "1.6.0", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "gleam_crypto", source = "hex", outer_checksum = "2DE9E4EF53CF6FEE049D4F765731F7178F7A11AEFAE00EEE63BF7536B354AD3F" }, @@ -31,11 +31,11 @@ packages = [ [requirements] argv = { version = ">= 1.1.0 and < 2.0.0" } -atproto_client = { path = "../../gleam-atproto/atproto_client" } -atproto_codegen = { path = "../../gleam-atproto/atproto_codegen" } -atproto_core = { path = "../../gleam-atproto/atproto_core" } -atproto_lexicon = { path = "../../gleam-atproto/atproto_lexicon" } -atproto_sdl = { path = "../../gleam-atproto/atproto_sdl" } +atproto_client = { version = ">= 0.3.0 and < 1.0.0" } +atproto_codegen = { version = ">= 0.4.2 and < 1.0.0" } +atproto_core = { version = ">= 0.1.1 and < 1.0.0" } +atproto_lexicon = { version = ">= 0.2.0 and < 1.0.0" } +atproto_sdl = { version = ">= 0.3.0 and < 1.0.0" } gleam_http = { version = ">= 4.3.0 and < 5.0.0" } gleam_httpc = { version = ">= 5.0.0 and < 6.0.0" } gleam_json = { version = ">= 3.1.0 and < 4.0.0" } diff --git a/shared/test/tools/lexicon_vendor.gleam b/shared/test/tools/lexicon_vendor.gleam index 4c89671..36626ac 100644 --- a/shared/test/tools/lexicon_vendor.gleam +++ b/shared/test/tools/lexicon_vendor.gleam @@ -14,9 +14,9 @@ //// that touches the network: `make gen` and `make test` stay offline. import argv +import atproto_core/xrpc as core_xrpc import atproto_lexicon/source.{ - type FetchedRecord, type NetworkConfig, type TransportError, ConnectionFailed, - NsidWildcard, Other, Timeout, + type FetchedRecord, type NetworkConfig, type TransportError, NsidWildcard, } import atproto_sdl import gleam/http/request.{type Request} @@ -228,9 +228,10 @@ fn send_with_retry( fn httpc_error_to_transport(error: httpc.HttpError) -> TransportError { case error { - httpc.ResponseTimeout -> Timeout - httpc.FailedToConnect(_, _) -> ConnectionFailed(string.inspect(error)) - httpc.InvalidUtf8Response -> Other(string.inspect(error)) + httpc.ResponseTimeout -> core_xrpc.Timeout + httpc.FailedToConnect(_, _) -> + core_xrpc.ConnectionFailed(string.inspect(error)) + httpc.InvalidUtf8Response -> core_xrpc.Other(string.inspect(error)) } } diff --git a/web/gleam.toml b/web/gleam.toml index 4e314d9..fef1df4 100644 --- a/web/gleam.toml +++ b/web/gleam.toml @@ -11,11 +11,9 @@ gleam_javascript = ">= 1.0.0 and < 2.0.0" at_record_shared = { path = "../shared" } modem = ">= 2.1.3 and < 3.0.0" gleam_http = ">= 4.0.0 and < 5.0.0" -# WIP path deps pending the gleam-atproto Hex publish (async browser xrpc + the -# breaking XrpcError in atproto_core). Swap back to Hex once published. -atproto_browser = { path = "../../gleam-atproto/atproto_browser" } -atproto_core = { path = "../../gleam-atproto/atproto_core" } -atproto_client = { path = "../../gleam-atproto/atproto_client" } +atproto_browser = ">= 0.2.0 and < 1.0.0" +atproto_core = ">= 0.1.1 and < 1.0.0" +atproto_client = ">= 0.3.0 and < 1.0.0" [dev_dependencies] gleeunit = ">= 1.0.0 and < 2.0.0" diff --git a/web/manifest.toml b/web/manifest.toml index 8b47cbe..6c18826 100644 --- a/web/manifest.toml +++ b/web/manifest.toml @@ -9,9 +9,9 @@ packages = [ { name = "argv", version = "1.1.0", build_tools = ["gleam"], requirements = [], otp_app = "argv", source = "hex", outer_checksum = "3277D100448BDB4A29B6D58C0F36F631CBC349E8BDD09766C6309DF202831140" }, { name = "at_record_shared", version = "1.0.0", build_tools = ["gleam"], requirements = ["atproto_client", "atproto_core", "gleam_json", "gleam_stdlib"], source = "local", path = "../shared" }, - { name = "atproto_browser", version = "0.1.0", build_tools = ["gleam"], requirements = ["atproto_core", "gleam_crypto", "gleam_fetch", "gleam_http", "gleam_javascript", "gleam_json", "gleam_stdlib", "gleam_time"], source = "local", path = "../../gleam-atproto/atproto_browser" }, - { name = "atproto_client", version = "0.3.0", build_tools = ["gleam"], requirements = ["atproto_core", "gleam_crypto", "gleam_http", "gleam_json", "gleam_stdlib", "gleam_time", "gose", "kryptos"], source = "local", path = "../../gleam-atproto/atproto_client" }, - { name = "atproto_core", version = "0.1.1", build_tools = ["gleam"], requirements = ["gleam_http", "gleam_json", "gleam_stdlib"], source = "local", path = "../../gleam-atproto/atproto_core" }, + { name = "atproto_browser", version = "0.2.0", build_tools = ["gleam"], requirements = ["atproto_core", "gleam_crypto", "gleam_fetch", "gleam_http", "gleam_javascript", "gleam_json", "gleam_stdlib", "gleam_time"], otp_app = "atproto_browser", source = "hex", outer_checksum = "58F041305E9E723E3D931BA654DBE4BC422B271A88C684A34BDE1F6FAF877098" }, + { name = "atproto_client", version = "0.3.0", build_tools = ["gleam"], requirements = ["atproto_core", "gleam_crypto", "gleam_http", "gleam_json", "gleam_stdlib", "gleam_time", "gose", "kryptos"], otp_app = "atproto_client", source = "hex", outer_checksum = "EF865263E9B1F3F7DFCF474C2C193D328A8E2A2F4D4612D48B31DE14944863EC" }, + { name = "atproto_core", version = "0.1.1", build_tools = ["gleam"], requirements = ["gleam_http", "gleam_json", "gleam_stdlib"], otp_app = "atproto_core", source = "hex", outer_checksum = "A06B327466847AC6ABB05EC81428C02A1B77E651788DFFA390D66C69EB2F3875" }, { name = "bigi", version = "4.1.1", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "bigi", source = "hex", outer_checksum = "44FEDF1DF5C1F426A80B67C32B976D0828D66524E11BDC2DD22B78D37C883BA7" }, { name = "booklet", version = "1.1.0", build_tools = ["gleam"], requirements = [], otp_app = "booklet", source = "hex", outer_checksum = "08E0FDB78DC4D8A5D3C80295B021505C7D2A2E7B6C6D5EAB7286C36F4A53C851" }, { name = "directories", version = "1.2.0", build_tools = ["gleam"], requirements = ["envoy", "gleam_stdlib", "platform", "simplifile"], otp_app = "directories", source = "hex", outer_checksum = "D13090CFCDF6759B87217E8DDD73A75903A700148A82C1D33799F333E249BF9E" }, @@ -57,9 +57,9 @@ packages = [ [requirements] at_record_shared = { path = "../shared" } -atproto_browser = { path = "../../gleam-atproto/atproto_browser" } -atproto_client = { path = "../../gleam-atproto/atproto_client" } -atproto_core = { path = "../../gleam-atproto/atproto_core" } +atproto_browser = { version = ">= 0.2.0 and < 1.0.0" } +atproto_client = { version = ">= 0.3.0 and < 1.0.0" } +atproto_core = { version = ">= 0.1.1 and < 1.0.0" } gleam_http = { version = ">= 4.0.0 and < 5.0.0" } gleam_javascript = { version = ">= 1.0.0 and < 2.0.0" } gleam_json = { version = ">= 3.1.0 and < 4.0.0" }