Update to latest version of DW (#98)

Author: machaval

.github/workflows/main.yml

@@ -17,10 +17,11 @@ jobs:
   BUILD:
     strategy:
       matrix:
-        os: [ ubuntu-latest, windows-latest, macos-latest ]
+#        os: [ ubuntu-latest, windows-latest, macos-latest ]
+        os: [ ubuntu-latest,  macos-latest ]
         include:
-          - os: windows-latest
-            script_name: windows
+#          - os: windows-latest
+#            script_name: windows
           - os: ubuntu-latest
             script_name: linux
           - os: macos-latest
@@ -29,51 +30,44 @@ jobs:
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
-      # Read graalvm version
-      - name: Read Graalvm version
-        run: |
-          echo "GRAALVM_VERSION=$(grep graalvmVersion gradle.properties | cut -d '=' -f2)" >> $GITHUB_ENV
-        shell: bash
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v3
 
       # Setup Graalvm
       - name: Setup Graalvm
         uses: graalvm/setup-graalvm@v1
         with:
-          version: ${{env.GRAALVM_VERSION}}
-          java-version: '11'
-          components: 'native-image'
+#          version: ${{env.GRAALVM_VERSION}}
+          java-version: '24'
+          distribution: 'graalvm'
           github-token: ${{ secrets.GITHUB_TOKEN }}
 
       # Runs a single command using the runners shell
       - name: Run Build
         run: |
-          ./gradlew --stacktrace build
+          ./gradlew --stacktrace  --no-problems-report  build
         shell: bash
       #Run regression tests
-      - name: Run regression test 2.7
+      - name: Run regression test 2.9.0
         run: |
-          ./gradlew --stacktrace -PweaveTestSuiteVersion=2.7.0-SNAPSHOT -DweaveSuiteVersion=2.7.0-SNAPSHOT native-cli-integration-tests:test
+          ./gradlew --stacktrace -PweaveTestSuiteVersion=2.9.0 -DweaveSuiteVersion=2.9.0 native-cli-integration-tests:test
         shell: bash
       #Run regression tests
-      - name: Run regression test 2.6
-        run: |
-          ./gradlew --stacktrace -PweaveTestSuiteVersion=2.6.1 -DweaveSuiteVersion=2.6.1 native-cli-integration-tests:test
-        shell: bash
-      - name: Run regression test 2.4
+      - name: Run regression test 2.10
         run: |
-          ./gradlew --stacktrace -PweaveTestSuiteVersion=2.4.0-HF-SNAPSHOT -DweaveSuiteVersion=2.4.0-HF-SNAPSHOT native-cli-integration-tests:test
+          ./gradlew --stacktrace -PweaveTestSuiteVersion=2.10.0 -DweaveSuiteVersion=2.10.0 native-cli-integration-tests:test
         shell: bash
-      
+
       # Generate distro
       - name: Create Distro
-        run: ./gradlew --stacktrace native-cli:distro
+        run: ./gradlew --stacktrace  --no-problems-report native-cli:distro
         shell: bash
 
       # Upload the artifact file
       - name: Upload generated script
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: dw-${{env.NATIVE_VERSION}}-${{runner.os}}
           path: native-cli/build/distributions/native-cli-${{env.NATIVE_VERSION}}-native-distro-${{ matrix.script_name }}.zip

.github/workflows/release.yml

@@ -38,7 +38,7 @@ jobs:
         uses: graalvm/setup-graalvm@v1
         with:
           version: ${{env.GRAALVM_VERSION}}
-          java-version: '11'
+          java-version: '24'
           components: 'native-image'
           github-token: ${{ secrets.GITHUB_TOKEN }}
 

build.gradle

@@ -11,16 +11,16 @@ subprojects {
     apply plugin: 'maven-publish'
     apply plugin: 'scala'
 
-    group 'org.mule.weave.native'
-    version nativeVersion
+    group = 'org.mule.weave.native'
+    version = nativeVersion
 
-    compileScala {
-        targetCompatibility = "11"
-        sourceCompatibility = "11"
-    }
+//    compileScala {
+//        targetCompatibility = "24"
+//        sourceCompatibility = "11"
+//    }
 
 
-    compileJava   {
+    compileJava {
         sourceCompatibility = '11'
         targetCompatibility = '11'
     }
@@ -29,22 +29,22 @@ subprojects {
 //        mavenLocal()
         mavenCentral()
         maven {
-            name "mule-releases"
-            url "https://repository.mulesoft.org/nexus/content/repositories/releases/"
+            name = "mule-releases"
+            url = "https://repository.mulesoft.org/nexus/content/repositories/releases/"
         }
         maven {
-            name "mule-snapshots"
-            url "https://repository.mulesoft.org/nexus/content/repositories/snapshots/"
+            name = "mule-snapshots"
+            url = "https://repository.mulesoft.org/nexus/content/repositories/snapshots/"
         }
         maven {
-            name "jitpack.io"
-            url "https://jitpack.io"
+            name = "jitpack.io"
+            url = "https://jitpack.io"
         }
         gradlePluginPortal()
     }
 
 
     dependencies {
-        implementation group: 'org.scala-lang', name: 'scala-library', version: scalaVersion
+        implementation "org.scala-lang:scala-library:${scalaVersion}"
     }
 }

gradle.properties

@@ -1,11 +1,12 @@
-weaveVersion=2.8.0-SNAPSHOT
-weaveTestSuiteVersion=2.8.0-SNAPSHOT
+weaveVersion=2.11.0-SNAPSHOT
+weaveTestSuiteVersion=2.11.0-SNAPSHOT
 nativeVersion=100.100.100
-scalaVersion=2.12.15
-ioVersion=1.0.0-SNAPSHOT
-graalvmVersion=22.3.3
+scalaVersion=2.12.18
+ioVersion=2.11.0-SNAPSHOT
+graalvmVersion=24.0.2
+weaveSuiteVersion=2.11.0-SNAPSHOT
 #Libaries
 scalaTestVersion=3.2.15
-scalaTestPluginVersion=0.32
+scalaTestPluginVersion=0.33
 
 #org.gradle.jvmargs=-Dfile.encoding=utf-8

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip

install-graalvm.sh

@@ -4,31 +4,33 @@ source gradle.properties
 
 graal_dir=.graalvm
 
+
+
 [[ $(uname -a) =~ Darwin ]] && os=darwin || os=linux
 
 setUpEnvironmentVariables() {
   echo "Setup GRAALVM_HOME and JAVA_HOME environment variables"  
   if [[ $os == darwin ]]
   then
-    export GRAALVM_HOME=${PWD}/${graal_dir}/graalvm-ce-java11-${graalvmVersion}/Contents/Home
+    export GRAALVM_HOME=${PWD}/${graal_dir}/graalvm-community-openjdk-${graalvmVersion}+11.1/Contents/Home
   else
-    export GRAALVM_HOME=${PWD}/${graal_dir}/graalvm-ce-java11-${graalvmVersion}
+    export GRAALVM_HOME=${PWD}/${graal_dir}/graalvm-community-openjdk-${graalvmVersion}+11.1
   fi
   export JAVA_HOME=${GRAALVM_HOME}
 }
 
-if [[ ! -d ${graal_dir}/graalvm-ce-java11-${graalvmVersion} ]]
+if [[ ! -d ${graal_dir}/graalvm-community-jdk-${graalvmVersion}_macos-x64_bin.tar.gz ]]
   then
-    graalvmDist=graalvm-ce-java11-${os}-amd64-${graalvmVersion}.tar.gz
+    graalvmDist=graalvm-community-jdk-${graalvmVersion}_macos-x64_bin.tar.gz
     echo "Installing GraalVM: ${graalvmDist}"
     mkdir -p ${graal_dir}
     pushd ${graal_dir}
-    curl -OL -A "Mozilla Chrome Safari" https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${graalvmVersion}/${graalvmDist}
+    curl -OL -A "Mozilla Chrome Safari" https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-${graalvmVersion}/${graalvmDist}
     tar xf ${graalvmDist}
     echo $graal_dir
     popd
-    setUpEnvironmentVariables
-    ${GRAALVM_HOME}/bin/gu install native-image
+
   else 
     echo "GraalVM already installed"
 fi
+setUpEnvironmentVariables

native-cli-integration-tests/build.gradle

@@ -17,28 +17,40 @@ sourceSets {
 dependencies {
     api(project(":native-cli"))
 
-    testImplementation group: 'org.mule.weave', name: 'parser', version: weaveVersion
-    testImplementation group: 'org.mule.weave', name: 'test-helpers', version: weaveVersion
-
     weaveSuite "org.mule.weave:runtime:${weaveTestSuiteVersion}:test@zip"
     weaveSuite "org.mule.weave:yaml-module:${weaveTestSuiteVersion}:test@zip"
-    testRuntimeOnly 'com.vladsch.flexmark:flexmark-all:0.62.2'
+    testRuntimeOnly 'com.vladsch.flexmark:flexmark-all:0.64.8'
+    // https://mvnrepository.com/artifact/org.scalatest/scalatest
+    testImplementation group: 'org.scalatest', name: 'scalatest_2.12', version: '3.2.19'
+
+    testImplementation "org.mule.weave:parser:${weaveVersion}"
+    testImplementation "org.mule.weave:test-helpers:${weaveVersion}"
     testImplementation 'commons-io:commons-io:2.11.0'
-    testImplementation group: 'com.sun.mail', name: 'jakarta.mail', version: '1.6.4'
-    testImplementation group: 'xerces', name: 'xercesImpl', version: '2.12.1'
-    testImplementation group: 'xalan', name: 'xalan', version: '2.7.2'
-    testImplementation group: 'commons-beanutils', name: 'commons-beanutils', version: '1.9.4'
+    testImplementation 'com.sun.mail:jakarta.mail:1.6.4'
+    testImplementation 'xerces:xercesImpl:2.12.1'
+    testImplementation 'xalan:xalan:2.7.2'
+    testImplementation 'commons-beanutils:commons-beanutils:1.9.4'
+    implementation group: 'com.sun.mail', name: 'jakarta.mail', version: '2.0.1'
 }
 
-task cleanTestSuites(type: Delete) {
+tasks.register('cleanTestSuites', Delete) {
     delete "$projectDir/build/resources/weave-suites"
 }
 
-task downloadTestSuites(type: Copy) {
+tasks.register('downloadTestSuites', Copy) {
     from configurations.weaveSuite
     into "$projectDir/build/resources/weave-suites"
 }
 
+tasks.named('processTestResources') {
+    dependsOn(downloadTestSuites)
+}
+
+tasks.named('processResources') {
+    dependsOn('processTestResources')
+}
+
+
 downloadTestSuites.dependsOn(cleanTestSuites)
 test.dependsOn(downloadTestSuites)
 test.dependsOn(":native-cli:nativeCompile")