Merge branch 'develop' of https://github.com/febiosoftware/FEBioWarp into develop

Author: SteveMaas1978

.github/workflows/linux-pull-request.yml

@@ -12,10 +12,10 @@ permissions:
   contents: read  # This is required for actions/checkout
 jobs:
   call_workflow:
-    uses: febiosoftware/febio-workflows/.github/workflows/linux-reusable-pull-request.yml@develop
+    uses: febiosoftware/febio-workflows/.github/workflows/linux-reusable.yml@develop
     with:
-      aws-ami-id: ami-05f23270883f04ec8
-      aws-sg-id: sg-0ca7912782cf1538b
       package-name: febiowarp
       requires-sdk: true
+      plugin: true
+      publish: false
     secrets: inherit

.github/workflows/linux-push.yml

@@ -11,11 +11,10 @@ permissions:
   contents: read  # This is required for actions/checkout
 jobs:
   call_workflow:
-    uses: febiosoftware/febio-workflows/.github/workflows/linux-reusable-push.yml@develop
+    uses: febiosoftware/febio-workflows/.github/workflows/linux-reusable.yml@develop
     with:
-      aws-ami-id: ami-05f23270883f04ec8
-      aws-sg-id: sg-0ca7912782cf1538b
-      runTests: false
       package-name: febiowarp
       requires-sdk: true
+      plugin: true
+      publish: true
     secrets: inherit

.github/workflows/macos-pull-request.yml

@@ -12,8 +12,10 @@ permissions:
   contents: read  # This is required for actions/checkout
 jobs:
   call_workflow:
-    uses: febiosoftware/febio-workflows/.github/workflows/macos-reusable-pull-request.yml@develop
+    uses: febiosoftware/febio-workflows/.github/workflows/macos-reusable.yml@develop
     with:
       package-name: febiowarp
       requires-sdk: true
+      plugin: true
+      publish: false
     secrets: inherit

.github/workflows/macos-push.yml

@@ -11,8 +11,10 @@ permissions:
 
 jobs:
   call_workflow:
-    uses: febiosoftware/febio-workflows/.github/workflows/macos-reusable-push.yml@develop
+    uses: febiosoftware/febio-workflows/.github/workflows/macos-reusable.yml@develop
     with:
       package-name: febiowarp
       requires-sdk: true
+      plugin: true
+      publish: true
     secrets: inherit

.github/workflows/windows-pull-request.yml

@@ -12,12 +12,10 @@ permissions:
   contents: read  # This is required for actions/checkout
 jobs:
   call_workflow:
-    uses: febiosoftware/febio-workflows/.github/workflows/windows-reusable-pull-request.yml@develop
+    uses: febiosoftware/febio-workflows/.github/workflows/windows-reusable.yml@develop
     with:
-      register-runner-timeout: 10
-      aws-ami-id: ami-0f458bdce73864228
-      aws-sg-id: sg-0ca7912782cf1538b
-      aws-instance-type: c5a.8xlarge
       package-name: febiowarp
       requires-sdk: true
+      plugin: true
+      publish: false
     secrets: inherit

.github/workflows/windows-push.yml

@@ -11,12 +11,10 @@ permissions:
   contents: read  # This is required for actions/checkout
 jobs:
   call_workflow:
-    uses: febiosoftware/febio-workflows/.github/workflows/windows-reusable-push.yml@develop
+    uses: febiosoftware/febio-workflows/.github/workflows/windows-reusable.yml@develop
     with:
-      aws-ami-id: ami-0f458bdce73864228
-      aws-sg-id: sg-0ca7912782cf1538b
-      aws-instance-type: c5a.8xlarge
-      runTests: false
       package-name: febiowarp
       requires-sdk: true
+      plugin: true
+      publish: true
     secrets: inherit

FEWarp/FEWarp.cpp

@@ -2,6 +2,7 @@
 //
 
 #include "stdafx.h"
+#include "version.h"
 #include <FECore/FECoreKernel.h>
 #include "FEWarpImageConstraint.h"
 #include "FEWarpImageConstraint2.h"
@@ -51,9 +52,9 @@ FECORE_EXPORT void PluginInitialize(FECoreKernel& febio)
 //-----------------------------------------------------------------------------
 FECORE_EXPORT void GetPluginVersion(int& maj, int& min, int& patch)
 {
-	maj = 2;
-	min = 0;
-	patch = 0;
+	maj = VERSION;
+	min = SUBVERSION;
+	patch = SUBSUBVERSION;
 }
 
 //-----------------------------------------------------------------------------

FEWarp/version.h

@@ -1,5 +1,5 @@
 #pragma once
 
-#define FEWARP_VERSION			1
-#define FEWARP_SUBVERSION		0
-#define FEWARP_SUBSUBVERSION	0
+#define VERSION			1
+#define SUBVERSION		0
+#define SUBSUBVERSION	0