From 9dc6b80d8c82f0a5594275fcb3d118c859458614 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Fri, 8 Sep 2023 21:44:54 +0200 Subject: [PATCH] Bump dev version --- appveyor.yml | 2 +- builds/msvc/resource.rc | 4 ++-- builds/msvc/version.h | 5 +++-- configure.ac | 8 ++++---- dist-build/android-aar.sh | 2 +- dist-build/generate-emscripten-symbols.sh | 2 +- msvc-scripts/process.bat | 4 ++-- packaging/dotnet-core/libsodium.pkgproj | 2 +- 8 files changed, 15 insertions(+), 14 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index c2e1e668..9d0f5e69 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: 1.0.18.{build} +version: 1.0.20.{build} os: Visual Studio 2019 diff --git a/builds/msvc/resource.rc b/builds/msvc/resource.rc index 11baa2e8..51d9b7fd 100644 --- a/builds/msvc/resource.rc +++ b/builds/msvc/resource.rc @@ -4,8 +4,8 @@ #include "windows.h" //specify the version numbers for the dll's -#define LIBSODIUM_VERSION_STRING "1.0.18.0" -#define LIBSODIUM_VERSION_BIN 1,0,18,0 +#define LIBSODIUM_VERSION_STRING "1.0.20.0" +#define LIBSODIUM_VERSION_BIN 1,0,20,0 //specify the product name for the dlls based on the platform we are compiling for #if defined(x64) diff --git a/builds/msvc/version.h b/builds/msvc/version.h index b5e27007..c240fa91 100644 --- a/builds/msvc/version.h +++ b/builds/msvc/version.h @@ -4,11 +4,12 @@ #include "export.h" -#define SODIUM_VERSION_STRING "1.0.18" +#define SODIUM_VERSION_STRING "1.0.20" -#define SODIUM_LIBRARY_VERSION_MAJOR 11 +#define SODIUM_LIBRARY_VERSION_MAJOR 28 #define SODIUM_LIBRARY_VERSION_MINOR 0 + #ifdef __cplusplus extern "C" { #endif diff --git a/configure.ac b/configure.ac index a2903b54..88a35c66 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.69]) -AC_INIT([libsodium],[1.0.18],[https://github.com/jedisct1/libsodium/issues],[libsodium],[https://libsodium.org]) +AC_INIT([libsodium],[1.0.20],[https://github.com/jedisct1/libsodium/issues],[libsodium],[https://libsodium.org]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_SRCDIR([src/libsodium/sodium/version.c]) @@ -12,10 +12,10 @@ AM_DEP_TRACK AC_SUBST(VERSION) -SODIUM_LIBRARY_VERSION_MAJOR=11 +SODIUM_LIBRARY_VERSION_MAJOR=28 SODIUM_LIBRARY_VERSION_MINOR=0 -DLL_VERSION=27 -SODIUM_LIBRARY_VERSION=27:0:0 +DLL_VERSION=28 +SODIUM_LIBRARY_VERSION=28:0:0 # | | | # +------+ | +---+ # | | | diff --git a/dist-build/android-aar.sh b/dist-build/android-aar.sh index af223993..49f14598 100755 --- a/dist-build/android-aar.sh +++ b/dist-build/android-aar.sh @@ -5,7 +5,7 @@ # The x86 static library will not work due to text relocation rules, so static x86 versions are limited to shared libraries. # To simplify linking, library variants have distinct names: sodium, sodium-static, sodium-minimal and sodium-minimal-static. -SODIUM_VERSION="1.0.18.0" +SODIUM_VERSION="1.0.20.0" NDK_VERSION=$(grep "Pkg.Revision = " <"${ANDROID_NDK_HOME}/source.properties" | cut -f 2 -d '=' | cut -f 2 -d' ' | cut -f 1 -d'.') DEST_PATH=$(mktemp -d) diff --git a/dist-build/generate-emscripten-symbols.sh b/dist-build/generate-emscripten-symbols.sh index b520371b..67e7b7ec 100755 --- a/dist-build/generate-emscripten-symbols.sh +++ b/dist-build/generate-emscripten-symbols.sh @@ -2,7 +2,7 @@ set -e -LIBSODIUM=${LIBSODIUM:-/tmp/sodium/lib/libsodium.27.dylib} +LIBSODIUM=${LIBSODIUM:-/tmp/sodium/lib/libsodium.28.dylib} symbols() { { diff --git a/msvc-scripts/process.bat b/msvc-scripts/process.bat index 406ec5fb..bf8ad4a2 100755 --- a/msvc-scripts/process.bat +++ b/msvc-scripts/process.bat @@ -1,5 +1,5 @@ -cscript msvc-scripts/rep.vbs //Nologo s/@VERSION@/1.0.18/ < src\libsodium\include\sodium\version.h.in > tmp -cscript msvc-scripts/rep.vbs //Nologo s/@SODIUM_LIBRARY_VERSION_MAJOR@/11/ < tmp > tmp2 +cscript msvc-scripts/rep.vbs //Nologo s/@VERSION@/1.0.20/ < src\libsodium\include\sodium\version.h.in > tmp +cscript msvc-scripts/rep.vbs //Nologo s/@SODIUM_LIBRARY_VERSION_MAJOR@/28/ < tmp > tmp2 cscript msvc-scripts/rep.vbs //Nologo s/@SODIUM_LIBRARY_VERSION_MINOR@/0/ < tmp2 > tmp3 cscript msvc-scripts/rep.vbs //Nologo s/@SODIUM_LIBRARY_MINIMAL_DEF@// < tmp3 > src\libsodium\include\sodium\version.h del tmp tmp2 tmp3 diff --git a/packaging/dotnet-core/libsodium.pkgproj b/packaging/dotnet-core/libsodium.pkgproj index ecf00f11..757dd172 100644 --- a/packaging/dotnet-core/libsodium.pkgproj +++ b/packaging/dotnet-core/libsodium.pkgproj @@ -9,7 +9,7 @@ libsodium - 1.0.18.4 + 1.0.20.0 Frank Denis Internal implementation package not meant for direct consumption. Please do not reference directly. © $([System.DateTime]::UtcNow.ToString(yyyy)) Frank Denis