Skip to content

Commit 649290c

Browse files
authored
Merge branch 'main' into attachment-package-refactor
2 parents d514ef8 + f9e2e9c commit 649290c

File tree

205 files changed

+10976
-1535
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

205 files changed

+10976
-1535
lines changed

.changeset/four-pans-laugh.md

Lines changed: 0 additions & 8 deletions
This file was deleted.

.github/workflows/build-packages.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,3 +43,6 @@ jobs:
4343

4444
- name: Build
4545
run: pnpm build:packages
46+
47+
- name: Build (prod)
48+
run: pnpm build:packages:prod

.github/workflows/test-isolated.yaml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,16 @@ jobs:
1717
- name: Setup NodeJS
1818
uses: actions/setup-node@v4
1919
with:
20-
node-version-file: '.nvmrc'
20+
node-version-file: ".nvmrc"
21+
22+
- name: Set up JDK 17
23+
uses: actions/setup-java@v4
24+
with:
25+
java-version: "21"
26+
distribution: "temurin"
27+
28+
- name: Set up Gradle
29+
uses: gradle/actions/setup-gradle@v4
2130

2231
- uses: pnpm/action-setup@v2
2332
name: Install pnpm

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ _[PowerSync](https://www.powersync.com) is a sync engine for building local-firs
3636

3737
- [packages/attachments](./packages/attachments/README.md)
3838

39-
- Attachments helper package for React Native and JavaScript/TypeScript projects.
39+
- Attachments helper package for React Native and JavaScript/TypeScript projects.
4040

4141
- [packages/kysely-driver](./packages/kysely-driver/README.md)
4242

@@ -67,6 +67,7 @@ Demo applications are located in the [`demos/`](./demos/) directory. Also see ou
6767
### Web
6868

6969
- [demos/react-supabase-todolist](./demos/react-supabase-todolist/README.md): A React to-do list example app using the PowerSync Web SDK and a Supabase backend.
70+
- [demos/react-supabase-todolist-tanstackdb](./demos/react-supabase-todolist-tanstackdb/README.md): A React to-do list example app using the PowerSync Web SDK and a Supabase backend + [TanStackDB](https://tanstack.com/db/latest) collections.
7071
- [demos/react-multi-client](./demos/react-multi-client/README.md): A React widget that illustrates how data flows from one PowerSync client to another.
7172
- [demos/yjs-react-supabase-text-collab](./demos/yjs-react-supabase-text-collab/README.md): A React real-time text editing collaboration example app powered by [Yjs](https://github.com/yjs/yjs) CRDTs and [Tiptap](https://tiptap.dev/), using the PowerSync Web SDK and a Supabase backend.
7273
- [demos/vue-supabase-todolist](./demos/vue-supabase-todolist/README.md): A Vue to-do list example app using the PowerSync Web SDK and a Supabase backend.

demos/example-capacitor/README.md

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# PowerSync + Capacitor Example
22

3-
Example demonstrating the use of the [PowerSync SDK for Web](/packages/web/README.md) together with a Capacitor App.
3+
Example demonstrating the use of the [PowerSync SDK for Capacitor](/packages/capacitor/README.md) together with a Capacitor App.
44

55
To see it in action:
66

@@ -13,12 +13,14 @@ To see it in action:
1313

1414
To run the iOS version of the app run:
1515

16-
1. `pnpm sync`
17-
2. `pnpm ios`
16+
1. `pnpm build`
17+
2. `pnpm sync`
18+
3. `pnpm ios`
1819

1920
## Android
2021

2122
To run the Android version of the app run:
2223

23-
1. `pnpm sync`
24-
2. `pnpm android` (to see console run `chrome://inspect/#devices` in browser)
24+
1. `pnpm build`
25+
2. `pnpm sync`
26+
3. `pnpm android` (to see console run `chrome://inspect/#devices` in browser)

demos/example-capacitor/android/app/capacitor.build.gradle

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,16 @@
22

33
android {
44
compileOptions {
5-
sourceCompatibility JavaVersion.VERSION_17
6-
targetCompatibility JavaVersion.VERSION_17
5+
sourceCompatibility JavaVersion.VERSION_21
6+
targetCompatibility JavaVersion.VERSION_21
77
}
88
}
99

1010
apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle"
1111
dependencies {
12+
implementation project(':capacitor-community-sqlite')
1213
implementation project(':capacitor-splash-screen')
14+
implementation project(':powersync-capacitor')
1315

1416
}
1517

demos/example-capacitor/android/app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
android:theme="@style/AppTheme">
1111

1212
<activity
13-
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode"
13+
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode|navigation"
1414
android:name=".MainActivity"
1515
android:label="@string/title_activity_main"
1616
android:theme="@style/AppTheme.NoActionBarLaunch"

demos/example-capacitor/android/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ buildscript {
77
mavenCentral()
88
}
99
dependencies {
10-
classpath 'com.android.tools.build:gradle:8.2.1'
11-
classpath 'com.google.gms:google-services:4.4.0'
10+
classpath 'com.android.tools.build:gradle:8.7.2'
11+
classpath 'com.google.gms:google-services:4.4.2'
1212

1313
// NOTE: Do not place your application dependencies here; they belong
1414
// in the individual module build.gradle files

demos/example-capacitor/android/capacitor.settings.gradle

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,11 @@
22
include ':capacitor-android'
33
project(':capacitor-android').projectDir = new File('../../../node_modules/@capacitor/android/capacitor')
44

5+
include ':capacitor-community-sqlite'
6+
project(':capacitor-community-sqlite').projectDir = new File('../../../node_modules/@capacitor-community/sqlite/android')
7+
58
include ':capacitor-splash-screen'
69
project(':capacitor-splash-screen').projectDir = new File('../../../node_modules/@capacitor/splash-screen/android')
10+
11+
include ':powersync-capacitor'
12+
project(':powersync-capacitor').projectDir = new File('../../../packages/capacitor/android')
2.6 KB
Binary file not shown.

0 commit comments

Comments
 (0)