Merge branch 'grpc:master' into issue-626-deprecated-url

Author: wavedeck

.bazelignore

@@ -0,0 +1 @@
+bzl-examples/

.bazelrc

@@ -1 +1 @@
-build --cxxopt=-std=c++14 --host_cxxopt=-std=c++14
+build --cxxopt=-std=c++17 --host_cxxopt=-std=c++17

.bazelversion

@@ -1 +1 @@
-6.3.2
+7.6.1

.github/workflows/bazel.yml

@@ -4,33 +4,49 @@ on:
     branches:
       - master
   pull_request:
+  workflow_dispatch:
 jobs:
   bazel:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Mount bazel cache
       uses: actions/cache@v4
       with:
         path: "/home/runner/.cache/bazel"
         key: bazel
+    - name: Set up JDK 17
+      uses: actions/setup-java@v5
+      with:
+        java-version: '17'
+        distribution: 'temurin'
     - name: Install bazelisk
       run: |
-        curl -LO "https://github.com/bazelbuild/bazelisk/releases/download/v1.1.0/bazelisk-linux-amd64"
+        curl -LO "https://github.com/bazelbuild/bazelisk/releases/download/v1.26.0/bazelisk-linux-amd64"
         mkdir -p "${GITHUB_WORKSPACE}/bin/"
         mv bazelisk-linux-amd64 "${GITHUB_WORKSPACE}/bin/bazel"
         chmod +x "${GITHUB_WORKSPACE}/bin/bazel"
+    - name: Build
+      uses: nick-invision/retry@v3
+      with:
+        timeout_minutes: 10
+        max_attempts: 3
+        command: |
+          cd "${GITHUB_WORKSPACE}"
+          "${GITHUB_WORKSPACE}/bin/bazel" build //...
     - name: Test
       uses: nick-invision/retry@v3
       with:
         timeout_minutes: 10
         max_attempts: 3
         command: |
+          cd "${GITHUB_WORKSPACE}"
           "${GITHUB_WORKSPACE}/bin/bazel" test //...
-    - name: Build
+    - name: Test bzl-examples/bzlmod
       uses: nick-invision/retry@v3
       with:
         timeout_minutes: 10
         max_attempts: 3
         command: |
-          "${GITHUB_WORKSPACE}/bin/bazel" build //...
+          cd "${GITHUB_WORKSPACE}/bzl-examples/bzlmod"
+          "${GITHUB_WORKSPACE}/bin/bazel" test //...

.github/workflows/gradle.yml

@@ -1,31 +1,34 @@
+# Local:
+# $ act -P ubuntu-latest=catthehacker/ubuntu:act-latest -W .github/workflows/gradle.yml
 name: Gradle Build
 on:
   push:
     branches:
       - master
   pull_request:
-
+  workflow_dispatch:
 jobs:
   gradle:
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-12]
+        os: [ubuntu-latest, macos-13]
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
 
-    - uses: actions/setup-java@v4
+    - name: Set up JDK 17
+      uses: actions/setup-java@v5
       with:
+        java-version: '17'
         distribution: 'temurin'
-        java-version: '11'
-        cache: 'gradle'
 
-    - uses: gradle/gradle-build-action@v3
+    - name: Set up Gradle
+      uses: gradle/actions/setup-gradle@v4
 
     - name: Test on Mac
-      if: matrix.os == 'macos-12'
+      if: matrix.os == 'macos-13'
       run: |
-        brew install docker
+        brew install docker colima
         colima start --network-address
         export TESTCONTAINERS_DOCKER_SOCKET_OVERRIDE=/var/run/docker.sock
         export TESTCONTAINERS_HOST_OVERRIDE=$(colima ls -j | jq -r '.address')

.github/workflows/release.yml

@@ -3,21 +3,22 @@ on:
   push:
     tags:
       - v**
+  workflow_dispatch:
 
 jobs:
   release:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
-      - uses: actions/setup-java@v4
+      - name: Set up JDK 17
+        uses: actions/setup-java@v5
         with:
-          distribution: 'adopt'
-          java-version: '11'
-          cache: 'gradle'
+          java-version: '17'
+          distribution: 'temurin'
 
-      - name: Setup Gradle
-        uses: gradle/gradle-build-action@v3
+      - name: Set up Gradle
+        uses: gradle/actions/setup-gradle@v4
 
       - name: release
         env:

.gitignore

@@ -5,3 +5,5 @@ build
 local.properties
 *.iml
 /bazel-*
+MODULE.bazel.lock
+*/bin/*

MODULE.bazel

@@ -0,0 +1,36 @@
+module(
+    name = "grpc_kotlin",
+    # Note: the Publish-to-BCR app will patch this line to stamp the version being published.
+    version = "0.0.0",
+    compatibility_level = 1,
+)
+
+bazel_dep(name = "protobuf", repo_name = "com_google_protobuf", version = "30.2")
+bazel_dep(name = "rules_kotlin", repo_name = "io_bazel_rules_kotlin", version = "2.1.3")
+bazel_dep(name = "rules_java", version = "8.11.0")
+bazel_dep(name = "rules_jvm_external", version = "6.7")
+bazel_dep(name = "grpc-java", repo_name = "io_grpc_grpc_java", version = "1.71.0")
+
+grpc_kotlin_maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
+grpc_kotlin_maven.install(
+    name = "grpc_kotlin_maven",
+    # Rerun whenever adding new artifacts.
+    # $ REPIN=1 bazelisk run @grpc_kotlin_maven//:pin
+    artifacts = [
+        "com.google.jimfs:jimfs:1.3.0",
+        "com.google.truth:truth:1.4.2",
+        "com.google.truth.extensions:truth-proto-extension:1.4.2",
+        "com.google.protobuf:protobuf-java:4.30.2",
+        "com.google.protobuf:protobuf-kotlin:4.30.2",
+        "com.google.guava:guava:33.3.1-android",
+        "com.squareup:kotlinpoet:1.14.2",
+        "junit:junit:4.13.2",
+        "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1",
+        "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.10.1",
+    ],
+    fetch_sources = False,
+    lock_file = "//:grpc_kotlin_maven_install.json",
+    generate_compat_repositories = True,
+    strict_visibility = True,
+)
+use_repo(grpc_kotlin_maven, "grpc_kotlin_maven")

WORKSPACE

@@ -40,14 +40,14 @@ subprojects {
     version = rootProject.version
 
     tasks.withType<JavaCompile> {
-        sourceCompatibility = JavaVersion.VERSION_1_8.toString()
-        targetCompatibility = JavaVersion.VERSION_1_8.toString()
+        sourceCompatibility = JavaVersion.VERSION_17.toString()
+        targetCompatibility = JavaVersion.VERSION_17.toString()
     }
 
     tasks.withType<KotlinCompile> {
         kotlinOptions {
             freeCompilerArgs = listOf("-Xjsr305=strict")
-            jvmTarget = JavaVersion.VERSION_1_8.toString()
+            jvmTarget = JavaVersion.VERSION_17.toString()
         }
     }