Merge branch 'main' into main

Author: hfhbd

.github/workflows/CD.yml

@@ -23,7 +23,7 @@ jobs:
       - name: Build with Gradle
         run: ./gradlew assemble
       - name: Publish
-        run: ./gradlew -Pversion=$version -Dorg.gradle.parallel=false publish closeAndReleaseStagingRepository
+        run: ./gradlew -Pversion=$version -Dorg.gradle.parallel=false --no-configuration-cache publish closeAndReleaseStagingRepository
         env:
           ORG_GRADLE_PROJECT_signingKey: ${{ secrets.SIGNING_PRIVATE_KEY }}
           ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.SIGNING_PASSWORD }}

.github/workflows/CI.yml

@@ -29,7 +29,7 @@ jobs:
           dependency-graph: generate-and-submit
           gradle-home-cache-cleanup: true
       - run: ./gradlew assemble
-      - uses: ikalnytskyi/action-setup-postgres@v4
+      - uses: ikalnytskyi/action-setup-postgres@v5
         with:
           password: password
       - run: ./gradlew build

.github/workflows/Docs.yml

@@ -25,7 +25,7 @@ jobs:
       url: ${{ steps.deployment.outputs.page_url }}
 
     steps:
-      - uses: actions/configure-pages@v3
+      - uses: actions/configure-pages@v4
       - uses: actions/checkout@v4
       - uses: Homebrew/actions/setup-homebrew@master
         id: set-up-homebrew
@@ -37,9 +37,9 @@ jobs:
       - uses: gradle/gradle-build-action@v2
       - name: Generate Docs
         run: ./gradlew :dokkaHtmlMultiModule
-      - uses: actions/upload-pages-artifact@v2
+      - uses: actions/upload-pages-artifact@v3
         with:
           path: build/dokka/htmlMultiModule
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@main
+        uses: actions/deploy-pages@v4

README.md

@@ -1,4 +1,4 @@
-# Module postgres-native-sqldelight
+# Module postgres-native-sqldelight-driver
 
 A native Postgres driver using libpq.
 

gradle.properties

@@ -3,5 +3,7 @@ kotlin.mpp.enableCInteropCommonization=true
 
 org.gradle.parallel=true
 org.gradle.jvmargs=-Xmx2048m
+org.gradle.configuration-cache=true
+org.gradle.configureondemand=true
 
 group=app.softwork

build-logic/build.gradle.kts renamed to gradle/build-logic/build.gradle.kts

@@ -5,7 +5,7 @@ dependencyResolutionManagement {
         gradlePluginPortal()
     }
     versionCatalogs.register("libs") {
-        from(files("../gradle/libs.versions.toml"))
+        from(files("../libs.versions.toml"))
     }
 }
 

build-logic/settings.gradle.kts renamed to gradle/build-logic/settings.gradle.kts

@@ -1,6 +1,6 @@
 [versions]
-kotlin = "1.9.21"
-sqldelight = "2.0.0"
+kotlin = "1.9.22"
+sqldelight = "2.0.1"
 idea = "222.4459.24"
 coroutines = "1.7.3"
 
@@ -13,8 +13,8 @@ sqldelight-compiler-env = { module = "app.cash.sqldelight:compiler-env", version
 
 coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }
 coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }
-ktor-network = { module = "io.ktor:ktor-network", version = "2.3.6" }
-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version = "0.4.1" }
+ktor-network = { module = "io.ktor:ktor-network", version = "2.3.7" }
+datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version = "0.5.0" }
 uuid = { module = "app.softwork:kotlinx-uuid-core", version = "0.0.22" }
 serialization-core = { module = "org.jetbrains.kotlinx:kotlinx-serialization-core", version = "1.6.2" }
 

build-logic/src/main/kotlin/MyRepos.kt renamed to gradle/build-logic/src/main/kotlin/MyRepos.kt

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

build-logic/src/main/kotlin/MyRepos.settings.gradle.kts renamed to gradle/build-logic/src/main/kotlin/MyRepos.settings.gradle.kts

@@ -145,15 +145,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -202,11 +202,11 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

build-logic/src/main/kotlin/exclude.gradle.kts renamed to gradle/build-logic/src/main/kotlin/exclude.gradle.kts

@@ -29,7 +29,7 @@ dependencies {
 }
 
 kotlin {
-    jvmToolchain(11)
+    jvmToolchain(17)
 
     target.compilations.configureEach {
         kotlinOptions.allWarningsAsErrors = true

build-logic/src/main/kotlin/publish.gradle.kts renamed to gradle/build-logic/src/main/kotlin/publish.gradle.kts

@@ -57,7 +57,7 @@ licensee {
 
 tasks.dokkaHtmlPartial {
     dokkaSourceSets.configureEach {
-        externalDocumentationLink("https://cashapp.github.io/sqldelight/2.0.0-alpha05/2.x/")
+        externalDocumentationLink("https://cashapp.github.io/sqldelight/2.0.0/2.x/")
         externalDocumentationLink(
             url = "https://kotlinlang.org/api/kotlinx-datetime/",
             packageListUrl = "https://kotlinlang.org/api/kotlinx-datetime/kotlinx-datetime/package-list",

build-logic/src/main/kotlin/repos.gradle.kts renamed to gradle/build-logic/src/main/kotlin/repos.gradle.kts

@@ -3,13 +3,13 @@ pluginManagement {
         mavenCentral()
         gradlePluginPortal()
     }
-    includeBuild("build-logic")
+    includeBuild("gradle/build-logic")
 }
 
 plugins {
     id("MyRepos")
-    id("org.gradle.toolchains.foojay-resolver-convention") version "0.7.0"
-    id("com.gradle.enterprise") version "3.15.1"
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
+    id("com.gradle.enterprise") version "3.16.1"
 }
 
 gradleEnterprise {
@@ -26,6 +26,7 @@ gradleEnterprise {
 rootProject.name = "postgres-native-sqldelight"
 
 enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
+enableFeaturePreview("STABLE_CONFIGURATION_CACHE")
 
 include(":postgres-native-sqldelight-driver")
 include(":postgres-native-sqldelight-dialect")