[kafka] branch 2.6 updated: MINOR: Ensure same version of scala library is used for compile and at runtime (#9168)

[rsivaram]

This is an automated email from the ASF dual-hosted git repository.

rsivaram pushed a commit to branch 2.6
in repository https://gitbox.apache.org/repos/asf/kafka.git


The following commit(s) were added to refs/heads/2.6 by this push:
     new fe02790  MINOR: Ensure same version of scala library is used for 
compile and at runtime (#9168)
fe02790 is described below

commit fe0279026bd3d854a7291f5bf99503469e900038
Author: Rajini Sivaram <rajinisiva...@googlemail.com>
AuthorDate: Wed Aug 12 23:39:21 2020 +0100

    MINOR: Ensure same version of scala library is used for compile and at 
runtime (#9168)
    
    Reviewers: Ismael Juma <ism...@juma.me.uk>
---
 build.gradle | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 9a3bbb6..fc19f22 100644
--- a/build.gradle
+++ b/build.gradle
@@ -74,8 +74,10 @@ allprojects {
         }
       }
     }
-    configurations {
-      runtime {
+    configurations.all {
+      // zinc is the Scala incremental compiler, it has a configuration for 
its own dependencies
+      // that are unrelated to the project dependencies, we should not change 
them
+      if (name != "zinc") {
         resolutionStrategy {
           force(
             // ensure we have a single version of scala jars in the classpath, 
we enable inlining