fix ci

Author: jan-br

.github/workflows/ci.yml

@@ -1,6 +1,6 @@
 name: CI
 on: [push]
- 
+
 jobs:
   build-binaries-unix:
     strategy:
@@ -65,8 +65,8 @@ jobs:
       - name: Upload artifacts
         uses: actions/upload-artifact@v1
         with:
-          name: native-binaries
-          path: artifacts
+          name: native-binaries-ultralight
+          path: native-binaries/ultralight
 
   build-jars:
     needs: [build-binaries-unix, build-binaries-windows]
@@ -86,19 +86,19 @@ jobs:
       - name: Download existing artifacts
         uses: actions/download-artifact@v1
         with:
-          name: native-binaries
-          path: native-binaries
+          name: native-binaries-ultralight
+          path: native-binaries/ultralight
       - name: Make gradlew executable
         run: "chmod +x gradlew"
       - name: Build base with gradle
-        run: "./gradlew -PCI=true -PnativeBinaryExternalDir=native-binaries ultralight-java-base:build"
+        run: "./gradlew -PCI=true -Pultralight-java.base.native-binaries-folder=native-binaries/ultralight ultralight-java-base:build"
       - name: Build lwjgl3-opengl example with gradle
-        run: "./gradlew -PCI=true -PnativeBinaryExternalDir=native-binaries example:lwjgl3-opengl:build"
+        run: "./gradlew -PCI=true -Pultralight-java.base.native-binaries-folder=native-binaries/ultralight example:lwjgl3-opengl:build"
       - name: Check license
         run: "./gradlew licenseCheck"
       - name: Deploy to OSSHR
         if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/develop'
-        run: "./gradlew -PCI=true -PenableSigning -PnativeBinaryExternalDir=native-binaries publish"
+        run: "./gradlew -PCI=true -PenableSigning -Pultralight-java.base.native-binaries-folder=native-binaries/ultralight publish"
         env:
           SIGNING_KEY: ${{ secrets.signingKey }}
           SIGNING_PASSWORD: ${{ secrets.signingPassword }}

ultralight-java-base/build.gradle

@@ -15,7 +15,7 @@ jar {
 
 processResources {
     dependsOn(':ultralight-java-native:build')
-    from(file(System.getProperties().getOrDefault("ultralight-java.base.native-binaries-folder", project(":ultralight-java-native").buildDir.toPath().toString() + "/nativeBinaries").toString())) {
+    from(file(project.getProperties().getOrDefault("ultralight-java.base.native-binaries-folder", project(":ultralight-java-native").buildDir.toPath().toString() + "/nativeBinaries").toString())) {
         into "native-binaries"
     }
 }

ultralight-java-gpu-native/build.gradle

@@ -33,7 +33,7 @@ task build(type: CMakeBuildTask) {
             ]
         }
 
-        def nativeBinariesDir = file(System.getProperties().getOrDefault("ultralight-java.gpu.native-binaries-folder", "$buildDir/nativeBinaries").toString())
+        def nativeBinariesDir = file(project.getProperties().getOrDefault("ultralight-java.gpu.native-binaries-folder", "$buildDir/nativeBinaries").toString())
         variables = [
                 "CMAKE_BUILD_TYPE"              : java.util.Optional.of("Release"),
                 "CMAKE_RUNTIME_OUTPUT_DIRECTORY": java.util.Optional.of(nativeBinariesDir.absolutePath),

ultralight-java-gpu/build.gradle

@@ -15,7 +15,7 @@ jar {
 
 processResources {
     dependsOn(':ultralight-java-gpu-native:build')
-    from(file(System.getProperties().getOrDefault("ultralight-java.gpu.native-binaries-folder", project(":ultralight-java-gpu-native").buildDir.toPath().toString() + "/nativeBinaries").toString())) {
+    from(file(project.getProperties().getOrDefault("ultralight-java.gpu.native-binaries-folder", project(":ultralight-java-gpu-native").buildDir.toPath().toString() + "/nativeBinaries").toString())) {
         into "native-binaries"
     }
 }

ultralight-java-native/build.gradle

@@ -34,7 +34,7 @@ task build(type: CMakeBuildTask) {
         }
 
 
-        def nativeBinariesDir = file(System.getProperties().getOrDefault("ultralight-java.base.native-binaries-folder", "$buildDir/nativeBinaries").toString())
+        def nativeBinariesDir = file(project.getProperties().getOrDefault("ultralight-java.base.native-binaries-folder", "$buildDir/nativeBinaries").toString())
         variables = [
                 "CMAKE_BUILD_TYPE"              : java.util.Optional.of("Release"),
                 "CMAKE_RUNTIME_OUTPUT_DIRECTORY": java.util.Optional.of(nativeBinariesDir.absolutePath),