From 8a4bec142831368f5782a42e19adbe1954d47fe9 Mon Sep 17 00:00:00 2001 From: Christoph Pader Date: Thu, 9 Oct 2025 12:21:17 +0100 Subject: [PATCH 1/5] chore: add .ruby-version file and update version in GH workflow --- .github/workflows/build-ios.yml | 4 ++-- example/.ruby-version | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 example/.ruby-version diff --git a/.github/workflows/build-ios.yml b/.github/workflows/build-ios.yml index 32ab4496..0db60984 100644 --- a/.github/workflows/build-ios.yml +++ b/.github/workflows/build-ios.yml @@ -48,7 +48,7 @@ jobs: - name: Setup Ruby (bundle) uses: ruby/setup-ruby@v1 with: - ruby-version: 2.7.2 + ruby-version: 3.3.0 bundler-cache: true working-directory: example/ios @@ -95,7 +95,7 @@ jobs: - name: Setup Ruby (bundle) uses: ruby/setup-ruby@v1 with: - ruby-version: 2.7.2 + ruby-version: 3.3.0 bundler-cache: true working-directory: example/ios diff --git a/example/.ruby-version b/example/.ruby-version new file mode 100644 index 00000000..15a27998 --- /dev/null +++ b/example/.ruby-version @@ -0,0 +1 @@ +3.3.0 From 5d293c07328e91dc614713805c86272428cb1db2 Mon Sep 17 00:00:00 2001 From: Christoph Pader Date: Thu, 9 Oct 2025 12:21:49 +0100 Subject: [PATCH 2/5] fix: add `pragma once` to `logs.hpp` --- package/cpp/logs.hpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/cpp/logs.hpp b/package/cpp/logs.hpp index c6036225..9655e317 100644 --- a/package/cpp/logs.hpp +++ b/package/cpp/logs.hpp @@ -1,7 +1,10 @@ +#pragma once + +#define LOG_TAG "react-native-nitro-sqlite" + #ifdef ANDROID // LOGS ANDROID #include -#define LOG_TAG "react-native-nitro-sqlite" #define LOGV(...) __android_log_print(ANDROID_LOG_VERBOSE, LOG_TAG, __VA_ARGS__) #define LOGD(...) __android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, __VA_ARGS__) #define LOGI(...) __android_log_print(ANDROID_LOG_INFO, LOG_TAG, __VA_ARGS__) @@ -11,7 +14,6 @@ #else // LOGS NO ANDROID #include -#define LOG_TAG "react-native-nitro-sqlite" #define LOGV(...) \ printf(" "); \ printf(__VA_ARGS__); \ From d9993a7c37d18bda78894d00d1b8f8b7e382a031 Mon Sep 17 00:00:00 2001 From: Christoph Pader Date: Thu, 9 Oct 2025 12:21:57 +0100 Subject: [PATCH 3/5] fix: remove unused variables --- package/cpp/operations.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/cpp/operations.cpp b/package/cpp/operations.cpp index 5973deeb..38d4a141 100644 --- a/package/cpp/operations.cpp +++ b/package/cpp/operations.cpp @@ -256,7 +256,7 @@ SQLiteOperationResult sqliteExecuteLiteral(const std::string& dbName, const std: bool isConsuming = true; bool isFailed = false; - int result, i, count, column_type; + int result; std::string column_name; while (isConsuming) { From 1b171f7450b3f6806f39f2a5606d628bb79c2899 Mon Sep 17 00:00:00 2001 From: Christoph Pader Date: Thu, 9 Oct 2025 12:26:03 +0100 Subject: [PATCH 4/5] chore: rename LOG_TAG --- package/android/CMakeLists.txt | 2 +- package/cpp/logs.hpp | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/package/android/CMakeLists.txt b/package/android/CMakeLists.txt index adff9c50..5f58f93a 100644 --- a/package/android/CMakeLists.txt +++ b/package/android/CMakeLists.txt @@ -66,7 +66,7 @@ endif() target_compile_options( ${CMAKE_PROJECT_NAME} PRIVATE - -DLOG_TAG=\"ReactNative\" + -DNITRO_SQLITE_LOG_TAG=\"ReactNative\" -fexceptions -frtti -fstack-protector-all diff --git a/package/cpp/logs.hpp b/package/cpp/logs.hpp index 9655e317..ca5000c1 100644 --- a/package/cpp/logs.hpp +++ b/package/cpp/logs.hpp @@ -1,15 +1,15 @@ #pragma once -#define LOG_TAG "react-native-nitro-sqlite" +#define NITRO_SQLITE_LOG_TAG "react-native-nitro-sqlite" #ifdef ANDROID // LOGS ANDROID #include -#define LOGV(...) __android_log_print(ANDROID_LOG_VERBOSE, LOG_TAG, __VA_ARGS__) -#define LOGD(...) __android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, __VA_ARGS__) -#define LOGI(...) __android_log_print(ANDROID_LOG_INFO, LOG_TAG, __VA_ARGS__) -#define LOGW(...) __android_log_print(ANDROID_LOG_WARN, LOG_TAG, __VA_ARGS__) -#define LOGE(...) __android_log_print(ANDROID_LOG_ERROR, LOG_TAG, __VA_ARGS__) +#define LOGV(...) __android_log_print(ANDROID_LOG_VERBOSE, NITRO_SQLITE_LOG_TAG, __VA_ARGS__) +#define LOGD(...) __android_log_print(ANDROID_LOG_DEBUG, NITRO_SQLITE_LOG_TAG, __VA_ARGS__) +#define LOGI(...) __android_log_print(ANDROID_LOG_INFO, NITRO_SQLITE_LOG_TAG, __VA_ARGS__) +#define LOGW(...) __android_log_print(ANDROID_LOG_WARN, NITRO_SQLITE_LOG_TAG, __VA_ARGS__) +#define LOGE(...) __android_log_print(ANDROID_LOG_ERROR, NITRO_SQLITE_LOG_TAG, __VA_ARGS__) #define LOGSIMPLE(...) #else // LOGS NO ANDROID @@ -17,23 +17,23 @@ #define LOGV(...) \ printf(" "); \ printf(__VA_ARGS__); \ - printf("\t - <%s> \n", LOG_TAG); + printf("\t - <%s> \n", NITRO_SQLITE_LOG_TAG); #define LOGD(...) \ printf(" "); \ printf(__VA_ARGS__); \ - printf("\t - <%s> \n", LOG_TAG); + printf("\t - <%s> \n", NITRO_SQLITE_LOG_TAG); #define LOGI(...) \ printf(" "); \ printf(__VA_ARGS__); \ - printf("\t - <%s> \n", LOG_TAG); + printf("\t - <%s> \n", NITRO_SQLITE_LOG_TAG); #define LOGW(...) \ printf(" * Warning: "); \ printf(__VA_ARGS__); \ - printf("\t - <%s> \n", LOG_TAG); + printf("\t - <%s> \n", NITRO_SQLITE_LOG_TAG); #define LOGE(...) \ printf(" *** Error: "); \ printf(__VA_ARGS__); \ - printf("\t - <%s> \n", LOG_TAG); + printf("\t - <%s> \n", NITRO_SQLITE_LOG_TAG); #define LOGSIMPLE(...) \ printf(" "); \ printf(__VA_ARGS__); From d46f5edd1da71a03af056caaf4c704dce8e32406 Mon Sep 17 00:00:00 2001 From: Christoph Pader Date: Tue, 4 Nov 2025 11:57:51 +0000 Subject: [PATCH 5/5] remove LOG_TAG from CMakeLists.txt --- package/android/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/package/android/CMakeLists.txt b/package/android/CMakeLists.txt index 5f58f93a..977104b8 100644 --- a/package/android/CMakeLists.txt +++ b/package/android/CMakeLists.txt @@ -66,7 +66,6 @@ endif() target_compile_options( ${CMAKE_PROJECT_NAME} PRIVATE - -DNITRO_SQLITE_LOG_TAG=\"ReactNative\" -fexceptions -frtti -fstack-protector-all