2.x: upgrade to Gradle 2.14 #4141

Merged
merged 2 commits into from Jun 28, 2016

Conversation

Projects
None yet
4 participants
Member

akarnokd commented Jun 28, 2016

Upgrade to 2.14.

akarnokd added the Build label Jun 28, 2016

Contributor

artem-zinnatullin commented Jun 28, 2016

Wait!

codecov-io commented Jun 28, 2016 edited

Current coverage is 69.20%

Merging #4141 into 2.x will decrease coverage by 0.01%

@@                2.x      #4141   diff @@
==========================================
  Files           386        386          
  Lines         27277      27277          
  Methods           0          0          
  Messages          0          0          
  Branches       4410       4410          
==========================================
- Hits          18882      18878     -4   
- Misses         6507       6508     +1   
- Partials       1888       1891     +3   

Powered by Codecov. Last updated by 64cda78...305ef3e

Contributor

artem-zinnatullin commented Jun 28, 2016

You just updated link to gradle wrapper, but you haven't run any gradle task and it didn't download new gradlew shell flies and new gradle-wrapper.jar

Just run gradle, ie: ./gradlew --version, it should update wrapper files and then you need to add them to PR.

Member

akarnokd commented Jun 28, 2016

C:\Users\akarnokd\git\RxJava>gradlew --version

------------------------------------------------------------
Gradle 2.14
------------------------------------------------------------

Build time:   2016-06-14 07:16:37 UTC
Revision:     cba5fea19f1e0c6a00cc904828a6ec4e11739abc

Groovy:       2.4.4
Ant:          Apache Ant(TM) version 1.9.6 compiled on June 29 2015
JVM:          1.8.0_92 (Oracle Corporation 25.92-b14)
OS:           Windows 7 6.1 amd64

C:\Users\akarnokd\git\RxJava>
Contributor

artem-zinnatullin commented Jun 28, 2016

Right, but for next PR gradle wrapper files will be marked as changed and will have to be commited.

Can you check what git status shows for you now? gradle/wrapper/gradle-wrapper.jar should be marked as changed, ./gradlew and ./gradlew.bat can be changed too.

You have to run ./gradlew wrapper to update the wrapper files.

Member

akarnokd commented Jun 28, 2016

Okay.

akarnokd added this to the 2.0 RC 1 milestone Jun 28, 2016

Contributor

artem-zinnatullin commented Jun 28, 2016

That's better, 👍

akarnokd merged commit a09f5a4 into ReactiveX:2.x Jun 28, 2016

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

akarnokd deleted the akarnokd:Gradle214 branch Jun 28, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment