From c9ba0008f4fb06ccc7ffde6dc84ee64eb7d224b1 Mon Sep 17 00:00:00 2001 From: akarnokd Date: Thu, 22 Aug 2019 23:05:02 +0200 Subject: [PATCH 1/2] 3.x: Upgrade Gradle & dependency versions --- build.gradle | 69 +++++++++--------- gradle/wrapper/gradle-wrapper.jar | Bin 54712 -> 54731 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- .../disposables/SequentialDisposableTest.java | 2 +- .../disposables/SerialDisposableTests.java | 2 +- 5 files changed, 39 insertions(+), 36 deletions(-) diff --git a/build.gradle b/build.gradle index 13c51c3564..17a89fd5fd 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,24 @@ buildscript { + + // Dependency versions + // --------------------------------------- + + ext.reactiveStreamsVersion = "1.0.3-RC1" + ext.junitVersion = "4.12" + ext.testNgVersion = "7.0.0" + ext.mockitoVersion = "3.0.0" + ext.jmhLibVersion = "1.21" + ext.jmhGradleVersion = "0.5.0-rc-2" + ext.guavaVersion = "28.0-jre" + ext.jacocoVersion = "0.8.4" + ext.animalSnifferVersion = "1.5.0" + ext.licenseVersion = "0.15.0" + ext.bintrayVersion = "1.7.3" + ext.jfrogExtractorVersion = "4.5.2" + ext.bndVersion = "4.2.0" + + // -------------------------------------- + repositories { jcenter() mavenCentral() @@ -7,11 +27,12 @@ buildscript { } } dependencies { - classpath "ru.vyarus:gradle-animalsniffer-plugin:1.2.0" - classpath "gradle.plugin.nl.javadude.gradle.plugins:license-gradle-plugin:0.13.1" - classpath "me.champeau.gradle:jmh-gradle-plugin:0.4.5" - classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3" - classpath "org.jfrog.buildinfo:build-info-extractor-gradle:4.5.2" + classpath "ru.vyarus:gradle-animalsniffer-plugin:$animalSnifferVersion" + classpath "gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin:$licenseVersion" + classpath "me.champeau.gradle:jmh-gradle-plugin:$jmhGradleVersion" + classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:$bintrayVersion" + classpath "org.jfrog.buildinfo:build-info-extractor-gradle:$jfrogExtractorVersion" + classpath "biz.aQute.bnd:biz.aQute.bnd.gradle:$bndVersion" } } @@ -38,7 +59,6 @@ apply plugin: "checkstyle" apply plugin: "jacoco" apply plugin: "ru.vyarus.animalsniffer" apply plugin: "maven" -apply plugin: "osgi" apply plugin: "me.champeau.gradle.jmh" apply plugin: "com.github.hierynomus.license" apply plugin: "com.jfrog.bintray" @@ -48,18 +68,6 @@ apply plugin: "eclipse" sourceCompatibility = JavaVersion.VERSION_1_6 targetCompatibility = JavaVersion.VERSION_1_6 -// Dependency versions -// --------------------------------------- - -def junitVersion = "4.12" -def reactiveStreamsVersion = "1.0.3-RC1" -def mockitoVersion = "2.1.0" -def jmhLibVersion = "1.20" -def testNgVersion = "6.11" -def guavaVersion = "24.0-jre" -def jacocoVersion = "0.8.0" -// -------------------------------------- - repositories { mavenCentral() } @@ -124,15 +132,17 @@ artifacts { archives javadocJar } +apply plugin: 'biz.aQute.bnd.builder' + jar { - manifest { - name = "rxjava" - instruction "Bundle-Vendor", "RxJava Contributors" - instruction "Bundle-DocURL", "https://github.com/ReactiveX/RxJava" - instruction "Import-Package", "!org.junit,!junit.framework,!org.mockito.*,!org.testng.*,*" - instruction "Eclipse-ExtensibleAPI", "true" - instruction "Automatic-Module-Name", "io.reactivex.rxjava3" - } + bnd ('Bundle-Name': 'rxjava', + 'Bundle-Vendor': 'RxJava Contributors', + 'Bundle-Description': 'Reactive Extensions for the JVM – a library for composing asynchronous and event-based programs using observable sequences for the Java VM.', + 'Import-Package': '!org.junit,!junit.framework,!org.mockito.*,!org.testng.*,*', + 'Bundle-DocURL': 'https://github.com/ReactiveX/RxJava', + 'Eclipse-ExtensibleAPI': 'true', + 'Automatic-Module-Name': 'io.reactivex.rxjava3' + ) } license { @@ -289,13 +299,6 @@ jacocoTestReport { xml.enabled = true html.enabled = true } - - afterEvaluate { - classDirectories = files(classDirectories.files.collect { - fileTree(dir: it, - exclude: ["io/reactivex/tck/**"]) - }) - } } jacocoTestReport.dependsOn GCandMem diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index ed88a042a287c140a32e1639edfc91b2a233da8c..6b6ea3ab4ff4f69d55c5fd9c0a6ac70f47d41008 100644 GIT binary patch delta 1771 zcmVlyNL@p1tGkQ%YJ9d8N?8pdv=1pol$4U>PO zAd`^I43i0P8h=nIgj*maK+>ck(4yF08T7A84n9Ntx;NiHFYg zPxObh{f?~2vSpV{Clj4Lt3A8l?tXjZKmPvpHvli=+bFhSO2r#dv|*|PTQS{%8N4Z_ zS^2mg!yInJa1(FI$J;7y#h_zeMOH;Fiq7gOA*FYulz*4ff_xYe+>YQ~sWc;4l&XR} zYsp7Z#T^y40@W&(4XaR6&^2~jzpG~|Wy8!&it@06j!7e5(90EDDA-;9_IPz`>Vx(SPj%wF;s}AzPWJPHvRz1f937N^!<0FDN+J2->pqnY^v%Op(c&MrOoXT+|D> zF{2!auj)I|NfH(uIsmsy8IZ3Wn9qmu9%1ra&WXhe) z|BRow8&>kIr*7C5rHaYSHU-|Et{7%cNCtG$cb&7t$)K-Qp^OvODbuv>`LVVq2RI&^ zy?YfB15E zIcZhwtT<;#_V)y=4oI&W_CvC^7U6#;d8nDfX1*&-xk@j!;$F~+|G+>%ODj(Q?pmj zvPZ$2K|#cD?=Tj+uJ^vXEgsbJ%R{=4i~EckDmY91>{KD~@Y*^G5Tl-x>`Vr2C4axe zda)=9G#G3;JguiMY>Gl&GMF_ORj@TV@?X}GvQ<^dh`AgminHx!>xgBV#3U){z_P`n zbyr{~zsB46=?^0=Sq3(WyEf|EB+^j%DOKf$QI=wU89iDj5r&QThr#Y?nE(P9`e{=C`ClS#gL1qX?b zsBj2FfFo_kVIn_5S>syO9QE>gmC`YKsb-boPTH)I&>lMm8K;O+xyK1wb$_zP4N!G* zoVwR=!gX?$s|2B@(y|hdy}Y81dVq&hj;o%knTJ(%J5$3dHT@pelTMh|`IKRfP$O+R zQtJ_03Do8bbb!Y*KFl3%AO)wII$7Jy$w3ESGbg7p;yU@$O;|ibC!5|i#_DxHhnAM> z64uRdjXy^+y@d7OA)4;)TYtianRI-kd?$_Kju7v0Z4(dC+i2VCm@Hva4d5~U&;(l< zVH3N!>t!Eyut0m+i9u#~hdV)m2*)2NLeRxz4&zQ#}|MbNh zr%yDQK3*$cQT&G!jg>H(9G2Z{Huq{{O6c2@4v=ZlwhP0OgZm&1C|vb(3*{Ba`dRF#?))lW~C~lg4%$ zlUvRz0x)`$ae*U~TzV3dyv`~DBz=={fg_VpeH)Wo&JdF}&l&+}lTpue0tSSWae*U~ z>CZ+1D3dVIX#y&blQEYmlU$D$lRncBlj_hK0v(c*F_$TmFVQ*zE0vQmmnoB7l@XIZ z(-4!j(Ha3LlhDy%0t=dxF_$lsVbVGR<(!jofg_W^(mMh?pObNcBaS}R001EVT{r*$ delta 1810 zcmYk6cTm&W7Jx%AYltWq1tpNMfIvi)zEqzOR;q#s0SUbeC_?ChL=hNC^y));|cg}b3oSE~-d0j2oRxOyJeP~1TihItl_Q05SK+q5K;3xuMzpa&u$K1R1^Rm{n2 zZT*4yP2TMfl;f>UN5A*yS<=r|doH(bwNqlOU#(=UKYRP@Eq06eyHcF1_eqF;qos-C zgNI$P?PODvn@X^?MRMvM4CQ`>wzp%5iS)Aej;(qt7dv!p+&TS|4^@AxbOyHV(L;#0 zUVj=dh}jh`Ca#|PqUIKeS#XzDX?23JPrJWc4va*GyLsBt9CmOtZP|zgq7pVK7XL0S zH`4j~P|ae5+t3ZY7-UG{*&gZN$O`WgarR|2Z7v6k{oLOIQS)ZhPNkd3hhF`iaKdz`S!d-J_1P1hbPFDnj{ zk~tQdQCpVlAqr5+kGvkwt?58SY;AQsT-Zft#rwFIwFQ=SUlnC8eBCN84E`WEKUf!f z6?S1a!ZB_@9v+>sDH9N9sxRxT;zPy^8W_*a+O}LWI#ij*^#oQM z12aO2=#B!oOFN;Nv2^tiJxcqI$jIC*!AR+8a zcwZaI`2Nn}C(zJTgvV&+R5Cq)LN%lq8<3B=vXU0TrxeVw!D@JpJGkY*9kiq(B zp%=l#h-GJR;Y)~0t1ZnnBI%h1&DDzfvEs4PyU()!;KC#N&P8a4rsA!-lcb^(%=Xfc z{$2p%bj;KfzE*JKCZ9{=c1X8ZmhoFlStUzc(kxS)fn3kB+`EFt zy>fd|1NTsnCn{4q_izADuuc={^5;gwJU&cuHpZJBS{f~8E~MDmM%@g6d-_6V(BpMg zR&~8_6=`6s5sbC?XY%^|3nxjx62|WP*c`T&gJAnNmFBweY%5{5#v#x(%frxmG0t_s zif+wc-vlG?0&2r(pl?_keEc5Yp++u) zu@Cr|JYo&rddSEBj+lVOQu*k|x(q&*&PV@rDPWbQ1cqhtQ-e2#;L|yL49GckU_^me zZxCRyJbuX{Ul=&SRt4{n{+~(#wIiZHHX8wE7ao)}`5!EbMTJ2>&)H)B+n8b$UnZCS zTl$qANLiqGR8;^DutsgcE1iH*t1O`3B@EOvMFB4k0=(V>5IDX9bbxzs=K)v8)Fpom aN$jA*iGw)(v(pdw2;`5Q`^A|4gZ~HOz+3bH diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0e680f3759..086b56fe1e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.3.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6-bin.zip diff --git a/src/test/java/io/reactivex/rxjava3/disposables/SequentialDisposableTest.java b/src/test/java/io/reactivex/rxjava3/disposables/SequentialDisposableTest.java index 5f6813d528..ffba10854b 100644 --- a/src/test/java/io/reactivex/rxjava3/disposables/SequentialDisposableTest.java +++ b/src/test/java/io/reactivex/rxjava3/disposables/SequentialDisposableTest.java @@ -21,7 +21,7 @@ import org.junit.*; import org.junit.runner.RunWith; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import io.reactivex.rxjava3.core.RxJavaTest; import io.reactivex.rxjava3.internal.disposables.SequentialDisposable; diff --git a/src/test/java/io/reactivex/rxjava3/disposables/SerialDisposableTests.java b/src/test/java/io/reactivex/rxjava3/disposables/SerialDisposableTests.java index 442c2e8385..10c249aa63 100644 --- a/src/test/java/io/reactivex/rxjava3/disposables/SerialDisposableTests.java +++ b/src/test/java/io/reactivex/rxjava3/disposables/SerialDisposableTests.java @@ -21,7 +21,7 @@ import org.junit.*; import org.junit.runner.RunWith; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import io.reactivex.rxjava3.core.RxJavaTest; import io.reactivex.rxjava3.internal.disposables.DisposableHelper; From b919a2d0e919416e68aef01c3bbb3a0de7e7458d Mon Sep 17 00:00:00 2001 From: akarnokd Date: Thu, 22 Aug 2019 23:32:45 +0200 Subject: [PATCH 2/2] Add checkstyle version string to the top, fix JMH class --- build.gradle | 3 ++- .../rxjava3/core/InputWithIncrementingInteger.java | 10 ++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 17a89fd5fd..33689f530e 100644 --- a/build.gradle +++ b/build.gradle @@ -16,6 +16,7 @@ buildscript { ext.bintrayVersion = "1.7.3" ext.jfrogExtractorVersion = "4.5.2" ext.bndVersion = "4.2.0" + ext.checkstyleVersion = "6.19" // -------------------------------------- @@ -308,7 +309,7 @@ build.dependsOn jacocoTestReport checkstyle { configFile file("checkstyle.xml") ignoreFailures = true - toolVersion ="6.19" + toolVersion = checkstyleVersion } if (rootProject.hasProperty("releaseMode")) { diff --git a/src/jmh/java/io/reactivex/rxjava3/core/InputWithIncrementingInteger.java b/src/jmh/java/io/reactivex/rxjava3/core/InputWithIncrementingInteger.java index b0212f52d7..24c4e016d3 100644 --- a/src/jmh/java/io/reactivex/rxjava3/core/InputWithIncrementingInteger.java +++ b/src/jmh/java/io/reactivex/rxjava3/core/InputWithIncrementingInteger.java @@ -44,7 +44,8 @@ public void onNext(Integer t) { } final class IncrementingIterable implements Iterable { - private final class IncrementingIterator implements Iterator { + + final class IncrementingIterator implements Iterator { int i; @Override @@ -64,9 +65,9 @@ public void remove() { } } - private final int size; + final int size; - private IncrementingIterable(int size) { + IncrementingIterable(int size) { this.size = size; } @@ -77,7 +78,8 @@ public Iterator iterator() { } final class IncrementingPublisher implements Publisher { - private final int size; + + final int size; IncrementingPublisher(int size) { this.size = size;