diff --git a/.changeset/nice-hairs-live.md b/.changeset/nice-hairs-live.md new file mode 100644 index 0000000..b86a5aa --- /dev/null +++ b/.changeset/nice-hairs-live.md @@ -0,0 +1,5 @@ +--- +"@journeyapps/react-native-quick-sqlite": minor +--- + +Rename back to @journeyapps/react-native-quick-sqlite for now diff --git a/.changeset/wild-dancers-arrive.md b/.changeset/wild-dancers-arrive.md new file mode 100644 index 0000000..c7e1f20 --- /dev/null +++ b/.changeset/wild-dancers-arrive.md @@ -0,0 +1,5 @@ +--- +"@journeyapps/react-native-quick-sqlite": minor +--- + +Use powersync-sqlite-core 0.2.1 diff --git a/.nvmrc b/.nvmrc index 12ea1ee..37dbbaf 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -v18.12.0 \ No newline at end of file +v22.5.1 \ No newline at end of file diff --git a/.tool-versions b/.tool-versions index 74f525f..1d14023 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,3 +1,3 @@ -nodejs 18.12.0 +nodejs 22.5.1 ruby 2.7.6 yarn 1.22.19 diff --git a/CHANGELOG.md b/CHANGELOG.md index 36ba51f..fe5431f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# @powersync/react-native-quick-sqlite +# @journeyapps/react-native-quick-sqlite ## 1.2.0 diff --git a/android/CMakeLists.txt b/android/CMakeLists.txt index 90d5ba2..eb4db43 100644 --- a/android/CMakeLists.txt +++ b/android/CMakeLists.txt @@ -49,6 +49,7 @@ set_target_properties( find_package(ReactAndroid REQUIRED CONFIG) find_package(fbjni REQUIRED CONFIG) +find_package(powersync_sqlite_core REQUIRED CONFIG) find_library(LOG_LIB log) if(${USE_HERMES}) @@ -67,5 +68,5 @@ target_link_libraries( ReactAndroid::react_nativemodule_core ${JSEXECUTOR_LIB} android - powersync ${CMAKE_SOURCE_DIR}/src/main/jniLibs/${CMAKE_ANDROID_ARCH_ABI}/libpowersync.so + powersync_sqlite_core::powersync ) diff --git a/android/build.gradle b/android/build.gradle index a359c5d..9197286 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -109,6 +109,7 @@ android { } dependencies { + implementation 'co.powersync:powersync-sqlite-core:0.2.1' //noinspection GradleDynamicVersion implementation 'com.facebook.react:react-android:+' } diff --git a/android/src/main/jniLibs/arm64-v8a/libpowersync.so b/android/src/main/jniLibs/arm64-v8a/libpowersync.so deleted file mode 100644 index 19bb39a..0000000 Binary files a/android/src/main/jniLibs/arm64-v8a/libpowersync.so and /dev/null differ diff --git a/android/src/main/jniLibs/armeabi-v7a/libpowersync.so b/android/src/main/jniLibs/armeabi-v7a/libpowersync.so deleted file mode 100644 index 8ce0c10..0000000 Binary files a/android/src/main/jniLibs/armeabi-v7a/libpowersync.so and /dev/null differ diff --git a/android/src/main/jniLibs/x86/libpowersync.so b/android/src/main/jniLibs/x86/libpowersync.so deleted file mode 100644 index 3cff72f..0000000 Binary files a/android/src/main/jniLibs/x86/libpowersync.so and /dev/null differ diff --git a/android/src/main/jniLibs/x86_64/libpowersync.so b/android/src/main/jniLibs/x86_64/libpowersync.so deleted file mode 100644 index 373806f..0000000 Binary files a/android/src/main/jniLibs/x86_64/libpowersync.so and /dev/null differ diff --git a/cpp/bindings.cpp b/cpp/bindings.cpp index 320d39c..99cbfb6 100644 --- a/cpp/bindings.cpp +++ b/cpp/bindings.cpp @@ -10,6 +10,7 @@ #include #include #include + using namespace std; using namespace facebook; diff --git a/package.json b/package.json index b569d28..cd13bb7 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "@powersync/react-native-quick-sqlite", + "name": "@journeyapps/react-native-quick-sqlite", "publishConfig": { "registry": "https://registry.npmjs.org/", "access": "public" @@ -73,5 +73,6 @@ ] ] }, - "dependencies": {} + "dependencies": {}, + "packageManager": "yarn@1.22.19+sha512.ff4579ab459bb25aa7c0ff75b62acebe576f6084b36aa842971cf250a5d8c6cd3bc9420b22ce63c7f93a0857bc6ef29291db39c3e7a23aab5adfd5a4dd6c5d71" } diff --git a/react-native-quick-sqlite.podspec b/react-native-quick-sqlite.podspec index 520cb49..7774844 100644 --- a/react-native-quick-sqlite.podspec +++ b/react-native-quick-sqlite.podspec @@ -29,7 +29,7 @@ Pod::Spec.new do |s| s.dependency "React-callinvoker" s.dependency "React" s.dependency "React-Core" - s.dependency "powersync-sqlite-core", "~> 0.1.6" + s.dependency "powersync-sqlite-core", "~> 0.2.1" if ENV['QUICK_SQLITE_USE_PHONE_VERSION'] == '1' then s.exclude_files = "cpp/sqlite3.c", "cpp/sqlite3.h" diff --git a/tests/ios/Podfile.lock b/tests/ios/Podfile.lock index acce4f9..9146f57 100644 --- a/tests/ios/Podfile.lock +++ b/tests/ios/Podfile.lock @@ -55,7 +55,7 @@ PODS: - hermes-engine/Pre-built (= 0.73.4) - hermes-engine/Pre-built (0.73.4) - libevent (2.1.12) - - powersync-sqlite-core (0.1.6) + - powersync-sqlite-core (0.2.1) - RCT-Folly (2022.05.16.00): - boost - DoubleConversion @@ -928,8 +928,8 @@ PODS: - React-Mapbuffer (0.73.4): - glog - React-debug - - react-native-quick-sqlite (1.1.5): - - powersync-sqlite-core (~> 0.1.6) + - react-native-quick-sqlite (1.2.0): + - powersync-sqlite-core (~> 0.2.1) - React - React-callinvoker - React-Core @@ -1316,7 +1316,7 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: boost: d3f49c53809116a5d38da093a8aa78bf551aed09 - DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54 + DoubleConversion: fea03f2699887d960129cc54bba7e52542b6f953 EASClient: a42ee8bf36c93b3128352faf2ae49405ab4f80bd EXConstants: 988aa430ca0f76b43cd46b66e7fae3287f9cc2fc EXFont: f20669cb266ef48b004f1eb1f2b20db96cd1df9f @@ -1333,10 +1333,10 @@ SPEC CHECKSUMS: FBLazyVector: 84f6edbe225f38aebd9deaf1540a4160b1f087d7 FBReactNativeSpec: d0086a479be91c44ce4687a962956a352d2dc697 fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9 - glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b + glog: c5d68082e772fa1c511173d6b30a9de2c05a69a2 hermes-engine: b2669ce35fc4ac14f523b307aff8896799829fe2 libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 - powersync-sqlite-core: 4c38c8f470f6dca61346789fd5436a6826d1e3dd + powersync-sqlite-core: 38ead13d8b21920cfbc79e9b3415b833574a506d RCT-Folly: 7169b2b1c44399c76a47b5deaaba715eeeb476c0 RCTRequired: ab7f915c15569f04a49669e573e6e319a53f9faa RCTTypeSafety: 63b97ced7b766865057e7154db0e81ce4ee6cf1e @@ -1359,7 +1359,7 @@ SPEC CHECKSUMS: React-jsinspector: 9ac353eccf6ab54d1e0a33862ba91221d1e88460 React-logger: 0a57b68dd2aec7ff738195f081f0520724b35dab React-Mapbuffer: 63913773ed7f96b814a2521e13e6d010282096ad - react-native-quick-sqlite: 55e3a90c684f886449170d27caa6bc464c446c99 + react-native-quick-sqlite: d6c713abdc02875896c6a6329c606de3676aa134 react-native-safe-area-context: 0ee144a6170530ccc37a0fd9388e28d06f516a89 React-nativeconfig: d7af5bae6da70fa15ce44f045621cf99ed24087c React-NativeModulesApple: 0123905d5699853ac68519607555a9a4f5c7b3ac @@ -1383,8 +1383,8 @@ SPEC CHECKSUMS: ReactCommon: 840a955d37b7f3358554d819446bffcf624b2522 SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17 sqlite3: f163dbbb7aa3339ad8fc622782c2d9d7b72f7e9c - Yoga: 64cd2a583ead952b0315d5135bf39e053ae9be70 + Yoga: 1b901a6d6eeba4e8a2e8f308f708691cdb5db312 PODFILE CHECKSUM: 380495c28956d6f2126a6259a117145b198f247c -COCOAPODS: 1.15.2 +COCOAPODS: 1.12.1 diff --git a/tests/tests/sqlite/rawQueries.spec.ts b/tests/tests/sqlite/rawQueries.spec.ts index 3ac243b..2c0d0aa 100644 --- a/tests/tests/sqlite/rawQueries.spec.ts +++ b/tests/tests/sqlite/rawQueries.spec.ts @@ -77,6 +77,14 @@ export function registerBaseTests() { } }); + describe('PowerSync', () => { + it('should load the extension', async () => { + const rs = await db.execute('select powersync_rs_version() as version'); + // TODO: Check the version? + // expect(rs.rows.item(0).version).to.equal('0.2.0...'); + }); + }); + describe('Raw queries', () => { it('Insert', async () => { const res = await createTestUser();