From e27964e8e3d21eb8d380b47c1684e354468350ae Mon Sep 17 00:00:00 2001 From: Simon Binder Date: Mon, 29 Sep 2025 13:46:15 +0200 Subject: [PATCH 1/2] Move PowerSyncKotlin/ to internal/ --- {PowerSyncKotlin => internal/PowerSyncKotlin}/Package.swift | 0 {PowerSyncKotlin => internal/PowerSyncKotlin}/README.md | 0 .../PowerSyncKotlin}/build.gradle.kts | 0 .../PowerSyncKotlin}/gradle.properties | 0 .../PowerSyncKotlin}/powersync.podspec | 4 ++-- .../src/appleMain/kotlin/com/powersync/Connector.kt | 0 .../src/appleMain/kotlin/com/powersync/Locks.kt | 0 .../src/appleMain/kotlin/com/powersync/SDK.kt | 0 settings.gradle.kts | 3 +-- 9 files changed, 3 insertions(+), 4 deletions(-) rename {PowerSyncKotlin => internal/PowerSyncKotlin}/Package.swift (100%) rename {PowerSyncKotlin => internal/PowerSyncKotlin}/README.md (100%) rename {PowerSyncKotlin => internal/PowerSyncKotlin}/build.gradle.kts (100%) rename {PowerSyncKotlin => internal/PowerSyncKotlin}/gradle.properties (100%) rename {PowerSyncKotlin => internal/PowerSyncKotlin}/powersync.podspec (90%) rename {PowerSyncKotlin => internal/PowerSyncKotlin}/src/appleMain/kotlin/com/powersync/Connector.kt (100%) rename {PowerSyncKotlin => internal/PowerSyncKotlin}/src/appleMain/kotlin/com/powersync/Locks.kt (100%) rename {PowerSyncKotlin => internal/PowerSyncKotlin}/src/appleMain/kotlin/com/powersync/SDK.kt (100%) diff --git a/PowerSyncKotlin/Package.swift b/internal/PowerSyncKotlin/Package.swift similarity index 100% rename from PowerSyncKotlin/Package.swift rename to internal/PowerSyncKotlin/Package.swift diff --git a/PowerSyncKotlin/README.md b/internal/PowerSyncKotlin/README.md similarity index 100% rename from PowerSyncKotlin/README.md rename to internal/PowerSyncKotlin/README.md diff --git a/PowerSyncKotlin/build.gradle.kts b/internal/PowerSyncKotlin/build.gradle.kts similarity index 100% rename from PowerSyncKotlin/build.gradle.kts rename to internal/PowerSyncKotlin/build.gradle.kts diff --git a/PowerSyncKotlin/gradle.properties b/internal/PowerSyncKotlin/gradle.properties similarity index 100% rename from PowerSyncKotlin/gradle.properties rename to internal/PowerSyncKotlin/gradle.properties diff --git a/PowerSyncKotlin/powersync.podspec b/internal/PowerSyncKotlin/powersync.podspec similarity index 90% rename from PowerSyncKotlin/powersync.podspec rename to internal/PowerSyncKotlin/powersync.podspec index 6b965f9a..57131b1a 100644 --- a/PowerSyncKotlin/powersync.podspec +++ b/internal/PowerSyncKotlin/powersync.podspec @@ -12,7 +12,7 @@ Pod::Spec.new do |spec| spec.pod_target_xcconfig = { - 'KOTLIN_PROJECT_PATH' => ':PowerSyncKotlin', + 'KOTLIN_PROJECT_PATH' => ':internal:PowerSyncKotlin', 'PRODUCT_MODULE_NAME' => 'PowerSyncKotlin', } @@ -28,7 +28,7 @@ Pod::Spec.new do |spec| fi set -ev REPO_ROOT="$PODS_TARGET_SRCROOT" - "$REPO_ROOT/../gradlew" -p "$REPO_ROOT" $KOTLIN_PROJECT_PATH:syncFramework \ + "$REPO_ROOT/../../gradlew" -p "$REPO_ROOT" $KOTLIN_PROJECT_PATH:syncFramework \ -Pkotlin.native.cocoapods.platform=$PLATFORM_NAME \ -Pkotlin.native.cocoapods.archs="$ARCHS" \ -Pkotlin.native.cocoapods.configuration="$CONFIGURATION" diff --git a/PowerSyncKotlin/src/appleMain/kotlin/com/powersync/Connector.kt b/internal/PowerSyncKotlin/src/appleMain/kotlin/com/powersync/Connector.kt similarity index 100% rename from PowerSyncKotlin/src/appleMain/kotlin/com/powersync/Connector.kt rename to internal/PowerSyncKotlin/src/appleMain/kotlin/com/powersync/Connector.kt diff --git a/PowerSyncKotlin/src/appleMain/kotlin/com/powersync/Locks.kt b/internal/PowerSyncKotlin/src/appleMain/kotlin/com/powersync/Locks.kt similarity index 100% rename from PowerSyncKotlin/src/appleMain/kotlin/com/powersync/Locks.kt rename to internal/PowerSyncKotlin/src/appleMain/kotlin/com/powersync/Locks.kt diff --git a/PowerSyncKotlin/src/appleMain/kotlin/com/powersync/SDK.kt b/internal/PowerSyncKotlin/src/appleMain/kotlin/com/powersync/SDK.kt similarity index 100% rename from PowerSyncKotlin/src/appleMain/kotlin/com/powersync/SDK.kt rename to internal/PowerSyncKotlin/src/appleMain/kotlin/com/powersync/SDK.kt diff --git a/settings.gradle.kts b/settings.gradle.kts index c66d4964..77204629 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -28,6 +28,7 @@ plugins { rootProject.name = "powersync-root" include(":internal:download-core-extension") +include(":internal:PowerSyncKotlin") include(":core") include(":core-tests-android") @@ -38,8 +39,6 @@ include(":static-sqlite-driver") include(":integrations:sqldelight") include(":integrations:sqldelight-test-database") -include(":PowerSyncKotlin") - include(":compose") include(":demos:android-supabase-todolist") From 376058d99df69c1116684e3887b3707a93a9a4db Mon Sep 17 00:00:00 2001 From: Simon Binder Date: Tue, 30 Sep 2025 09:52:24 +0200 Subject: [PATCH 2/2] Also fix deploy logic --- .github/workflows/deploy.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 107319d8..ef208310 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -11,7 +11,7 @@ jobs: outputs: tag: ${{ steps.tag.outputs.tag }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 with: fetch-depth: 0 @@ -32,7 +32,7 @@ jobs: maven_publish: runs-on: macos-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - name: Validate Gradle Wrapper uses: gradle/wrapper-validation-action@v1 - uses: actions/cache@v3 @@ -81,14 +81,14 @@ jobs: with: cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }} - name: Build frameworks - run: "./gradlew PowerSyncKotlin:buildRelease" + run: "./gradlew internal:PowerSyncKotlin:buildRelease" - uses: actions/upload-artifact@v4 with: name: XCFramework retention-days: 1 # Only used temporarily compression-level: 0 # We're already uploading a compressed file - path: PowerSyncKotlin/build/FrameworkArchives/PowersyncKotlinRelease.zip + path: internal/PowerSyncKotlin/build/FrameworkArchives/PowersyncKotlinRelease.zip if-no-files-found: error add_assets: