add 'shadowjar' config for conformance binaries; fix bug in readInt

connectrpc · Dec 20, 2023 · 6201610 · 6201610
1 parent 83d1de0
commit 6201610
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 4 deletions.
diff --git a/conformance/client/build.gradle.kts b/conformance/client/build.gradle.kts
@@ -20,6 +20,15 @@ sourceSets {
     }
 }
 
+tasks {
+    compileKotlin {
+        kotlinOptions {
+            // Generated Kotlin code for protobufs uses RequiresOptIn annotation
+            freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
+        }
+    }
+}
+
 dependencies {
     implementation(project(":okhttp"))
     implementation(libs.kotlin.coroutines.core)

diff --git a/conformance/client/google-java/build.gradle.kts b/conformance/client/google-java/build.gradle.kts
@@ -20,6 +20,15 @@ tasks {
             freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
         }
     }
+    shadowJar {
+        archiveBaseName.set("shadow")
+        manifest {
+            attributes(mapOf("Main-Class" to "com.connectrpc.conformance.client.java.MainKt"))
+        }
+    }
+    build {
+        dependsOn(shadowJar)
+    }
 }
 
 // This project contains an alternate copy of the generated

diff --git a/conformance/client/google-javalite/build.gradle.kts b/conformance/client/google-javalite/build.gradle.kts
@@ -1,5 +1,28 @@
+buildscript {
+    repositories {
+        mavenCentral()
+        gradlePluginPortal()
+    }
+    dependencies {
+        classpath("gradle.plugin.com.github.johnrengelman:shadow:7.1.2")
+    }
+}
+
 plugins {
     kotlin("jvm")
+    id("com.github.johnrengelman.shadow").version("7.1.2")
+}
+
+tasks {
+    shadowJar {
+        archiveBaseName.set("shadow")
+        manifest {
+            attributes(mapOf("Main-Class" to "com.connectrpc.conformance.client.javalite.MainKt"))
+        }
+    }
+    build {
+        dependsOn(shadowJar)
+    }
 }
 
 dependencies {

diff --git a/...ormance/client/src/main/kotlin/com/connectrpc/conformance/client/ConformanceClientLoop.kt b/...ormance/client/src/main/kotlin/com/connectrpc/conformance/client/ConformanceClientLoop.kt
@@ -86,10 +86,10 @@ class ConformanceClientLoop {
 
         private fun InputStream.readInt(): Int? {
             val bytes = this.readN(4) ?: return null
-            return bytes[0].toInt().shl(24) or
-                bytes[1].toInt().shl(16) or
-                bytes[2].toInt().shl(8) or
-                bytes[3].toInt()
+            return bytes[0].toInt().and(0xff).shl(24) or
+                bytes[1].toInt().and(0xff).shl(16) or
+                bytes[2].toInt().and(0xff).shl(8) or
+                bytes[3].toInt().and(0xff)
         }
 
         fun parseArgs(args: Array<String>): InvokeStyle {