kafka-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rsiva...@apache.org
Subject [kafka] branch trunk updated: MINOR: Update build.gradle and release.py to upload streams-scala_2.12 (#5368)
Date Thu, 19 Jul 2018 10:33:45 GMT
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/trunk by this push:
     new 10a0b8a  MINOR: Update build.gradle and release.py to upload streams-scala_2.12 (#5368)
10a0b8a is described below

commit 10a0b8a6baad201227281a34ce80748beddd0739
Author: Rajini Sivaram <rajinisivaram@googlemail.com>
AuthorDate: Thu Jul 19 11:33:34 2018 +0100

    MINOR: Update build.gradle and release.py to upload streams-scala_2.12 (#5368)
    
    Reviewers: Ismael Juma <ismael@juma.me.uk>, Guozhang Wang <wangguoz@gmail.com>
---
 build.gradle | 22 +++++++++++-----------
 release.py   |  1 -
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/build.gradle b/build.gradle
index 3b04e4b..3e8558d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -473,28 +473,28 @@ task reportCoverage(dependsOn: ['jacocoRootReport', 'core:reportCoverage'])
 for ( sv in availableScalaVersions ) {
   String taskSuffix = sv.replaceAll("\\.", "_")
 
-  tasks.create(name: "jar_core_${taskSuffix}", type: GradleBuild) {
+  tasks.create(name: "jarScala_${taskSuffix}", type: GradleBuild) {
     startParameter = project.getGradle().getStartParameter().newInstance()
     startParameter.projectProperties += [scalaVersion: "${sv}"]
-    tasks = ['core:jar']
+    tasks = ['core:jar', 'streams:streams-scala:jar']
   }
 
-  tasks.create(name: "test_core_${taskSuffix}", type: GradleBuild) {
+  tasks.create(name: "testScala_${taskSuffix}", type: GradleBuild) {
     startParameter = project.getGradle().getStartParameter().newInstance()
     startParameter.projectProperties += [scalaVersion: "${sv}"]
-    tasks = ['core:test']
+    tasks = ['core:test', 'streams:streams-scala:test']
   }
 
   tasks.create(name: "srcJar_${taskSuffix}", type: GradleBuild) {
     startParameter = project.getGradle().getStartParameter().newInstance()
     startParameter.projectProperties += [scalaVersion: "${sv}"]
-    tasks = ['core:srcJar']
+    tasks = ['core:srcJar', 'streams:streams-scala:srcJar']
   }
 
   tasks.create(name: "docsJar_${taskSuffix}", type: GradleBuild) {
     startParameter = project.getGradle().getStartParameter().newInstance()
     startParameter.projectProperties += [scalaVersion: "${sv}"]
-    tasks = ['core:docsJar']
+    tasks = ['core:docsJar', 'streams:streams-scala:docsJar']
   }
 
   tasks.create(name: "install_${taskSuffix}", type: GradleBuild) {
@@ -509,10 +509,10 @@ for ( sv in availableScalaVersions ) {
     tasks = ['releaseTarGz']
   }
 
-  tasks.create(name: "uploadCoreArchives_${taskSuffix}", type: GradleBuild) {
+  tasks.create(name: "uploadScalaArchives_${taskSuffix}", type: GradleBuild) {
     startParameter = project.getGradle().getStartParameter().newInstance()
     startParameter.projectProperties += [scalaVersion: "${sv}"]
-    tasks = ['core:uploadArchives']
+    tasks = ['core:uploadArchives', 'streams:streams-scala:uploadArchives']
   }
 }
 
@@ -525,20 +525,20 @@ def withDefScalaVersions(taskName) {
 }
 
 tasks.create(name: "jarConnect", dependsOn: connectPkgs.collect { it + ":jar" }) {}
-tasks.create(name: "jarAll", dependsOn: withDefScalaVersions('jar_core') + pkgs.collect {
it + ":jar" }) { }
+tasks.create(name: "jarAll", dependsOn: withDefScalaVersions('jarScala') + pkgs.collect {
it + ":jar" }) { }
 
 tasks.create(name: "srcJarAll", dependsOn: withDefScalaVersions('srcJar') + pkgs.collect
{ it + ":srcJar" }) { }
 
 tasks.create(name: "docsJarAll", dependsOn: withDefScalaVersions('docsJar') + pkgs.collect
{ it + ":docsJar" }) { }
 
 tasks.create(name: "testConnect", dependsOn: connectPkgs.collect { it + ":test" }) {}
-tasks.create(name: "testAll", dependsOn: withDefScalaVersions('test_core') + pkgs.collect
{ it + ":test" }) { }
+tasks.create(name: "testAll", dependsOn: withDefScalaVersions('testScala') + pkgs.collect
{ it + ":test" }) { }
 
 tasks.create(name: "installAll", dependsOn: withDefScalaVersions('install') + pkgs.collect
{ it + ":install" }) { }
 
 tasks.create(name: "releaseTarGzAll", dependsOn: withDefScalaVersions('releaseTarGz')) {
}
 
-tasks.create(name: "uploadArchivesAll", dependsOn: withDefScalaVersions('uploadCoreArchives')
+ pkgs.collect { it + ":uploadArchives" }) { }
+tasks.create(name: "uploadArchivesAll", dependsOn: withDefScalaVersions('uploadScalaArchives')
+ pkgs.collect { it + ":uploadArchives" }) { }
 
 project(':core') {
   println "Building project 'core' with Scala version ${versions.scala}"
diff --git a/release.py b/release.py
index ec7d5c6..3573a7f 100755
--- a/release.py
+++ b/release.py
@@ -495,7 +495,6 @@ with open(os.path.expanduser("~/.gradle/gradle.properties")) as f:
 if not user_ok("Going to build and upload mvn artifacts based on these settings:\n" + contents
+ '\nOK (y/n)?: '):
     fail("Retry again later")
 cmd("Building and uploading archives", "./gradlew uploadArchivesAll", cwd=kafka_dir, env=jdk8_env)
-cmd("Building and uploading archives", "./gradlew uploadCoreArchives_2_12 -PscalaVersion=2.12",
cwd=kafka_dir, env=jdk8_env)
 cmd("Building and uploading archives", "mvn deploy -Pgpg-signing", cwd=streams_quickstart_dir,
env=jdk8_env)
 
 release_notification_props = { 'release_version': release_version,


Mime
View raw message