Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .clang-format
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
BasedOnStyle: LLVM
IndentWidth: 4
# IndentWidth: 4
# AlignEscapedNewlines: Left
# IndentPPDirectives: BeforeHash
# IndentPPDirectives: AfterHash
4 changes: 2 additions & 2 deletions .github/actions/setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ runs:
path: |
**/node_modules
.yarn/install-state.gz
key: ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }}-${{ hashFiles('**/package.json', '!node_modules/**') }}
# key: ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }}-${{ hashFiles('**/package.json', '!node_modules/**') }}
key: ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock', 'example/yarn.lock') }}-${{ hashFiles('package.json', 'example/package.json') }}
restore-keys: |
${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }}
${{ runner.os }}-yarn-

- name: Install dependencies
Expand Down
2 changes: 1 addition & 1 deletion android/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ add_definitions(
add_library(
${PACKAGE_NAME}
SHARED
../cpp/bindings.cpp
../cpp/OPSqlite.cpp
../cpp/utils.cpp
../cpp/OPThreadPool.cpp
../cpp/SmartHostObject.cpp
Expand Down
2 changes: 1 addition & 1 deletion android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ dependencies {

tasks.register('prepareHeaders', Copy) {
from('../cpp')
include "**/*.h"
include "**/*.h", "**/*.hpp"
into "${project.buildDir}/headers/op-sqlite/op-engineering_op-sqlite/"
includeEmptyDirs = false
}
Expand Down
2 changes: 1 addition & 1 deletion android/cpp-adapter.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "bindings.h"
#include "OPSqlite.hpp"
#include "logs.h"
#include <ReactCommon/CallInvokerHolder.h>
#include <fbjni/fbjni.h>
Expand Down
Loading
Loading