Merge pull request #66 from TwinFan/next

v3.4.0
TwinFan · Feb 3, 2024 · 768fcb5 · 768fcb5
2 parents 36db88d + f7c3333
commit 768fcb5
Show file tree

Hide file tree

Showing 163 changed files with 7,257 additions and 6,292 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -23,7 +23,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
     - name: Checkout Code
-      uses: actions/checkout@v3       # must checkout before we can use our own actions
+      uses: actions/checkout@v4       # must checkout before we can use our own actions
     - name: Build
       uses: ./.github/actions/build-lin
       id: build
@@ -37,9 +37,9 @@ jobs:
         cp -a ./inc deploy-lib
         mv ${{ steps.build.outputs.lib-file-name }} deploy-lib/lib/lin
     - name: Upload XPMP2 lib
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
-        name: XPMP2-lib
+        name: XPMP2-lib-lin
         path: deploy-lib/*        # this way we keep the folder structure in the artifact
         if-no-files-found: error
 
@@ -49,7 +49,7 @@ jobs:
     runs-on: macos-11
     steps:
     - name: Checkout Code
-      uses: actions/checkout@v3       # must checkout before we can use our own actions
+      uses: actions/checkout@v4       # must checkout before we can use our own actions
     - name: Build
       uses: ./.github/actions/build-mac
       id: build
@@ -62,9 +62,9 @@ jobs:
         mkdir -p deploy-lib/lib
         mv ${{ steps.build.outputs.lib-file-name }} deploy-lib/lib
     - name: Upload XPMP2 Framework
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
-        name: XPMP2-lib
+        name: XPMP2-lib-mac
         path: deploy-lib/*        # this way we keep the folder structure in the artifact
         if-no-files-found: error
 
@@ -74,7 +74,7 @@ jobs:
     runs-on: windows-2022
     steps:
     - name: Checkout Code
-      uses: actions/checkout@v3       # must checkout before we can use our own actions
+      uses: actions/checkout@v4       # must checkout before we can use our own actions
     - name: Build
       uses: ./.github/actions/build-win
       id: build
@@ -87,8 +87,8 @@ jobs:
         mkdir -p deploy-lib/lib/win
         cp ${{ steps.build.outputs.lib-file-name }} deploy-lib/lib/win
     - name: Upload XPMP2 lib
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
-        name: XPMP2-lib
+        name: XPMP2-lib-win
         path: deploy-lib/*        # this way we keep the folder structure in the artifact
         if-no-files-found: error
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -29,7 +29,7 @@ else()
 endif()
 
 project(XPMP2
-        VERSION 3.3.1
+        VERSION 3.4.0
         DESCRIPTION "Multiplayer library for X-Plane 11 and 12")
 
 # Provide compile macros from the above project version definition