Merge branch 'master' into kt_jvm_proto_helper

grpc · Sep 25, 2023 · 656f83b · 656f83b
2 parents 5c6c35c + fe5135e
commit 656f83b
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 10 deletions.
diff --git a/.github/workflows/bazel.yml b/.github/workflows/bazel.yml
@@ -8,7 +8,7 @@ jobs:
   bazel:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Mount bazel cache
       uses: actions/cache@v3
       with:

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -13,7 +13,7 @@ jobs:
         java: ['8', '11', '17']
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - uses: actions/setup-java@v3
       with:

diff --git a/.github/workflows/gradle_arm.yaml b/.github/workflows/gradle_arm.yaml
@@ -8,7 +8,7 @@ jobs:
   gradle_arm:
     runs-on: ubuntu-18.04
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: test_on_arm
       continue-on-error: true
       uses: uraimo/[email protected]

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -8,7 +8,7 @@ jobs:
   release:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: actions/setup-java@v3
         with:

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -5,7 +5,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 plugins {
     kotlin("jvm") version "1.6.21" apply false
     id("com.google.protobuf") version "0.9.4" apply false
-    id("org.gradle.test-retry") version "1.5.4"
+    id("org.gradle.test-retry") version "1.5.5"
     id("io.github.gradle-nexus.publish-plugin") version "1.3.0"
 }
 

diff --git a/compiler/build.gradle.kts b/compiler/build.gradle.kts
@@ -25,10 +25,10 @@ dependencies {
     testImplementation("junit:junit:4.13.2")
     testImplementation("com.google.guava:guava:29.0-jre")
     testImplementation("com.google.jimfs:jimfs:1.3.0")
-    testImplementation("com.google.protobuf:protobuf-gradle-plugin:0.8.18")
+    testImplementation("com.google.protobuf:protobuf-gradle-plugin:0.9.4")
     testImplementation("com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0")
     testImplementation("org.junit.jupiter:junit-jupiter-engine:5.10.0")
-    testImplementation("org.mockito:mockito-core:4.5.1")
+    testImplementation("org.mockito:mockito-core:4.11.0")
 }
 
 tasks.jar {

diff --git a/examples/android/build.gradle.kts b/examples/android/build.gradle.kts
@@ -3,7 +3,7 @@ plugins {
     kotlin("android")
 }
 
-val composeVersion = "1.5.0"
+val composeVersion = "1.5.1"
 val composeCompilerVersion = "1.5.3"
 
 dependencies {

diff --git a/interop_testing/build.gradle.kts b/interop_testing/build.gradle.kts
@@ -22,7 +22,7 @@ dependencies {
 
     implementation("com.google.truth:truth:1.1.3")
 
-    testImplementation("org.mockito:mockito-core:4.5.1")
+    testImplementation("org.mockito:mockito-core:4.11.0")
     testImplementation("com.squareup.okhttp:okhttp:2.7.5") {
         because("transitive dep for grpc-okhttp")
     }

diff --git a/stub/build.gradle.kts b/stub/build.gradle.kts
@@ -3,7 +3,7 @@ import org.jetbrains.dokka.gradle.DokkaTask
 import java.net.URL
 
 plugins {
-    id("org.jetbrains.dokka") version "1.8.20"
+    id("org.jetbrains.dokka") version "1.9.0"
 }
 
 repositories {