From 5b832dbbfc045dcac8adaed63706e7613e3f6c9b Mon Sep 17 00:00:00 2001 From: Daylily-Zeleen Date: Sat, 2 Dec 2023 22:47:32 +0800 Subject: [PATCH] v2.1.7- for Godot 4.2 stable. Get rid of maintaining version in readme.md. --- .github/workflows/android_builds.yml | 7 +++++++ README.md | 2 +- README_zh_cn.md | 2 +- SConstruct | 2 +- demo/project.godot | 2 +- godot-cpp | 2 +- 6 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.github/workflows/android_builds.yml b/.github/workflows/android_builds.yml index 682e6d0..b5f76c9 100644 --- a/.github/workflows/android_builds.yml +++ b/.github/workflows/android_builds.yml @@ -21,12 +21,19 @@ jobs: - uses: actions/checkout@v4 with: submodules: true + - name: Set up Java 11 uses: actions/setup-java@v4 with: distribution: temurin java-version: 11 + - name: Android dependencies + uses: nttld/setup-ndk@v1 + with: + ndk-version: r23c + link-to-sdk: true + - name: Build ${{ matrix.target }} ${{ matrix.arch }} uses: ./.github/actions/build with: diff --git a/README.md b/README.md index d77def4..048d219 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -# GUS - Godot Universal Serializer 2.1.6 - Godot的通用序列化器 - V2.1.6(Godot 4.1 stable) +# GUS - Godot Universal Serializer 2 - Godot的通用序列化器2 ![Image text](icon.png) diff --git a/README_zh_cn.md b/README_zh_cn.md index 202a05d..cfdec17 100644 --- a/README_zh_cn.md +++ b/README_zh_cn.md @@ -1,5 +1,5 @@ -# GUS - Godot Universal Serializer 2.1.6 - Godot的通用序列化器 - V2.1.6(Godot 4.1 stable) +# GUS - Godot Universal Serializer 2 - Godot的通用序列化器2 ![Image text](icon.png) diff --git a/SConstruct b/SConstruct index cb5ae49..7d92a95 100644 --- a/SConstruct +++ b/SConstruct @@ -28,7 +28,7 @@ sources = Glob("src/*.cpp") if env["platform"] == "macos": library = env.SharedLibrary( - "dist/addons/com.daylily_zeleen.godot_universal_serializer2/bin/libgus2.{}.{}.framework/libguss.{}.{}".format( + "dist/addons/com.daylily_zeleen.godot_universal_serializer2/bin/libgus2.{}.{}.framework/libgus2.{}.{}".format( env["platform"], env["target"], env["platform"], env["target"] ), source=sources, diff --git a/demo/project.godot b/demo/project.godot index 62b81e7..f539afc 100644 --- a/demo/project.godot +++ b/demo/project.godot @@ -11,7 +11,7 @@ config_version=5 [application] config/name="GUS TEST" -config/features=PackedStringArray("4.1") +config/features=PackedStringArray("4.2") config/icon="res://icon.png" [dotnet] diff --git a/godot-cpp b/godot-cpp index 1009da4..54136ee 160000 --- a/godot-cpp +++ b/godot-cpp @@ -1 +1 @@ -Subproject commit 1009da4d7e395abadfdb454cff6623e9456181c4 +Subproject commit 54136ee8357c5140a3775c54f08db5f7deda2058