wow - got logging working by removing the gradleTestKit thing

Author: jamesward

build.gradle.kts

@@ -39,10 +39,6 @@ subprojects {
     group = rootProject.group
     version = rootProject.version
 
-    repositories {
-        mavenCentral()
-    }
-
     tasks.withType<JavaCompile> {
         sourceCompatibility = JavaVersion.VERSION_1_8.toString()
         targetCompatibility = JavaVersion.VERSION_1_8.toString()

examples/build.gradle.kts

@@ -20,3 +20,4 @@ subprojects {
 }
 
 tasks.create("assemble").dependsOn(":server:installDist")
+

examples/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/libs.versions.toml

@@ -36,3 +36,4 @@ truth-proto-extension = { group = "com.google.truth.extensions", name = "truth-p
 okhttp = { group = "com.squareup.okhttp", name = "okhttp", version = "2.7.5" }
 javax-annotation-api = { group = "javax.annotation", name = "javax.annotation-api", version = "1.3.2" }
 testcontainers = { group = "org.testcontainers", name = "testcontainers", version = "1.19.6" }
+slf4j-simple = { group = "org.slf4j", name = "slf4j-simple", version = "2.0.12" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

integration_testing/build.gradle.kts

@@ -10,10 +10,14 @@ kotlin {
 }
 
 dependencies {
-    testImplementation(gradleTestKit())
     testImplementation(libs.testcontainers)
+    testImplementation("org.gradle:gradle-test-kit:6.1")
+    testImplementation("org.gradle:gradle-test-kit:6.1")
+    testImplementation("commons-io:commons-io:2.15.1")
+    testImplementation("org.gradle:gradle-tooling-api:8.6")
     testImplementation(libs.junit.jupiter)
     testRuntimeOnly(libs.junit.platform.launcher)
+    testRuntimeOnly(libs.slf4j.simple)
 }
 
 tasks.named<Test>("test") {
@@ -27,7 +31,7 @@ tasks.named<Test>("test") {
     testLogging {
         showStandardStreams = true
         exceptionFormat = TestExceptionFormat.FULL
-        events(TestLogEvent.STARTED, TestLogEvent.PASSED, TestLogEvent.SKIPPED, TestLogEvent.FAILED)
+        events(TestLogEvent.STANDARD_OUT, TestLogEvent.STANDARD_ERROR, TestLogEvent.STARTED, TestLogEvent.PASSED, TestLogEvent.SKIPPED, TestLogEvent.FAILED)
     }
 
     retry {
@@ -48,4 +52,4 @@ tasks.named<Test>("test") {
      */
 
     // todo: cleanup copyExamples.destinationDir or move copy to tests
-}
+}

integration_testing/src/test/kotlin/io/grpc/kotlin/ExamplesTest.kt

@@ -1,14 +1,19 @@
 package io.grpc.kotlin
 
-import org.gradle.internal.impldep.org.apache.commons.io.FileUtils
+import org.apache.commons.io.FileUtils
 import org.gradle.testkit.runner.GradleRunner
 import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.io.TempDir
 import org.testcontainers.containers.GenericContainer
 import org.testcontainers.containers.wait.strategy.Wait
 import java.io.File
+import java.net.URI
 import java.nio.file.Path
+import java.util.Properties
+import kotlin.io.path.div
+import kotlin.io.path.inputStream
+
 
 class ExamplesTest {
 
@@ -50,16 +55,22 @@ class ExamplesTest {
         }
         settingsGradle.writeText(settingsGradleNewLines.joinToString("\n"))
 
+        val gradleWrapperProperties = Properties()
+        gradleWrapperProperties.load((tempDir / "gradle/wrapper/gradle-wrapper.properties").inputStream())
+        val distributionUrl = URI.create(gradleWrapperProperties.getProperty("distributionUrl"))
+
         val dependencyResult = GradleRunner.create()
             .withProjectDir(tempDir.toFile())
             .withArguments(":stub:dependencies")
+            .withGradleDistribution(distributionUrl)
             .build()
 
         assertTrue(dependencyResult.output.contains("io.grpc:grpc-kotlin-stub:$grpcKotlinVersion"))
 
         GradleRunner.create()
             .withProjectDir(tempDir.toFile())
             .withArguments(":server:jibDockerBuild", "--image=grpc-kotlin-examples-server")
+            .withGradleDistribution(distributionUrl)
             .build()
 
         val container = GenericContainer("grpc-kotlin-examples-server")
@@ -70,11 +81,12 @@ class ExamplesTest {
 
         val clientResult = GradleRunner.create()
             .withProjectDir(tempDir.toFile())
-            .withEnvironment(mapOf("PORT" to container.getFirstMappedPort().toString()))
+            .withEnvironment(mapOf("PORT" to container.firstMappedPort.toString()))
             .withArguments(":client:HelloWorldClient")
+            .withGradleDistribution(distributionUrl)
             .build()
 
         assertTrue(clientResult.output.contains("Received: Hello world"))
     }
 
-}
+}

settings.gradle.kts

@@ -1,3 +1,11 @@
 rootProject.name = "grpc-kotlin"
 
 include("stub", "compiler", "interop_testing", "integration_testing")
+
+dependencyResolutionManagement {
+    @Suppress("UnstableApiUsage")
+    repositories {
+        mavenCentral()
+        maven("https://repo.gradle.org/gradle/libs-releases")
+    }
+}