MINOR: Update build.gradle and release.py to upload streams-scala_2.12#5368
Conversation
ijuma
left a comment
ijuma
left a comment
There was a problem hiding this comment.
Hmm, why isn't uploadArchivesAll working? We should not need the 2_12 version anymore.
|
For reference, Scala 2.12 was added to the *All commands when we dropped Java 7 support: e70a191#diff-6512f838e273b79676cac5f72456127f Looks like the update to release.py was incomplete and the supposedly redundant upload archive line was not removed. |
|
@ijuma Thanks for the review. The various |
| startParameter = project.getGradle().getStartParameter().newInstance() | ||
| startParameter.projectProperties += [scalaVersion: "${sv}"] | ||
| // core has a separate source jar for each scala version, streams-scala source is included | ||
| // in the single streams sources jar |
There was a problem hiding this comment.
@guozhangwang @mjsax The behaviour with regards to the Scala source mentioned in the comment above is a bit weird.
There was a problem hiding this comment.
I think we have a separate jar for each scala version as well for kafka-streams-scala?
There was a problem hiding this comment.
@ijuma @guozhangwang Sorry, this was an issue with the older version of gradle that I was testing with. Updated that and now it does generate separate source jars (I dont understand why). Updated build.gradle.
|
|
||
| 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('test_scala') + pkgs.collect { it + ":test" }) { } |
There was a problem hiding this comment.
Maybe we should use camel case here and a few lines above for consistency with the other task names.
| 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) |
There was a problem hiding this comment.
Just curious: seems we do not need this step even before this PR. Is that right?
There was a problem hiding this comment.
Yes, that should have been removed in a previous PR.
|
retest this please |
|
Merging to trunk and 2.0. |
#5368) Reviewers: Ismael Juma <ismael@juma.me.uk>, Guozhang Wang <wangguoz@gmail.com>
3 participants
Committer Checklist (excluded from commit message)