Merge pull request #55 from chcg/update_dependencies

update dependencies: editorconfig 0.12.9, pcre 10.44
editorconfig · Jul 25, 2024 · b83b749 · b83b749
2 parents 577d074 + 3f51d56
commit b83b749
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 65 deletions.
diff --git a/.github/workflows/CI_build.yml b/.github/workflows/CI_build.yml
@@ -5,14 +5,14 @@ on: [push, pull_request]
 jobs:
   build_windows:
 
-    runs-on: windows-2022
+    runs-on: windows-latest
     strategy:
-      max-parallel: 6
+      fail-fast: false
       matrix:
         build_configuration: [Release, Debug]
         build_platform: [x64, arm64, x86]
         build_vsver: [17]
-        PCRE2_VERSION: [10.37]
+        PCRE2_VERSION: [10.44]
 
     steps:
     - uses: actions/checkout@v4

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -17,7 +17,7 @@
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #
 
-cmake_minimum_required(VERSION 3.5.0)
+cmake_minimum_required(VERSION 3.16.3)
 
 project(NppEditorConfig CXX)
 

diff --git a/appveyor.yml b/appveyor.yml
diff --git a/init.ps1 b/init.ps1
@@ -1,6 +1,6 @@
 param(
-    $pcre="10.37",
-    $edc="0.12.5"
+    $pcre="10.44",
+    $edc="0.12.9"
 )
 
 $ErrorActionPreference="Stop"

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -76,5 +76,5 @@ set_target_properties(NppEditorConfig_unicode PROPERTIES
 target_link_libraries(NppEditorConfig_unicode editorconfig_static)
 target_link_libraries(NppEditorConfig_unicode Shlwapi)
 target_link_libraries(NppEditorConfig_unicode
-                      debug pcre2-8d
-                      optimized pcre2-8)
+                      debug pcre2-8-staticd
+                      optimized pcre2-8-static)