Merge remote-tracking branch 'origin/main' into copilot/fix-513

Author: pepone

.github/actions/install-nightly-ice/action.yml

@@ -19,4 +19,4 @@ runs:
         echo "deb [signed-by=/etc/apt/keyrings/zeroc-nightly.gpg] https://download.zeroc.com/nexus/repository/ubuntu24.04-nightly nightly main" | sudo tee /etc/apt/sources.list.d/zeroc-nightly.list
 
         sudo apt-get update
-        sudo apt-get install -y zeroc-ice-all-dev
+        sudo apt-get install -y libzeroc-ice-dev

.github/actions/setup-xcode/action.yml

@@ -0,0 +1,9 @@
+name: Setup Xcode
+runs:
+  using: "composite"
+  steps:
+    # https://github.com/actions/runner-images/blob/main/images/macos/macos-15-arm64-Readme.md
+    - name: Use Xcode 16.4
+      if: runner.os == 'macOS'
+      shell: bash
+      run: sudo xcode-select --switch /Applications/Xcode_16.4.app/Contents/Developer

.github/workflows/ci.yml

@@ -32,6 +32,10 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
+      - name: Setup Xcode
+        if: runner.os == 'macOS'
+        uses: ./.github/actions/setup-xcode
+
       - name: Setup .NET 8
         uses: actions/setup-dotnet@v4
         with:
@@ -108,8 +112,7 @@ jobs:
           Get-ChildItem -Recurse -Depth 2 -Filter gradlew | ForEach-Object {
             Push-Location $_.DirectoryName
             Write-Host "Building in $($_.DirectoryName)..."
-            $gradlew = if ($IsWindows) { "./gradlew.bat" } else { "./gradlew" }
-            & $gradlew build
+            & ./gradlew build
             if ($LASTEXITCODE -ne 0) {
               throw "Build failed in $($_.DirectoryName)"
             }

.github/workflows/java.yml

@@ -0,0 +1,65 @@
+name: Java
+
+on:
+  push:
+    branches: ["main"]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: ["main"]
+
+jobs:
+  checkstyle:
+    runs-on: ubuntu-24.04
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Setup Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: "oracle"
+          java-version: "17"
+
+      - name: Run checkstyle formatter
+        timeout-minutes: 20
+        working-directory: java
+        shell: pwsh
+        run: |
+          $ErrorActionPreference = "Stop"
+          Get-ChildItem -Recurse -Depth 2 -Filter gradlew | ForEach-Object {
+            Push-Location $_.DirectoryName
+            Write-Host "Building in $($_.DirectoryName)..."
+            & ./gradlew check
+            if ($LASTEXITCODE -ne 0) {
+              throw "Build failed in $($_.DirectoryName)"
+            }
+            Pop-Location
+          }
+
+  rewrite:
+    runs-on: ubuntu-24.04
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Setup Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: "oracle"
+          java-version: "17"
+
+      - name: Run rewrite linter
+        timeout-minutes: 20
+        working-directory: java
+        shell: pwsh
+        run: |
+          $ErrorActionPreference = "Stop"
+          Get-ChildItem -Recurse -Depth 2 -Filter gradlew | ForEach-Object {
+            Push-Location $_.DirectoryName
+            Write-Host "Building in $($_.DirectoryName)..."
+            & ./gradlew rewriteDryRun
+            if ($LASTEXITCODE -ne 0) {
+              throw "Build failed in $($_.DirectoryName)"
+            }
+            Pop-Location
+          }

.gitignore

@@ -2,6 +2,7 @@
 build
 
 .gradle
+.kotlin
 
 # Ignore all JARs except the Gradle wrapper
 *.jar

cpp/Ice/config/Greeter.ice

@@ -8,8 +8,8 @@ module VisitorCenter
     interface Greeter
     {
         /// Creates a personalized greeting.
-        /// @param name: The name of the person to greet.
-        /// @returns: The greeting.
+        /// @param name The name of the person to greet.
+        /// @return The greeting.
         string greet(string name);
     }
 }

cpp/Ice/config/config.client

@@ -22,7 +22,7 @@ Ice.Default.Protocol=ssl
 IceSSL.DefaultDir=../../../certs
 
 # The certificate authority file.
-IceSSL.CAs=cacert.pem
+IceSSL.CAs=ca_cert.pem
 
 # The client's certificate file.
 IceSSL.CertFile=client.p12

cpp/Ice/config/config.server

@@ -27,7 +27,7 @@ Ice.Trace.Dispatch=1
 IceSSL.DefaultDir=../../../certs
 
 # The certificate authority file.
-IceSSL.CAs=cacert.pem
+IceSSL.CAs=ca_cert.pem
 
 # The server's certificate file.
 IceSSL.CertFile=server.p12

java/Glacier2/greeter/client/build.gradle.kts

@@ -6,6 +6,9 @@ plugins {
 
     // Apply the Slice-tools plugin to enable Slice compilation.
     id("com.zeroc.ice.slice-tools") version "3.8.+"
+
+    // Pull in our local 'convention plugin' to enable linting.
+    id("zeroc-linting")
 }
 
 dependencies {

java/Glacier2/greeter/client/src/main/java/com/example/glacier2/greeter/client/Client.java

@@ -3,12 +3,12 @@
 package com.example.glacier2.greeter.client;
 
 import com.example.visitorcenter.GreeterPrx;
-import com.zeroc.Ice.Communicator;
-import com.zeroc.Ice.Util;
+import com.zeroc.Glacier2.CannotCreateSessionException;
+import com.zeroc.Glacier2.PermissionDeniedException;
 import com.zeroc.Glacier2.RouterPrx;
 import com.zeroc.Glacier2.SessionPrx;
-import com.zeroc.Glacier2.PermissionDeniedException;
-import com.zeroc.Glacier2.CannotCreateSessionException;
+import com.zeroc.Ice.Communicator;
+import com.zeroc.Ice.Util;
 
 class Client {
     public static void main(String[] args) {