Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch the top-level Base64 module to B64 #4

Merged
merged 1 commit into from
Dec 24, 2014
Merged

Switch the top-level Base64 module to B64 #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
2.0.0 (2014-12-24):
* Switch the top-level `Base64` module to `B64` to avoid
clashing with various other similarly named modules in
`extlib` and some other libraries. This is obviously
backwards compatibility breaking with all current users
of this library. (#3).

1.1.0 (2014-12-16):
* Allow specifying a different alphabet during encoding or
decoding, and supply a URI-safe alphabet along with the
Expand Down
4 changes: 2 additions & 2 deletions _oasis
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
OASISFormat: 0.4
Name: base64
Version: 1.1.0
Version: 2.0.0
Synopsis: Base64 encoding library
Authors: Thomas Gazagnaire, Anil Madhavapeddy, Peter Zotov
License: ISC
Expand All @@ -9,7 +9,7 @@ BuildTools: ocamlbuild

Library base64
Path: lib
Modules: Base64
Modules: B64
BuildDepends: bytes

AlphaFeatures: ocamlbuild_more_args
Expand Down
4 changes: 2 additions & 2 deletions api.odocl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# OASIS_START
# DO NOT EDIT (digest: a2aac417857692f1f06cfab146a3595e)
lib/Base64
# DO NOT EDIT (digest: 6b153de2d42f2ecbe317d5cc18b73faa)
lib/B64
# OASIS_STOP
4 changes: 2 additions & 2 deletions lib/META
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# OASIS_START
# DO NOT EDIT (digest: d900c0db6c33f5db7083c274080c31f6)
version = "1.1.0"
# DO NOT EDIT (digest: 7c89ecbf231e96fc39574897c8f1b40a)
version = "2.0.0"
description = "Base64 encoding library"
requires = "bytes"
archive(byte) = "base64.cma"
Expand Down
0 lib/base64.ml → lib/b64.ml
View file
Open in desktop
File renamed without changes.
0 lib/base64.mli → lib/b64.mli
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions lib/base64.mldylib
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# OASIS_START
# DO NOT EDIT (digest: 1eb445fa6bd078346bf63ecac35fa77c)
Base64
# DO NOT EDIT (digest: d5b36098ec1795f41db1bb6de80e04b6)
B64
# OASIS_STOP
4 changes: 2 additions & 2 deletions lib/base64.mllib
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# OASIS_START
# DO NOT EDIT (digest: 1eb445fa6bd078346bf63ecac35fa77c)
Base64
# DO NOT EDIT (digest: d5b36098ec1795f41db1bb6de80e04b6)
B64
# OASIS_STOP
2 changes: 1 addition & 1 deletion opam
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
opam-version: "1.2"
name: "base64"
version: "1.1.0"
version: "2.0.0"
maintainer: "[email protected]"
authors: [ "Thomas Gazagnaire"
"Anil Madhavapeddy"
Expand Down
8 changes: 4 additions & 4 deletions setup.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
(* setup.ml generated for the first time by OASIS v0.4.4 *)

(* OASIS_START *)
(* DO NOT EDIT (digest: 2162a5fdbec03f11d58c8d430b433930) *)
(* DO NOT EDIT (digest: 711cffe6e30773badc9c0c845543933e) *)
(*
Regenerated by OASIS v0.4.5
Visit http://oasis.forge.ocamlcore.org for more information and
Expand Down Expand Up @@ -6695,7 +6695,7 @@ let setup_t =
alpha_features = ["ocamlbuild_more_args"];
beta_features = [];
name = "base64";
version = "1.1.0";
version = "2.0.0";
license =
OASISLicense.DEP5License
(OASISLicense.DEP5Unit
Expand Down Expand Up @@ -6771,7 +6771,7 @@ let setup_t =
bs_nativeopt = [(OASISExpr.EBool true, [])]
},
{
lib_modules = ["Base64"];
lib_modules = ["B64"];
lib_pack = false;
lib_internal_modules = [];
lib_findlib_parent = None;
Expand Down Expand Up @@ -6815,7 +6815,7 @@ let setup_t =
};
oasis_fn = Some "_oasis";
oasis_version = "0.4.5";
oasis_digest = Some "%\155e���\015�,�\024��2��";
oasis_digest = Some "!Z\b\022\148X���_1X\012�*\014";
oasis_exec = None;
oasis_setup_args = [];
setup_update = false
Expand Down