Merge pull request #208 from julianhille/feature/203-add-electron-21.0

Add electron 21.0
julianhille · Nov 5, 2022 · fc7000b · fc7000b
2 parents 896e112 + 4aea9f8
commit fc7000b
Show file tree

Hide file tree

Showing 10 changed files with 89 additions and 5 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -20,7 +20,7 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version: ${{ env.node_version }}
-      - run: npm install --only=dev
+      - run: npm install prettier
       - run: npm run test:codestyle
   build-musl:
     needs: [lint]
@@ -84,6 +84,9 @@ jobs:
         architecture: [x64, ia32, arm64]
         electron:
           [
+            21.2.0,
+            21.1.0,
+            21.0.0,
             20.3.3,
             20.2.0,
             20.1.0,
@@ -122,7 +125,7 @@ jobs:
             11.0.0,
           ]
         include:
-          - electron_mocha_version: ^10
+          - electron_mocha_version: ^11
             python_version: "3.10"
           - architecture: arm64
             architecture_node: x64
@@ -136,6 +139,12 @@ jobs:
             target_architecture: x64
           - architecture: x64
             node: 16.13.2
+          - electron: 21.2.0
+            node: 16.16.0
+          - electron: 21.1.0
+            node: 16.16.0
+          - electron: 21.0.0
+            node: 16.16.0
           - electron: 20.3.3
             node: 16.15.0
           - electron: 20.2.0

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Updated github actions to get rid of some deprecation warnings in gha ci
 - Pin python 3 version for builds
 
+### Added
+
+- Electron 21.0.0, 21.1.0 and 21.2.0
+
 ## [3.2.0] - 2022-10-26
 
 ### Added
@@ -34,6 +38,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Added
 
+- Electron 21.0
 - Node 18
 - Electron 20.0, 20.1, 20.2
 - Prettier as dev dependency and basics

diff --git a/binding.gyp b/binding.gyp
@@ -14,13 +14,13 @@
                 './src/deps/PDFWriter',
                 './src/deps/FreeType/include'
             ],
-            'msvs-settings':
+            'msvs_settings':
 			{
 				'VCCLCompilerTool':
 				{
 					'AdditionalOptions':
 						[
-						'-std:c++17',
+						'/std:c++17',
 						]
 				}
 			},

diff --git a/src/deps/FreeType/binding.gyp b/src/deps/FreeType/binding.gyp
@@ -14,6 +14,16 @@
              './include/freetype/internal',
              './include/freetype/internal/services'
             ],
+           'msvs_settings':
+			{
+				'VCCLCompilerTool':
+				{
+					'AdditionalOptions':
+						[
+						'/std:c++17',
+						]
+				}
+			},
             'sources': [
                 './src/base/ftbbox.c',
                 './src/base/ftgxval.c',

diff --git a/src/deps/LibAesgm/binding.gyp b/src/deps/LibAesgm/binding.gyp
@@ -3,6 +3,16 @@
         {
             'target_name': 'libaesgm',
             'type': 'static_library',
+           'msvs_settings':
+			{
+				'VCCLCompilerTool':
+				{
+					'AdditionalOptions':
+						[
+						'/std:c++17',
+						]
+				}
+			},
             'sources': [
                 'aescrypt.c',
                 'aeskey.c',

diff --git a/src/deps/LibJpeg/binding.gyp b/src/deps/LibJpeg/binding.gyp
@@ -3,6 +3,16 @@
         {
             'target_name': 'libjpeg',
             'type': 'static_library',
+           'msvs_settings':
+			{
+				'VCCLCompilerTool':
+				{
+					'AdditionalOptions':
+						[
+						'/std:c++17',
+						]
+				}
+			},
             'sources': [
                 'jaricom.c',
                 'jcapimin.c',

diff --git a/src/deps/LibPng/binding.gyp b/src/deps/LibPng/binding.gyp
@@ -8,7 +8,17 @@
             ],    
             'include_dirs': [
               '<(module_root_dir)/src/deps/ZLib',
-            ],                    
+            ],
+           'msvs_settings':
+			{
+				'VCCLCompilerTool':
+				{
+					'AdditionalOptions':
+						[
+						'/std:c++17',
+						]
+				}
+			},
             'sources': [
                 'png.c',
                 'pngerror.c',

diff --git a/src/deps/LibTiff/binding.gyp b/src/deps/LibTiff/binding.gyp
@@ -27,6 +27,16 @@
              'include_dirs': [
               '<(module_root_dir)/src/deps/ZLib',
             ],
+           'msvs_settings':
+			{
+				'VCCLCompilerTool':
+				{
+					'AdditionalOptions':
+						[
+						'/std:c++17',
+						]
+				}
+			},
            'sources': [
                 'tif_aux.c',
                 'tif_close.c',

diff --git a/src/deps/PDFWriter/binding.gyp b/src/deps/PDFWriter/binding.gyp
@@ -12,6 +12,16 @@
                    }
                 }]
             ],
+           'msvs_settings':
+			{
+				'VCCLCompilerTool':
+				{
+					'AdditionalOptions':
+						[
+						'/std:c++17',
+						]
+				}
+			},
             'dependencies': [
                '<(module_root_dir)/src/deps/LibAesgm/binding.gyp:libaesgm',
                '<(module_root_dir)/src/deps/FreeType/binding.gyp:freetype',

diff --git a/src/deps/ZLib/binding.gyp b/src/deps/ZLib/binding.gyp
@@ -3,6 +3,16 @@
         {
             'target_name': 'zlib',
             'type': 'static_library',
+           'msvs_settings':
+			{
+				'VCCLCompilerTool':
+				{
+					'AdditionalOptions':
+						[
+						'/std:c++17',
+						]
+				}
+			},
             'sources': [
                 'adler32.c',
                 'compress.c',