Merge pull request #77 from epam/mrjar

Speedups

.github/workflows/Build.yml

@@ -146,18 +146,22 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: 'adopt'
-          java-version: '8'
+          java-version: '19'
       - name: build
         run: |
           ./gradlew jar
           ./gradlew javadocJar
+          ./gradlew copyTestJars
       - uses: actions/upload-artifact@v3
         with:
           name: java-jars
           path: |
             ./*java/dfp/build/libs/*
             ./*java/dfp-math/build/libs/*
-            ./*java/decimalDemo/build/libs/*
+            ./*java/dfp/testLibs/*
+            ./*java/dfp-math/testLibs/*
+            ./*java/dfpNativeTests/testLibs/*
+            ./*java/vtaTest/testLibs/*
           retention-days: 7
 
   build-dotnet:
@@ -190,20 +194,20 @@ jobs:
 
   test-java:
     runs-on: ${{ matrix.os }}
-    needs: [compress-native]
+    needs: [build-java]
     strategy:
       fail-fast: false
       matrix:
         os: [ 'ubuntu-latest', 'windows-2019', 'macos-latest']
-        java: [ '8', '11', '15']
+        java: [ '8', '11', '19']
     steps:
       - uses: actions/checkout@v3
         with:
           submodules: 'recursive'
-      - name: Download compress-native artifacts
+      - name: Download java-jars artifacts
         uses: actions/download-artifact@v3
         with:
-          name: compress-native
+          name: java-jars
       - name: Setup java
         uses: actions/setup-java@v3
         with:
@@ -214,15 +218,7 @@ jobs:
           ./gradlew :java:systemInfo:runSystemInfo
       - name: test
         run: |
-          ./gradlew check
-      - name: Upload test results on failure
-        uses: actions/upload-artifact@v3
-        if: ${{ failure() }}
-        with:
-          path: |
-            java/dfp/build/reports/*
-            java/dfp-math/build/reports/*
-          name: Java-{{ matrix.java }}-${{ matrix.os }}-TestReports
+          ./gradlew runTestJars
 
   test-dotnet:
     runs-on: ${{ matrix.os }}

.github/workflows/CI.yml

@@ -190,18 +190,22 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: 'adopt'
-          java-version: '8'
+          java-version: '19'
       - name: build
         run: |
           ./gradlew jar
           ./gradlew javadocJar
+          ./gradlew copyTestJars
       - uses: actions/upload-artifact@v3
         with:
           name: java-jars
           path: |
             ./*java/dfp/build/libs/*
             ./*java/dfp-math/build/libs/*
-            ./*java/decimalDemo/build/libs/*
+            ./*java/dfp/testLibs/*
+            ./*java/dfp-math/testLibs/*
+            ./*java/dfpNativeTests/testLibs/*
+            ./*java/vtaTest/testLibs/*
           retention-days: 7
 
 
@@ -236,15 +240,15 @@ jobs:
 
   test-java:
     runs-on: ubuntu-latest
-    needs: [compress-native]
+    needs: [build-java]
     steps:
       - uses: actions/checkout@v3
         with:
           submodules: 'recursive'
-      - name: Download compress-native artifacts
+      - name: Download java-jars artifacts
         uses: actions/download-artifact@v3
         with:
-          name: compress-native
+          name: java-jars
       - name: Setup java
         uses: actions/setup-java@v3
         with:
@@ -255,7 +259,7 @@ jobs:
           ./gradlew :java:systemInfo:runSystemInfo
       - name: test
         run: |
-          ./gradlew check
+          ./gradlew runTestJars
 
 
   test-dotnet:

gradle.properties

@@ -1,2 +1,2 @@
-version=0.12.11-SNAPSHOT
+version=1.0.0-SNAPSHOT
 valueTypesVersion=0.9.4

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

java/dfp-math/build.gradle

@@ -9,11 +9,7 @@ if (isReleaseVersion) {
 
 group = 'com.epam.deltix'
 
-sourceCompatibility = 1.7
-compileTestJava {
-    sourceCompatibility = "1.8"
-    targetCompatibility = "1.8"
-}
+sourceCompatibility = 8
 
 repositories {
     mavenCentral()
@@ -134,3 +130,30 @@ jar {
 sourcesJar {
     duplicatesStrategy = DuplicatesStrategy.EXCLUDE
 }
+
+task testsJar(type: Jar, dependsOn: [jar, testClasses, processTestResources]) {
+    archiveClassifier = 'tests'
+    from sourceSets.test.output
+}
+
+task copyTestDeps(type: Copy) {
+    from(sourceSets.test.runtimeClasspath) { include '*.jar' }
+    into('testLibs')
+}
+
+task copyTestJars(type: Copy, dependsOn: [testsJar, copyTestDeps]) {
+    from(jar.outputs.files)
+    from(testsJar.outputs.files)
+    into('testLibs')
+}
+
+task runTestJars(type: JavaExec) {
+    mainClass = 'org.junit.runner.JUnitCore'
+    classpath = files { file('testLibs').listFiles() }
+
+    def testClassesRoot = file('src/test/java').absolutePath
+    fileTree(dir: testClassesRoot, include: '**/*Test.java').each { File file ->
+        def ap = file.absolutePath
+        args += ap.substring(testClassesRoot.length() + 1, ap.length() - 5).replace(File.separator, '.')
+    }
+}

java/dfp/build.gradle

@@ -9,10 +9,37 @@ if (isReleaseVersion) {
 
 group = 'com.epam.deltix'
 
-sourceCompatibility = 1.7
+sourceSets {
+    java9 {
+        java {
+            srcDirs = ['src/main/java9']
+        }
+    }
+
+    java18 {
+        java {
+            srcDirs = ['src/main/java18']
+        }
+    }
+}
+
+compileJava {
+    sourceCompatibility = 1.7
+    targetCompatibility = 1.7
+}
 compileTestJava {
-    sourceCompatibility = "1.8"
-    targetCompatibility = "1.8"
+    sourceCompatibility = 8
+    targetCompatibility = 8
+}
+
+compileJava9Java {
+    sourceCompatibility = 9
+    targetCompatibility = 9
+}
+
+compileJava18Java {
+    sourceCompatibility = 18
+    targetCompatibility = 18
 }
 
 repositories {
@@ -25,6 +52,9 @@ java {
 }
 
 dependencies {
+    java9Implementation files(sourceSets.main.output.classesDirs) { builtBy compileJava }
+    java18Implementation files(sourceSets.main.output.classesDirs) { builtBy compileJava }
+
     testImplementation project(':java:testUtils')
     testImplementation 'junit:junit:4.+'
     testImplementation 'org.apache.commons:commons-math3:3.6.1'
@@ -97,8 +127,15 @@ if (isReleaseVersion) {
 }
 
 jar {
+    into('META-INF/versions/9') {
+        from sourceSets.java9.output
+    }
+    into('META-INF/versions/18') {
+        from sourceSets.java18.output
+    }
     manifest {
-        attributes 'Implementation-Title': 'Deltix Decimal Floating-Point Arithmetic Library',
+        attributes 'Multi-Release': 'true',
+            'Implementation-Title': 'Deltix Decimal Floating-Point Arithmetic Library',
             'Implementation-Version': archiveVersion,
             'Main-Class': 'com.epam.deltix.dfp.Demo'
     }
@@ -110,3 +147,29 @@ jar {
     }
 }
 
+task testsJar(type: Jar, dependsOn: [jar, testClasses, processTestResources]) {
+    archiveClassifier = 'tests'
+    from sourceSets.test.output
+}
+
+task copyTestDeps(type: Copy) {
+    from(sourceSets.test.runtimeClasspath) { include '*.jar' }
+    into('testLibs')
+}
+
+task copyTestJars(type: Copy, dependsOn: [testsJar, copyTestDeps]) {
+    from(jar.outputs.files)
+    from(testsJar.outputs.files)
+    into('testLibs')
+}
+
+task runTestJars(type: JavaExec) {
+    mainClass = 'org.junit.runner.JUnitCore'
+    classpath = files { file('testLibs').listFiles() }
+
+    def testClassesRoot = file('src/test/java').absolutePath
+    fileTree(dir: testClassesRoot, include: '**/*Test.java').each { File file ->
+        def ap = file.absolutePath
+        args += ap.substring(testClassesRoot.length() + 1, ap.length() - 5).replace(File.separator, '.')
+    }
+}