Merge branch 'dev'

MuggleWei · Nov 7, 2023 · e395723 · e395723
2 parents 390a46f + fcecc6d
commit e395723
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/build.sh b/build.sh
@@ -118,7 +118,7 @@ if [ $build_openssl -eq 1 ]; then
 	cd $dep_dir
 
 	openssl_git=https://github.com/openssl/openssl.git
-	openssl_tag=openssl-3.1.3
+	openssl_tag=openssl-3.1.4
 	openssl_name=openssl-$openssl_tag
 	openssl_src_dir=$dep_dir/$openssl_name
 	openssl_build_dir=$build_dir/_deps/openssl

diff --git a/build.yml b/build.yml
@@ -2,8 +2,8 @@ name: yoauth
 variables:
   - build_type: release
   - yoauth_tag: v1.0.0
-  - mugglec_tag: v1.3.2
-  - openssl_tag: openssl-3.1.3
+  - mugglec_tag: v1.3.5
+  - openssl_tag: openssl-3.1.4
   - unity_tag: v2.5.2
 source:
   maintainer: mugglewei

diff --git a/dep_modules/mugglec.yml b/dep_modules/mugglec.yml
@@ -1,7 +1,7 @@
 name: mugglec
 variables:
   - build_type: release
-  - mugglec_tag: v1.3.2
+  - mugglec_tag: v1.3.5
   - mugglec_url: https://github.com/MuggleWei/mugglec.git
 source:
   maintainer: mugglewei

diff --git a/dep_modules/openssl.unix.yml b/dep_modules/openssl.unix.yml
@@ -1,7 +1,7 @@
 name: openssl
 variables:
   - build_type: release
-  - openssl_tag: openssl-3.1.1
+  - openssl_tag: openssl-3.1.4
   - openssl_url: https://github.com/openssl/openssl.git
   #- zlib_tag: v1.2.13
 source:

diff --git a/dep_modules/openssl.win.yml b/dep_modules/openssl.win.yml
@@ -1,7 +1,7 @@
 name: openssl
 variables:
   - build_type: release
-  - openssl_tag: openssl-3.1.1
+  - openssl_tag: openssl-3.1.4
   - openssl_url: https://github.com/openssl/openssl.git
   #- zlib_tag: v1.2.13
 source:

diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-1.0.15
+1.0.16