@tahminator/pipeline 1.0.81-beta.d684dda2 → 1.0.81

package/README.md

@@ -236,7 +236,7 @@ Every target enables both message and service generation by default:
 | Go                      | `<Service>Server`, `Unimplemented<Service>Server`, `<Service>Client` | Resolved by `go mod tidy` into the generated module |
 | Rust                    | Tonic `<service>_server` traits and `<service>_client` clients       | `prost`, `prost-types`, `tonic`, `tonic-prost`      |
 
-Applications implement the generated service interfaces and supply server startup, endpoints, authentication, and transport configuration. Java applications must add a transport implementation such as `io.grpc:grpc-netty-shaded:1.75.0`; the generated SDK does not choose one. Gradle publishes public runtime types as `api` dependencies so they are visible on consumers' compile classpaths. When the Java target is published, the publisher reads the generated `Protobuf Java Version` header and uses that `protobuf-java` version unless `protobufJavaVersion` is set to a compatible newer version.
+Applications implement the generated service interfaces and supply server startup, endpoints, authentication, and transport configuration. Java applications must add a transport implementation such as `io.grpc:grpc-netty-shaded:1.75.0`; the generated SDK does not choose one. Gradle publishes public runtime types as `api` dependencies so they are visible on consumers' compile classpaths.
 
 Imported schemas are generated alongside the selected input, except standard well-known types, which use the runtime libraries. This produces self-contained schema output rather than relying on separately published schema packages. Go publishing still requires those package paths to share a valid module root.
 

package/dist/protobuf/backend/publisher/java.d.ts

@@ -19,8 +19,6 @@ export declare class ArtifactKeeperJavaPublisher {
     private publishMaven;
     private publishGradle;
     private moveSources;
-    private resolveProtobufJavaVersion;
-    private findGeneratedProtobufJavaVersion;
     createMavenPom(options: ProtobufJavaTargetLanguageOptions): string;
     private createMavenSettings;
     createGradleBuild(options: ProtobufJavaTargetLanguageOptions): string;

package/dist/protobuf/backend/publisher/java.js

@@ -1,8 +1,7 @@
 import { $ } from "bun";
-import { mkdir, mkdtemp, readFile, readdir, rename, rm, writeFile, } from "node:fs/promises";
+import { mkdir, mkdtemp, readdir, rename, rm, writeFile, } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import path from "node:path";
-import semver from "semver";
 import { DEFAULT_PROTOBUF_JAVA_VERSION, GRPC_JAVA_VERSION, } from "../../versions";
 /**
  * Publish generated Java code to the Maven repository in Artifact Keeper.
@@ -25,22 +24,11 @@ export class ArtifactKeeperJavaPublisher {
          * Java build tools expect sources in src/main/java.
          */
         await this.moveSources(generatedDirectory);
-        const resolvedOptions = await this.resolveProtobufJavaVersion({
-            generatedDirectory,
-            options,
-        });
-        switch (resolvedOptions.buildTool) {
+        switch (options.buildTool) {
             case "gradle":
-                return await this.publishGradle({
-                    generatedDirectory,
-                    options: resolvedOptions,
-                });
+                return await this.publishGradle({ generatedDirectory, options });
             case "maven":
-            default:
-                return await this.publishMaven({
-                    generatedDirectory,
-                    options: resolvedOptions,
-                });
+                return await this.publishMaven({ generatedDirectory, options });
         }
     }
     async publishMaven({ generatedDirectory, options, }) {
@@ -89,41 +77,6 @@ export class ArtifactKeeperJavaPublisher {
             await rename(path.join(generatedDirectory, entry.name), path.join(sourceDirectory, entry.name));
         }
     }
-    async resolveProtobufJavaVersion({ generatedDirectory, options, }) {
-        const generatedVersion = await this.findGeneratedProtobufJavaVersion(path.join(generatedDirectory, "src", "main", "java"));
-        if (!generatedVersion)
-            return options;
-        /*
-         * Local Java generation uses the protoc version on the runner.
-         * The generated files say which protobuf-java runtime they need.
-         * Use that version unless the caller supplied a compatible newer one.
-         */
-        if (!options.protobufJavaVersion) {
-            return { ...options, protobufJavaVersion: generatedVersion };
-        }
-        if (semver.lt(options.protobufJavaVersion, generatedVersion)) {
-            throw new Error(`Generated Java code requires protobuf-java ${generatedVersion}, but protobufJavaVersion is ${options.protobufJavaVersion}.`);
-        }
-        return options;
-    }
-    async findGeneratedProtobufJavaVersion(directory) {
-        const versions = [];
-        for (const entry of await readdir(directory, { withFileTypes: true })) {
-            const filePath = path.join(directory, entry.name);
-            if (entry.isDirectory()) {
-                const version = await this.findGeneratedProtobufJavaVersion(filePath);
-                if (version)
-                    versions.push(version);
-                continue;
-            }
-            if (!entry.isFile() || !entry.name.endsWith(".java"))
-                continue;
-            const match = /Protobuf Java Version:\s*(\S+)/.exec(await readFile(filePath, "utf8"));
-            if (match?.[1] && semver.valid(match[1]))
-                versions.push(match[1]);
-        }
-        return versions.sort(semver.rcompare)[0];
-    }
     /*
      * Keep this public for tests.
      * It is generated here because Buf does not write Maven project files.

package/package.json

@@ -3,7 +3,7 @@
   "type": "module",
   "author": "Tahmid Ahmed",
   "description": "A collection of Bun shell scripts that can be re-used in various CICD pipelines.",
-  "version": "1.0.81-beta.d684dda2",
+  "version": "1.0.81",
   "repository": {
     "url": "git+https://github.com/tahminator/pipeline.git"
   },