Merge branch 'master' into snyk-fix-fb912fd8a3065715deee112b913a49d4

Author: LadyCailin

.github/workflows/maven-publish.yml

@@ -11,10 +11,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 16
+    - name: Set up JDK 2
       uses: actions/setup-java@v2
       with:
-        java-version: '16'
+        java-version: '21'
         distribution: 'adopt'
     - name: Build with Maven
       run: sudo -- sh -c "export methodscript_run_llvm_integration_tests=1 && export PATH=$JAVA_HOME/bin:\$PATH && export JAVA_HOME=$JAVA_HOME && mvn -version && mvn -B clean package --file pom.xml -Pfail-on-test-failures"
@@ -24,23 +24,23 @@ jobs:
       methodscript_run_llvm_integration_tests: 1
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 16
+    - name: Set up JDK 21
       uses: actions/setup-java@v2
       with:
-        java-version: '16'
+        java-version: '21'
         distribution: 'adopt'
     - name: Build with Maven
       run: mvn -B clean package --file pom.xml -Pfail-on-test-failures
   build_mac:
     runs-on: macos-latest
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 16
+    - name: Set up JDK 21
       uses: actions/setup-java@v2
       env:
         methodscript_run_llvm_integration_tests: 1
       with:
-        java-version: '16'
+        java-version: '21'
         distribution: 'adopt'
     - name: Build with Maven
       run: mvn -version && mvn -B clean package --file pom.xml -Pfail-on-test-failures
@@ -53,10 +53,10 @@ jobs:
       packages: write
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 16
+    - name: Set up JDK 21
       uses: actions/setup-java@v2
       with:
-        java-version: '16'
+        java-version: '21'
         distribution: 'adopt'
         server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
         settings-path: ${{ github.workspace }} # location for the settings.xml file

.github/workflows/maven.yml

@@ -12,10 +12,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 16
+    - name: Set up JDK 21
       uses: actions/setup-java@v2
       with:
-        java-version: '16'
+        java-version: '21'
         distribution: 'adopt'
     - name: Build with Maven
       run: sudo -- sh -c "export methodscript_run_llvm_integration_tests=1 && export PATH=$JAVA_HOME/bin:\$PATH && export JAVA_HOME=$JAVA_HOME && mvn -version && mvn -B clean package --file pom.xml -Pfail-on-test-failures"
@@ -25,10 +25,10 @@ jobs:
       methodscript_run_llvm_integration_tests: 1
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 16
+    - name: Set up JDK 21
       uses: actions/setup-java@v2
       with:
-        java-version: '16'
+        java-version: '21'
         distribution: 'adopt'
     - name: Build with Maven
       run: mvn -B clean package --file pom.xml -Pfail-on-test-failures

.gitignore

@@ -338,3 +338,9 @@ ASALocalRun/
 # MethodScript
 persistence.db
 persistence.json
+
+# TSP
+src/main/resources/apps.methodscript.com/tsp-output
+
+# VSCode
+.vscode

azure-pipelines.yml

@@ -9,20 +9,20 @@ pool:
 steps:
 - task: JavaToolInstaller@0
   inputs:
-    versionSpec: '16' 
+    versionSpec: '21' 
     jdkArchitectureOption: x64
     jdkSourceOption: 'AzureStorage'
     azureResourceManagerEndpoint: Azure Resource Manager
     azureStorageAccountName: methodscriptjdkbuilds
     azureContainerName: jdks
-    azureCommonVirtualFile: 'OpenJDK16U-jdk_x86-32_windows_hotspot_16.0.1_9.zip'
-    jdkDestinationDirectory: '$(agent.toolsDirectory)/jdk16'
+    azureCommonVirtualFile: 'OpenJDK21U-jdk_x64_windows_hotspot_21.0.3_9.zip'
+    jdkDestinationDirectory: '$(agent.toolsDirectory)/jdk21'
     cleanDestinationDirectory: true
 - task: Maven@3
   inputs:
     mavenPomFile: 'pom.xml'
-    javaHomeOption: 'JDKVersion'
-    jdkVersionOption: '1.16'
+    javaHomeOption: 'Path'
+    jdkDirectory: '$(agent.toolsDirectory)\jdk21\JAVA_HOME_21_X64_OpenJDK21U-jdk_x64_windows_hotspot_21.0.3_9_zip\jdk-21.0.3+9'
     jdkArchitectureOption: 'x64'
     publishJUnitResults: true
     testResultsFiles: '**/TEST-*.xml'

nb-configuration.xml

@@ -37,6 +37,6 @@
         <org-netbeans-modules-editor-indent.text.plain.CodeStyle.project.wrapArrayInit>WRAP_ALWAYS</org-netbeans-modules-editor-indent.text.plain.CodeStyle.project.wrapArrayInit>
         <org-netbeans-modules-editor-indent.text.plain.CodeStyle.project.wrapArrayInitItems>WRAP_ALWAYS</org-netbeans-modules-editor-indent.text.plain.CodeStyle.project.wrapArrayInitItems>
         <org-netbeans-modules-editor-indent.text.plain.CodeStyle.project.wrapObjects>WRAP_ALWAYS</org-netbeans-modules-editor-indent.text.plain.CodeStyle.project.wrapObjects>
-        <netbeans.hint.jdkPlatform>JDK_16</netbeans.hint.jdkPlatform>
+        <netbeans.hint.jdkPlatform>JDK_17</netbeans.hint.jdkPlatform>
     </properties>
 </project-shared-configuration>