chore: dependency updates - kotlin 1.9, java 20, gradle 8.2.1

vihangpatil · Jul 27, 2023 · c94c57c · c94c57c
1 parent a1e9405
commit c94c57c
Show file tree

Hide file tree

Showing 15 changed files with 41 additions and 30 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -12,7 +12,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: "temurin"
-          java-version: "19.0.2"
+          java-version: "20.0.2"
           cache: gradle
       - name: Validate gradle wrapper
         uses: gradle/wrapper-validation-action@v1

diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
@@ -12,7 +12,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: "temurin"
-          java-version: "19.0.2"
+          java-version: "20.0.2"
           cache: gradle
       - name: Validate gradle wrapper
         uses: gradle/wrapper-validation-action@v1

diff --git a/README.adoc b/README.adoc
@@ -12,7 +12,7 @@ endif::[]
 
 image:https://github.com/vihangpatil/firestore4k/actions/workflows/build.yaml/badge.svg?branch=main[Build Status]
 image:https://img.shields.io/github/actions/workflow/status/vihangpatil/firestore4k/build.yaml?branch=main&logo=github[Build Status]
-image:https://img.shields.io/badge/kotlin-1.8.20-blue.svg?logo=kotlin[Kotlin version badge]
+image:https://img.shields.io/badge/kotlin-1.9.0-7f52ff.svg?logo=kotlin[Kotlin version badge]
 image:https://img.shields.io/github/license/vihangpatil/firestore4k.svg[GitHub license]
 
 Firestore Client for Kotlin JVM with strict (and relaxed) type-system. +

diff --git a/api/dynamic-api/build.gradle.kts b/api/dynamic-api/build.gradle.kts
@@ -11,7 +11,9 @@ dependencies {
     api(KotlinX.serialization.properties)
 
     api(platform("com.google.cloud:libraries-bom:_"))
-    api("com.google.cloud:google-cloud-firestore")
+    api("com.google.cloud:google-cloud-firestore") {
+        exclude("com.google.guava", "listenablefuture")
+    }
 
     implementation(project(":internal"))
 

diff --git a/api/dynamic-api/src/test/kotlin/io/firestore4k/dynamic/FirestoreClientTest.kt b/api/dynamic-api/src/test/kotlin/io/firestore4k/dynamic/FirestoreClientTest.kt
@@ -124,7 +124,7 @@ class FirestoreClientTest {
 
         @Container
         @JvmStatic
-        private val firestore = GenericContainer(DockerImageName.parse("google/cloud-sdk:425.0.0-emulators"))
+        private val firestore = GenericContainer(DockerImageName.parse("google/cloud-sdk:440.0.0-emulators"))
             .withExposedPorts(5173)
             .withCommand("gcloud", "beta", "emulators", "firestore", "start", "--host-port=0.0.0.0:5173")
     }

diff --git a/api/typed-api/build.gradle.kts b/api/typed-api/build.gradle.kts
@@ -11,7 +11,9 @@ dependencies {
     api(KotlinX.serialization.properties)
 
     api(platform("com.google.cloud:libraries-bom:_"))
-    api("com.google.cloud:google-cloud-firestore")
+    api("com.google.cloud:google-cloud-firestore") {
+        exclude("com.google.guava", "listenablefuture")
+    }
 
     implementation(project(":internal"))
 

diff --git a/api/typed-api/src/test/kotlin/io/firestore4k/typed/FirestoreClientTest.kt b/api/typed-api/src/test/kotlin/io/firestore4k/typed/FirestoreClientTest.kt
@@ -124,7 +124,7 @@ class FirestoreClientTest {
 
         @Container
         @JvmStatic
-        private val firestore = GenericContainer(DockerImageName.parse("google/cloud-sdk:425.0.0-emulators"))
+        private val firestore = GenericContainer(DockerImageName.parse("google/cloud-sdk:440.0.0-emulators"))
             .withExposedPorts(5173)
             .withCommand("gcloud", "beta", "emulators", "firestore", "start", "--host-port=0.0.0.0:5173")
     }

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -15,13 +15,13 @@ allprojects {
     }
 
     tasks.withType<JavaCompile>().configureEach {
-        sourceCompatibility = JavaVersion.VERSION_19.toString()
-        targetCompatibility = JavaVersion.VERSION_19.toString()
+        sourceCompatibility = JavaVersion.VERSION_20.toString()
+        targetCompatibility = JavaVersion.VERSION_20.toString()
     }
 
     tasks.withType<KotlinCompile>().configureEach {
         kotlinOptions {
-            jvmTarget = JavaVersion.VERSION_19.majorVersion
+            jvmTarget = JavaVersion.VERSION_20.majorVersion
         }
     }
 }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
@@ -85,9 +85,6 @@ done
 APP_BASE_NAME=${0##*/}
 APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
-# 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"'
-
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
 
@@ -133,26 +130,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 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=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=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -197,6 +197,10 @@ if "$cygwin" || "$msys" ; then
     done
 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

diff --git a/internal/build.gradle.kts b/internal/build.gradle.kts
@@ -8,7 +8,9 @@ dependencies {
     implementation(Kotlin.stdlib.jdk8)
 
     api(platform("com.google.cloud:libraries-bom:_"))
-    api("com.google.cloud:google-cloud-firestore")
+    api("com.google.cloud:google-cloud-firestore") {
+         exclude("com.google.guava", "listenablefuture")
+    }
 
     api(KotlinX.coroutines.core)
 

diff --git a/internal/src/test/kotlin/io/firestore4k/internal/FirestoreClientTest.kt b/internal/src/test/kotlin/io/firestore4k/internal/FirestoreClientTest.kt
@@ -124,7 +124,7 @@ class FirestoreClientTest {
 
         @Container
         @JvmStatic
-        private val firestore = GenericContainer(DockerImageName.parse("google/cloud-sdk:425.0.0-emulators"))
+        private val firestore = GenericContainer(DockerImageName.parse("google/cloud-sdk:440.0.0-emulators"))
             .withExposedPorts(5173)
             .withCommand("gcloud", "beta", "emulators", "firestore", "start", "--host-port=0.0.0.0:5173")
     }

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    id("de.fayard.refreshVersions") version "0.40.1"
+    id("de.fayard.refreshVersions") version "0.51.0"
 }
 
 refreshVersions {

diff --git a/versions.properties b/versions.properties
@@ -1,5 +1,5 @@
 #### Dependencies and Plugin versions with their available updates.
-#### Generated by `./gradlew refreshVersions` version 0.40.1
+#### Generated by `./gradlew refreshVersions` version 0.51.0
 ####
 #### Don't manually edit or split the comments that start with four hashtags (####),
 #### they will be overwritten by refreshVersions.
@@ -9,22 +9,22 @@
 ####
 #### NOTE: Some versions are filtered by the rejectVersionsIf predicate. See the settings.gradle.kts file.
 
-plugin.com.google.devtools.ksp=1.8.20-1.0.10
+plugin.com.google.devtools.ksp=1.9.0-1.0.12
 
-version.com.google.cloud..libraries-bom=26.12.0
+version.com.google.cloud..libraries-bom=26.19.0
 
-version.junit.jupiter=5.9.2
+version.junit.jupiter=5.10.0
 
-version.kotlin=1.8.20
+version.kotlin=1.9.0
 
-version.kotlinpoet=1.13.0
+version.kotlinpoet=1.14.2
 
-version.kotlinx.coroutines=1.6.4
+version.kotlinx.coroutines=1.7.3
 
-version.kotlinx.serialization=1.5.0
+version.kotlinx.serialization=1.5.1
 
-  version.ksp=1.8.20-1.0.10
+  version.ksp=1.9.0-1.0.12
 
 version.slf4j=2.0.7
 
-version.testcontainers=1.18.0
+version.testcontainers=1.18.3