Rebuilt pipeline plugins with Java 17

defold · Jul 3, 2023 · ba439d5 · ba439d5
1 parent 7458cdb
commit ba439d5
Show file tree

Hide file tree

Showing 13 changed files with 63 additions and 21 deletions.
diff --git a/.github/workflows/bob.yml b/.github/workflows/bob.yml
@@ -23,9 +23,11 @@ jobs:
     name: Build
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-java@v1
+      - uses: actions/setup-java@v3
         with:
-          java-version: '16.0.1'
+          java-version: '17.0.5+8'
+          architecture: x64
+          distribution: 'temurin'
 
       - name: Get Defold version
         run: |
@@ -66,9 +68,11 @@ jobs:
     name: Build
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-java@v1
+      - uses: actions/setup-java@v3
         with:
-          java-version: '16.0.1'
+          java-version: '17.0.5+8'
+          architecture: x64
+          distribution: 'temurin'
 
       - name: Get Defold version
         run: |
@@ -93,15 +97,17 @@ jobs:
   build_with_bob_macos:
     strategy:
       matrix:
-        platform: [arm64-darwin, x86_64-darwin]
+        platform: [arm64-macos, x86_64-macos]
     runs-on: macOS-latest
 
     name: Build
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-java@v1
+      - uses: actions/setup-java@v3
         with:
-          java-version: '16.0.1'
+          java-version: '17.0.5+8'
+          architecture: x64
+          distribution: 'temurin'
 
       - name: Get Defold version
         run: |
@@ -117,6 +123,6 @@ jobs:
       - name: Resolve libraries
         run: java -jar bob.jar resolve --email [email protected] --auth 123456
       - name: Build
-        run: java -jar bob.jar --platform=${{ matrix.platform }} build --archive --build-server=${{env.BUILD_SERVER}}
+        run: java -jar bob.jar --platform=x86_64-macos --architectures=${{ matrix.platform }} build --archive --build-server=${{env.BUILD_SERVER}}
       - name: Bundle
-        run: java -jar bob.jar --platform=${{ matrix.platform }} bundle
+        run: java -jar bob.jar --platform=x86_64-macos --architectures=${{ matrix.platform }} bundle
diff --git a/defold-rive/ext.manifest b/defold-rive/ext.manifest
@@ -17,7 +17,7 @@ platforms:
             cxxShFlags:     ["-std=c++17", "-fno-rtti"]
             cxxLinkShFlags: ["-std=c++17"]
 
-    x86_64-osx:
+    osx:
         context:
             flags:      ["-std=c++17", "-fno-rtti"]
 

diff --git a/defold-rive/include/jni/jni.h b/defold-rive/include/jni/jni.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1871,6 +1871,20 @@ struct JNIEnv_ {
 #endif /* __cplusplus */
 };
 
+/*
+ * optionString may be any option accepted by the JVM, or one of the
+ * following:
+ *
+ * -D<name>=<value>          Set a system property.
+ * -verbose[:class|gc|jni]   Enable verbose output, comma-separated. E.g.
+ *                           "-verbose:class" or "-verbose:gc,class"
+ *                           Standard names include: gc, class, and jni.
+ *                           All nonstandard (VM-specific) names must begin
+ *                           with "X".
+ * vfprintf                  extraInfo is a pointer to the vfprintf hook.
+ * exit                      extraInfo is a pointer to the exit hook.
+ * abort                     extraInfo is a pointer to the abort hook.
+ */
 typedef struct JavaVMOption {
     char *optionString;
     void *extraInfo;

diff --git a/defold-rive/include/linux/jni_md.h b/defold-rive/include/linux/jni_md.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,16 +29,26 @@
 #ifndef __has_attribute
   #define __has_attribute(x) 0
 #endif
+
+#ifndef JNIEXPORT
+  #if (defined(__GNUC__) && ((__GNUC__ > 4) || (__GNUC__ == 4) && (__GNUC_MINOR__ > 2))) || __has_attribute(visibility)
+    #ifdef ARM
+      #define JNIEXPORT     __attribute__((externally_visible,visibility("default")))
+    #else
+      #define JNIEXPORT     __attribute__((visibility("default")))
+    #endif
+  #else
+    #define JNIEXPORT
+  #endif
+#endif
+
 #if (defined(__GNUC__) && ((__GNUC__ > 4) || (__GNUC__ == 4) && (__GNUC_MINOR__ > 2))) || __has_attribute(visibility)
   #ifdef ARM
-    #define JNIEXPORT     __attribute__((externally_visible,visibility("default")))
     #define JNIIMPORT     __attribute__((externally_visible,visibility("default")))
   #else
-    #define JNIEXPORT     __attribute__((visibility("default")))
     #define JNIIMPORT     __attribute__((visibility("default")))
   #endif
 #else
-  #define JNIEXPORT
   #define JNIIMPORT
 #endif
 

diff --git a/defold-rive/include/osx/jni_md.h b/defold-rive/include/osx/jni_md.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,16 +29,26 @@
 #ifndef __has_attribute
   #define __has_attribute(x) 0
 #endif
+
+#ifndef JNIEXPORT
+  #if (defined(__GNUC__) && ((__GNUC__ > 4) || (__GNUC__ == 4) && (__GNUC_MINOR__ > 2))) || __has_attribute(visibility)
+    #ifdef ARM
+      #define JNIEXPORT     __attribute__((externally_visible,visibility("default")))
+    #else
+      #define JNIEXPORT     __attribute__((visibility("default")))
+    #endif
+  #else
+    #define JNIEXPORT
+  #endif
+#endif
+
 #if (defined(__GNUC__) && ((__GNUC__ > 4) || (__GNUC__ == 4) && (__GNUC_MINOR__ > 2))) || __has_attribute(visibility)
   #ifdef ARM
-    #define JNIEXPORT     __attribute__((externally_visible,visibility("default")))
     #define JNIIMPORT     __attribute__((externally_visible,visibility("default")))
   #else
-    #define JNIEXPORT     __attribute__((visibility("default")))
     #define JNIIMPORT     __attribute__((visibility("default")))
   #endif
 #else
-  #define JNIEXPORT
   #define JNIIMPORT
 #endif
 

diff --git a/defold-rive/include/win32/jni_md.h b/defold-rive/include/win32/jni_md.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 1998, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,9 @@
 #ifndef _JAVASOFT_JNI_MD_H_
 #define _JAVASOFT_JNI_MD_H_
 
-#define JNIEXPORT __declspec(dllexport)
+#ifndef JNIEXPORT
+  #define JNIEXPORT __declspec(dllexport)
+#endif
 #define JNIIMPORT __declspec(dllimport)
 #define JNICALL __stdcall
 

diff --git a/defold-rive/lib/arm64-osx/librivecpp.a b/defold-rive/lib/arm64-osx/librivecpp.a
diff --git a/defold-rive/lib/arm64-osx/librivetess.a b/defold-rive/lib/arm64-osx/librivetess.a
diff --git a/defold-rive/lib/arm64-osx/libtess2.a b/defold-rive/lib/arm64-osx/libtess2.a
diff --git a/defold-rive/plugins/lib/x86_64-linux/libRiveExt.so b/defold-rive/plugins/lib/x86_64-linux/libRiveExt.so
diff --git a/defold-rive/plugins/lib/x86_64-osx/libRiveExt.dylib b/defold-rive/plugins/lib/x86_64-osx/libRiveExt.dylib
diff --git a/defold-rive/plugins/lib/x86_64-win32/libRiveExt.dll b/defold-rive/plugins/lib/x86_64-win32/libRiveExt.dll
diff --git a/defold-rive/plugins/share/pluginRiveExt.jar b/defold-rive/plugins/share/pluginRiveExt.jar