upgrade some dependencies and fix mac conformance tests (#89)

Author: andrewparmet

build.gradle.kts

@@ -24,7 +24,6 @@ buildscript {
 
     dependencies {
         classpath(libraries.kotlinPlugin)
-        classpath(libraries.protobufPlugin)
     }
 }
 

buildSrc/build.gradle.kts

@@ -27,8 +27,8 @@ repositories {
 }
 
 dependencies {
-    implementation("com.diffplug.spotless:spotless-plugin-gradle:4.2.0")
-    implementation("com.google.protobuf:protobuf-gradle-plugin:0.8.12")
+    implementation("com.diffplug.spotless:spotless-plugin-gradle:5.5.1")
+    implementation("com.google.protobuf:protobuf-gradle-plugin:0.8.13")
     implementation("io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.21.2")
     implementation("com.google.guava:guava:29.0-jre")
     implementation("ru.vyarus:gradle-animalsniffer-plugin:1.5.0")

buildSrc/src/main/kotlin/Dependencies.kt

@@ -18,13 +18,13 @@ import com.toasttab.protokt.gradle.DEFAULT_PROTOBUF_VERSION
 object versions {
     const val arrow = "0.10.5"
     const val autoService = "1.0-rc7"
-    const val grpc = "1.29.0"
-    const val jackson = "2.11.0"
+    const val grpc = "1.32.1"
+    const val jackson = "2.11.3"
     const val kollection = "0.7"
     const val kotlin = "1.3.72"
     const val kotlinxCoroutines = "1.3.7"
     const val protobuf = DEFAULT_PROTOBUF_VERSION
-    const val protobufPlugin = "0.8.12"
+    const val protobufPlugin = "0.8.13"
     const val stringTemplate = "4.3"
 
     // Test

buildSrc/src/main/kotlin/Lint.kt

@@ -19,7 +19,7 @@ import org.gradle.kotlin.dsl.apply
 import org.gradle.kotlin.dsl.configure
 
 fun Project.lint() {
-    apply(plugin = "com.diffplug.gradle.spotless")
+    apply(plugin = "com.diffplug.spotless")
 
     configure<SpotlessExtension> {
         kotlin {

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

testing/conformance-driver/README.md

@@ -11,9 +11,11 @@ Mac conformance tests:
 protobuf % ./configure
 protobuf % make clean
 protobuf % make
-protobuf % cd conformance/
+protobuf % cd conformance
 conformance % make
-conformance % cp .libs/conformance-test-runner ../../protokt/testing/conformance-driver/bin/darwin/conformance-test-runner
+conformance % cd ..
+protobuf % cp conformance/.libs/conformance-test-runner ../protokt/testing/conformance-driver/bin/darwin/conformance-test-runner
+protobuf % cp src/.libs/libprotobuf.24.dylib ../protokt/testing/conformance-driver/bin/darwin/.libs/libprotobuf.24.dylib
 ```
 
 Ubuntu conformance tests:
@@ -24,12 +26,12 @@ root@38f7a53696b9:/# cd tmp/
 root@38f7a53696b9:/tmp# ./configure
 root@38f7a53696b9:/tmp# make clean
 root@38f7a53696b9:/tmp# make
-root@38f7a53696b9:/tmp# cd conformance/
+root@38f7a53696b9:/tmp# cd conformance
 root@38f7a53696b9:/tmp/conformance# make
 root@38f7a53696b9:/tmp/conformance# exit
 protobuf % cp conformance/.libs/conformance-test-runner ../protokt/testing/conformance-driver/bin/ubuntu-16.04-x86_64/conformance-test-runner
 protobuf % cp src/.libs/libprotobuf.so.24 ../protokt/testing/conformance-driver/bin/ubuntu-16.04-x86_64/.libs/libprotobuf.so.24
 ```
 
-Note that the integer suffix on `libprotobuf.so` may change, and the need to
-copy it may disappear as it has for running the conformance tests on Mac.
+Note that the version numbers on `libprotobuf.so.xx` and `libprotobuf.xx.dylib`
+may change.

testing/conformance-driver/bin/darwin/.libs/libprotobuf.24.dylib

@@ -63,7 +63,7 @@ private val command =
     "$baseCommand --enforce_recommended $failureList $conformanceDriver"
 
 private val libPathOverride =
-    pivotOs(
-        emptyMap(),
-        mapOf("LD_LIBRARY_PATH" to Paths.get(binDir, ".libs").toString())
+    mapOf(
+        pivotOs("DYLD_LIBRARY_PATH", "LD_LIBRARY_PATH") to
+            Paths.get(binDir, ".libs").toString()
     )

testing/conformance-tests/src/test/kotlin/com/toasttab/protokt/conformance/ConformanceTest.kt

@@ -29,6 +29,8 @@ fun String.runCommand(
     workingDir: Path,
     env: Map<String, String> = emptyMap()
 ): ProcessOutput {
+    println("Executing $this in $workingDir with $env")
+
     val proc =
         ProcessBuilder(*split("\\s".toRegex()).toTypedArray())
             .directory(workingDir.toFile())