From 8060b6b2f9db8fd61d65d436ea5753973b040be0 Mon Sep 17 00:00:00 2001 From: Simon Binder Date: Thu, 18 Sep 2025 09:31:37 +0200 Subject: [PATCH] Prepare 1.6.0 release --- CHANGELOG.md | 2 +- compose/build.gradle.kts | 3 -- connectors/supabase/build.gradle.kts | 3 -- core/build.gradle.kts | 2 - gradle.properties | 2 +- integrations/room/build.gradle.kts | 3 -- .../plugins/sonatype/ProjectExtensions.kt | 45 ------------------- static-sqlite-driver/build.gradle.kts | 3 -- 8 files changed, 2 insertions(+), 61 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 917cd390..b1b44cb5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## 1.6.0 (unreleased) +## 1.6.0 * Remove internal SQLDelight and SQLiter dependencies. * Add `rawConnection` getter to `ConnectionContext`, which is a `SQLiteConnection` instance from diff --git a/compose/build.gradle.kts b/compose/build.gradle.kts index 428f7b0c..50ff8c39 100644 --- a/compose/build.gradle.kts +++ b/compose/build.gradle.kts @@ -1,4 +1,3 @@ -import com.powersync.plugins.sonatype.setupGithubRepository import com.powersync.plugins.utils.powersyncTargets plugins { @@ -50,8 +49,6 @@ android { } } -setupGithubRepository() - dokka { moduleName.set("PowerSync Compose") } diff --git a/connectors/supabase/build.gradle.kts b/connectors/supabase/build.gradle.kts index 809e3848..0410af6a 100644 --- a/connectors/supabase/build.gradle.kts +++ b/connectors/supabase/build.gradle.kts @@ -1,4 +1,3 @@ -import com.powersync.plugins.sonatype.setupGithubRepository import com.powersync.plugins.utils.powersyncTargets import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget @@ -52,8 +51,6 @@ android { } } -setupGithubRepository() - dokka { moduleName.set("PowerSync Supabase Connector") } diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 9cbc2930..f93e0dc6 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -1,4 +1,3 @@ -import com.powersync.plugins.sonatype.setupGithubRepository import com.powersync.plugins.utils.powersyncTargets import de.undercouch.gradle.tasks.download.Download import org.gradle.api.tasks.testing.logging.TestExceptionFormat @@ -294,7 +293,6 @@ tasks.withType { showStackTraces = true } } -setupGithubRepository() dokka { moduleName.set("PowerSync Core") diff --git a/gradle.properties b/gradle.properties index 539bba29..92747789 100644 --- a/gradle.properties +++ b/gradle.properties @@ -19,7 +19,7 @@ development=true RELEASE_SIGNING_ENABLED=true # Library config GROUP=com.powersync -LIBRARY_VERSION=1.5.1 +LIBRARY_VERSION=1.6.0 GITHUB_REPO=https://github.com/powersync-ja/powersync-kotlin.git # POM POM_URL=https://github.com/powersync-ja/powersync-kotlin/ diff --git a/integrations/room/build.gradle.kts b/integrations/room/build.gradle.kts index eec59bf0..6df7a78e 100644 --- a/integrations/room/build.gradle.kts +++ b/integrations/room/build.gradle.kts @@ -1,4 +1,3 @@ -import com.powersync.plugins.sonatype.setupGithubRepository import com.powersync.plugins.utils.powersyncTargets import org.jmailen.gradle.kotlinter.tasks.FormatTask import org.jmailen.gradle.kotlinter.tasks.LintTask @@ -96,8 +95,6 @@ android { } } -setupGithubRepository() - dokka { moduleName.set("PowerSync Room Integration") } diff --git a/plugins/sonatype/src/main/kotlin/com/powersync/plugins/sonatype/ProjectExtensions.kt b/plugins/sonatype/src/main/kotlin/com/powersync/plugins/sonatype/ProjectExtensions.kt index 5cc2e0bf..28f983df 100644 --- a/plugins/sonatype/src/main/kotlin/com/powersync/plugins/sonatype/ProjectExtensions.kt +++ b/plugins/sonatype/src/main/kotlin/com/powersync/plugins/sonatype/ProjectExtensions.kt @@ -2,53 +2,8 @@ package com.powersync.plugins.sonatype import org.gradle.api.Project import org.gradle.api.publish.PublishingExtension -import java.net.URI internal inline val Project.gradlePublishing: PublishingExtension get() = extensions.getByType(PublishingExtension::class.java) internal fun Project.findOptionalProperty(propertyName: String) = findProperty(propertyName)?.toString() - - -/** Sets up repository for publishing to Github Packages to GITHUB_REPO property - * username and password (a personal Github access token) should be specified as - * `GITHUB_PUBLISH_USER` and `GITHUB_PUBLISH_TOKEN` gradle properties - */ -@Suppress("unused") -public fun Project.setupGithubRepository() { - gradlePublishing.apply { - val githubRepo = githubRepoOrNull ?: return - - val githubPublishToken = - githubPublishTokenOrNull ?: return - val githubPublishUser = project.githubPublishUser ?: "cirunner" - - repositories.maven { - it.name = "githubPackages" - it.url = URI.create("https://maven.pkg.github.com/$githubRepo") - it.credentials { cred -> - cred.username = githubPublishUser - cred.password = githubPublishToken - } - } - } -} - -internal val Project.githubPublishUser: String? - get() = project.findOptionalProperty("GITHUB_PUBLISH_USER") - -internal val Project.githubPublishTokenOrNull: String? - get() = project.findOptionalProperty("GITHUB_PUBLISH_TOKEN") - -internal val Project.githubRepoOrNull: String? - get() { - val repo = findOptionalProperty("GITHUB_REPO") ?: return null - val repoWithoutGitSuffix = repo.removeSuffix(".git") - val regex = Regex("((.*)[/:])?(?[^:/]+)/(?[^/]+)") - val matchResult = regex.matchEntire(repoWithoutGitSuffix) - if (matchResult != null) { - return (matchResult.groups["owner"]!!.value + "/" + matchResult.groups["repo"]!!.value) - } else { - throw IllegalArgumentException("Incorrect Github repository path, should be \"Owner/Repo\"") - } - } \ No newline at end of file diff --git a/static-sqlite-driver/build.gradle.kts b/static-sqlite-driver/build.gradle.kts index 76e6cd0d..f6c2cbc1 100644 --- a/static-sqlite-driver/build.gradle.kts +++ b/static-sqlite-driver/build.gradle.kts @@ -3,7 +3,6 @@ import com.powersync.compile.CreateSqliteCInterop import com.powersync.compile.CreateStaticLibrary import com.powersync.compile.UnzipSqlite import java.io.File -import com.powersync.plugins.sonatype.setupGithubRepository import com.powersync.plugins.utils.powersyncTargets import de.undercouch.gradle.tasks.download.Download import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget @@ -103,5 +102,3 @@ kotlin { } } } - -setupGithubRepository()