Merge pull request #6220 from libgit2/ethomson/version

meta: update version number to v1.5.0-alpha

5 files changed, 45 insertions, 8 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8c19d2ed3..eb137ecdd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@
 
 cmake_minimum_required(VERSION 3.5.1)
 
-project(libgit2 VERSION "1.4.0" LANGUAGES C)
+project(libgit2 VERSION "1.5.0" LANGUAGES C)
 
 # Add find modules to the path
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake")
diff --git a/include/git2/common.h b/include/git2/common.h
index c421d3cc1..52000e8eb 100644
--- a/include/git2/common.h
+++ b/include/git2/common.h
@@ -122,6 +122,17 @@ GIT_BEGIN_DECL
 GIT_EXTERN(int) git_libgit2_version(int *major, int *minor, int *rev);
 
 /**
+ * Return the prerelease state of the libgit2 library currently being
+ * used.  For nightly builds during active development, this will be
+ * "alpha".  Releases may have a "beta" or release candidate ("rc1",
+ * "rc2", etc) prerelease.  For a final release, this function returns
+ * NULL.
+ *
+ * @return the name of the prerelease state or NULL
+ */
+GIT_EXTERN(const char *) git_libgit2_prerelease(void);
+
+/**
  * Combinations of these values describe the features with which libgit2
  * was compiled
  */
diff --git a/include/git2/version.h b/include/git2/version.h
index 9007ca928..84af817e2 100644
--- a/include/git2/version.h
+++ b/include/git2/version.h
@@ -7,12 +7,33 @@
 #ifndef INCLUDE_git_version_h__
 #define INCLUDE_git_version_h__
 
-#define LIBGIT2_VERSION "1.4.0"
-#define LIBGIT2_VER_MAJOR 1
-#define LIBGIT2_VER_MINOR 4
-#define LIBGIT2_VER_REVISION 0
-#define LIBGIT2_VER_PATCH 0
+/**
+ * The version string for libgit2.  This string follows semantic
+ * versioning (v2) guidelines.
+ */
+#define LIBGIT2_VERSION        "1.5.0-alpha"
+
+/** The major version number for this version of libgit2. */
+#define LIBGIT2_VER_MAJOR      1
+
+/** The minor version number for this version of libgit2. */
+#define LIBGIT2_VER_MINOR      5
+
+/** The revision ("teeny") version number for this version of libgit2. */
+#define LIBGIT2_VER_REVISION   0
+
+/** The Windows DLL patch number for this version of libgit2. */
+#define LIBGIT2_VER_PATCH      0
+
+/**
+ * The prerelease string for this version of libgit2.  For development
+ * (nightly) builds, this will be "alpha".  For prereleases, this will be
+ * a prerelease name like "beta" or "rc1".  For final releases, this will
+ * be `NULL`.
+ */
+#define LIBGIT2_VER_PRERELEASE "alpha"
 
-#define LIBGIT2_SOVERSION "1.4"
+/** The library ABI soversion for this version of libgit2. */
+#define LIBGIT2_SOVERSION      "1.5"
 
 #endif
diff --git a/package.json b/package.json
index 6952563b6..139fc3891 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "libgit2",
-  "version": "1.4.0",
+  "version": "1.5.0-alpha",
   "repo": "https://github.com/libgit2/libgit2",
   "description": " A cross-platform, linkable library implementation of Git that you can use in your application.",
   "install": "mkdir build && cd build && cmake .. && cmake --build ."
diff --git a/src/libgit2.c b/src/libgit2.c
index b17485d7f..efad3bf6d 100644
--- a/src/libgit2.c
+++ b/src/libgit2.c
@@ -107,6 +107,11 @@ int git_libgit2_version(int *major, int *minor, int *rev)
 	return 0;
 }
 
+const char *git_libgit2_prerelease(void)
+{
+	return LIBGIT2_VER_PRERELEASE;
+}
+
 int git_libgit2_features(void)
 {
 	return 0