diff --git a/docs/retype.yml b/docs/retype.yml index dffb6bc1..95083190 100644 --- a/docs/retype.yml +++ b/docs/retype.yml @@ -3,7 +3,7 @@ output: .retype url: https://pocketpy.dev branding: title: pocketpy - label: v2.1.5 + label: v2.1.6 logo: "./static/logo.png" favicon: "./static/logo.png" meta: diff --git a/include/pocketpy/config.h b/include/pocketpy/config.h index a36b3d52..2fc917e5 100644 --- a/include/pocketpy/config.h +++ b/include/pocketpy/config.h @@ -1,10 +1,10 @@ #pragma once // clang-format off -#define PK_VERSION "2.1.5" +#define PK_VERSION "2.1.6" #define PK_VERSION_MAJOR 2 #define PK_VERSION_MINOR 1 -#define PK_VERSION_PATCH 5 +#define PK_VERSION_PATCH 6 /*************** feature settings ***************/ #ifndef PK_ENABLE_OS // can be overridden by cmake diff --git a/plugins/flutter/pocketpy/ios/pocketpy.podspec b/plugins/flutter/pocketpy/ios/pocketpy.podspec index 6b5cd5d3..e35ca07a 100644 --- a/plugins/flutter/pocketpy/ios/pocketpy.podspec +++ b/plugins/flutter/pocketpy/ios/pocketpy.podspec @@ -35,7 +35,7 @@ A new Flutter FFI plugin project. s.prepare_command = <<-CMD rm -rf pocketpy - git clone --branch v2.1.5 --depth 1 https://github.com/pocketpy/pocketpy.git + git clone --branch v2.1.6 --depth 1 https://github.com/pocketpy/pocketpy.git cd pocketpy git submodule update --init --recursive --depth 1 bash build_ios_libs.sh diff --git a/plugins/flutter/pocketpy/lib/pocketpy_bindings_generated.dart b/plugins/flutter/pocketpy/lib/pocketpy_bindings_generated.dart index bf9d9ea1..a3b7fc1a 100644 --- a/plugins/flutter/pocketpy/lib/pocketpy_bindings_generated.dart +++ b/plugins/flutter/pocketpy/lib/pocketpy_bindings_generated.dart @@ -3865,6 +3865,24 @@ class PocketpyBindings { late final _py_profiler_report = _py_profiler_reportPtr.asFunction Function()>(); + /// Others + int time_ns() { + return _time_ns(); + } + + late final _time_nsPtr = + _lookup>('time_ns'); + late final _time_ns = _time_nsPtr.asFunction(); + + int time_monotonic_ns() { + return _time_monotonic_ns(); + } + + late final _time_monotonic_nsPtr = + _lookup>('time_monotonic_ns'); + late final _time_monotonic_ns = + _time_monotonic_nsPtr.asFunction(); + /// An utility function to read a line from stdin for REPL. int py_replinput( ffi.Pointer buf, @@ -4101,6 +4119,9 @@ final class c11_color32 extends ffi.Union { @ffi.Array.multi([4]) external ffi.Array data; + + @ffi.Uint32() + external int u32; } final class UnnamedStruct5 extends ffi.Struct { @@ -4252,18 +4273,35 @@ abstract class py_PredefinedType { static const int tp_AssertionError = 53; static const int tp_KeyError = 54; + /// stdc + static const int tp_stdc_Memory = 55; + static const int tp_stdc_Char = 56; + static const int tp_stdc_UChar = 57; + static const int tp_stdc_Short = 58; + static const int tp_stdc_UShort = 59; + static const int tp_stdc_Int = 60; + static const int tp_stdc_UInt = 61; + static const int tp_stdc_Long = 62; + static const int tp_stdc_ULong = 63; + static const int tp_stdc_LongLong = 64; + static const int tp_stdc_ULongLong = 65; + static const int tp_stdc_Float = 66; + static const int tp_stdc_Double = 67; + static const int tp_stdc_Pointer = 68; + static const int tp_stdc_Bool = 69; + /// vmath - static const int tp_vec2 = 55; - static const int tp_vec3 = 56; - static const int tp_vec2i = 57; - static const int tp_vec3i = 58; - static const int tp_mat3x3 = 59; - static const int tp_color32 = 60; + static const int tp_vec2 = 70; + static const int tp_vec3 = 71; + static const int tp_vec2i = 72; + static const int tp_vec3i = 73; + static const int tp_mat3x3 = 74; + static const int tp_color32 = 75; /// array2d - static const int tp_array2d_like = 61; - static const int tp_array2d_like_iterator = 62; - static const int tp_array2d = 63; - static const int tp_array2d_view = 64; - static const int tp_chunked_array2d = 65; + static const int tp_array2d_like = 76; + static const int tp_array2d_like_iterator = 77; + static const int tp_array2d = 78; + static const int tp_array2d_view = 79; + static const int tp_chunked_array2d = 80; } diff --git a/plugins/flutter/pocketpy/macos/pocketpy.podspec b/plugins/flutter/pocketpy/macos/pocketpy.podspec index 5cb0c5cf..00defef9 100644 --- a/plugins/flutter/pocketpy/macos/pocketpy.podspec +++ b/plugins/flutter/pocketpy/macos/pocketpy.podspec @@ -32,7 +32,7 @@ A new Flutter FFI plugin project. s.prepare_command = <<-CMD rm -rf pocketpy - git clone --branch v2.1.5 --depth 1 https://github.com/pocketpy/pocketpy.git + git clone --branch v2.1.6 --depth 1 https://github.com/pocketpy/pocketpy.git cd pocketpy git submodule update --init --recursive --depth 1 bash build_darwin_libs.sh diff --git a/plugins/flutter/pocketpy/pubspec.yaml b/plugins/flutter/pocketpy/pubspec.yaml index ad2477c1..575994b3 100644 --- a/plugins/flutter/pocketpy/pubspec.yaml +++ b/plugins/flutter/pocketpy/pubspec.yaml @@ -1,6 +1,6 @@ name: pocketpy description: A lightweight Python interpreter for game engines. It supports Android/iOS/Windows/Linux/MacOS. -version: 2.1.5 +version: 2.1.6 homepage: https://pocketpy.dev repository: https://github.com/pocketpy/pocketpy diff --git a/plugins/flutter/pocketpy/src/CMakeLists.txt b/plugins/flutter/pocketpy/src/CMakeLists.txt index 7cc33d98..aa673595 100644 --- a/plugins/flutter/pocketpy/src/CMakeLists.txt +++ b/plugins/flutter/pocketpy/src/CMakeLists.txt @@ -21,7 +21,7 @@ set(PK_BUILD_SHARED_LIB ON CACHE BOOL "" FORCE) FetchContent_Declare( pocketpy GIT_REPOSITORY https://github.com/pocketpy/pocketpy.git - GIT_TAG v2.1.5 + GIT_TAG v2.1.6 ) FetchContent_MakeAvailable(pocketpy)