Merge pull request #10 from defold/update-to-latest-sdk-20240521

Update to latest sdk 20240521
defold · May 22, 2024 · 8e2c51c · 8e2c51c
2 parents 1003a0e + c0c4191
commit 8e2c51c
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 12 deletions.
diff --git a/.github/workflows/bob.yml b/.github/workflows/bob.yml
@@ -5,7 +5,7 @@ on: [push, pull_request]
 env:
   VERSION_FILENAME: 'info.json'
   BUILD_SERVER: 'https://build-stage.defold.com'
-  CHANNEL: 'beta'
+  CHANNEL: 'alpha'
 
 jobs:
   build_with_bob:
@@ -17,9 +17,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: |
@@ -60,9 +62,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: |
@@ -87,15 +91,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: |

diff --git a/defold-simpledata/plugins/share/pluginSimpleDataExt.jar b/defold-simpledata/plugins/share/pluginSimpleDataExt.jar
diff --git a/defold-simpledata/src/comp_simple_data.cpp b/defold-simpledata/src/comp_simple_data.cpp
@@ -91,7 +91,7 @@ namespace dmSimpleData
     static void* CompSimpleDataGetComponent(const dmGameObject::ComponentGetParams& params)
     {
         SimpleDataWorld* world = (SimpleDataWorld*)params.m_World;
-        uint32_t index = (uint32_t)*params.m_UserData;
+        uint32_t index = (uint32_t) params.m_UserData;
         return GetComponentFromIndex(world, index);
     }
 

diff --git a/defold-simpledata/src/extension.cpp b/defold-simpledata/src/extension.cpp
@@ -26,7 +26,7 @@ static const char* SIMPLEDATA_EXT = "simpledatac";
 static int SimpleDataComp_GetArrayF32(lua_State* L)
 {
     dmSimpleData::SimpleDataComponent* component = 0;
-    dmGameObject::GetComponentFromLua(L, 1, SIMPLEDATA_EXT, 0, (void**)&component, 0);
+    dmScript::GetComponentFromLua(L, 1, SIMPLEDATA_EXT, 0, (void**)&component, 0);
     assert(component);
 
     float* data    = 0;

diff --git a/utils/build_plugins.sh b/utils/build_plugins.sh
@@ -7,7 +7,7 @@ set -e
 PROJECT=defold-simpledata
 
 if [ "" == "${BOB}" ]; then
-    BOB=~/work/defold/tmp/dynamo_home/share/java/bob.jar
+    BOB=${DYNAMO_HOME}/share/java/bob.jar
 fi
 
 echo "Using BOB=${BOB}"
@@ -81,7 +81,7 @@ function build_plugin() {
 
 PLATFORMS=$1
 if [ "" == "${PLATFORM}" ]; then
-    PLATFORMS="x86_64-macos x86_64-linux x86_64-win32"
+    PLATFORMS="arm64-macos x86_64-macos x86_64-linux x86_64-win32"
 fi
 
 if [[ $# -gt 0 ]] ; then
@@ -98,6 +98,10 @@ for platform in $PLATFORMS; do
         platform_ne="x86_64-osx"
     fi
 
+    if [ "$platform" == "arm64-macos" ]; then
+        platform_ne="arm64-osx"
+    fi
+
     build_plugin $platform $platform_ne
 done