File: fix-gradle-build.patch

package info (click to toggle)
rx-java 3.1.5-1
  • links: PTS, VCS
  • area: main
  • in suites: bookworm, forky, sid, trixie
  • size: 20,972 kB
  • sloc: java: 313,833; xml: 252; sh: 47; makefile: 8
file content (182 lines) | stat: -rw-r--r-- 5,022 bytes parent folder | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
Description: Allow Gradle to correctly build this package
Author: Olek Wojnar <olek@debian.org>
Forwarded: not-needed
Last-Update: 2020-12-27

--- a/build.gradle
+++ b/build.gradle
@@ -1,15 +1,12 @@
+buildscript {
+  dependencies {
+    classpath "biz.aQute.bnd:biz.aQute.bnd.gradle:debian"
+  }
+}
+
 plugins {
     id("java-library")
-    id("checkstyle")
-    id("eclipse")
-    id("jacoco")
     id("maven-publish")
-    id("ru.vyarus.animalsniffer") version "1.5.4"
-    id("me.champeau.gradle.jmh") version "0.5.3"
-    id("com.github.hierynomus.license") version "0.16.1"
-    id("biz.aQute.bnd.builder") version "6.2.0"
-    id("com.vanniktech.maven.publish") version "0.19.0"
-    id("org.beryx.jar") version "1.2.0"
 }
 
 ext {
@@ -35,58 +32,23 @@
     mavenCentral()
 }
 
+apply plugin: "java-library"
+apply plugin: "maven"
+
 dependencies {
-    signature "org.codehaus.mojo.signature:java18:1.0@signature"
 
     api "org.reactivestreams:reactive-streams:$reactiveStreamsVersion"
-    jmh "org.reactivestreams:reactive-streams:$reactiveStreamsVersion"
-
-    testImplementation "junit:junit:$junitVersion"
-    testImplementation "org.mockito:mockito-core:$mockitoVersion"
-
-    testImplementation "org.reactivestreams:reactive-streams-tck:$reactiveStreamsVersion"
-    testImplementation "org.testng:testng:$testNgVersion"
-    testImplementation "com.google.guava:guava:$guavaVersion"
 }
 
-java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
-}
+sourceCompatibility = JavaVersion.VERSION_1_8
+targetCompatibility = JavaVersion.VERSION_1_8
 
 tasks.withType(JavaCompile) {
     options.compilerArgs << "-parameters"
 }
 
-apply from: file("gradle/javadoc_cleanup.gradle")
-
-javadoc {
-    exclude "**/internal/**"
-    exclude "**/test/**"
-    exclude "**/perf/**"
-    exclude "**/jmh/**"
-    options {
-        windowTitle = "RxJava Javadoc ${project.version}"
-    }
-    // Clear the following options to make the docs consistent with the old format
-    options.addStringOption("top").value = ""
-    options.addStringOption("doctitle").value = ""
-    options.addStringOption("header").value = ""
-    options.stylesheetFile = project.file("gradle/stylesheet.css")
-
-    options.links(
-            "https://docs.oracle.com/javase/8/docs/api/",
-            "http://www.reactive-streams.org/reactive-streams-${reactiveStreamsVersion}-javadoc/"
-    )
-
-    finalizedBy javadocCleanup
-}
-
-animalsniffer {
-    annotation = "io.reactivex.rxjava3.internal.util.SuppressAnimalSniffer"
-}
-
 jar {
+    apply plugin: 'biz.aQute.bnd.builder'
     // Cover for bnd still not supporting MR Jars: https://github.com/bndtools/bnd/issues/2227
     bnd('-fixupmessages': '^Classes found in the wrong directory: \\\\{META-INF/versions/9/module-info\\\\.class=module-info}$')
     bnd(
@@ -101,78 +63,6 @@
             "Multi-Release": "true"
     )
 
-    moduleInfoPath = 'src/main/module/module-info.java'
-}
-
-license {
-    header project.file("config/license/HEADER")
-    ext.year = Calendar.getInstance().get(Calendar.YEAR)
-    skipExistingHeaders true
-    ignoreFailures true
-    excludes(["**/*.md", "**/*.txt"])
-}
-
-jmh {
-    jmhVersion = jmhLibVersion
-    humanOutputFile = null
-    includeTests = false
-    jvmArgs = ["-Djmh.ignoreLock=true"]
-    jvmArgsAppend = ["-Djmh.separateClasspathJAR=true"]
-
-    if (project.hasProperty("jmh")) {
-        include = [".*" + project.jmh + ".*"]
-        logger.info("JMH: {}", include)
-    }
-}
-
-test {
-    maxHeapSize = "1200m"
-}
-
-task testNG(type: Test) {
-    useTestNG()
-}
-
-check.dependsOn testNG
-
-tasks.withType(Test) {
-    testLogging {
-        events = ["skipped", "failed"]
-        exceptionFormat = "full"
-
-        debug.events = ["skipped", "failed"]
-        debug.exceptionFormat = "full"
-
-        info.events = ["failed", "skipped"]
-        info.exceptionFormat = "full"
-
-        warn.events = ["failed", "skipped"]
-        warn.exceptionFormat = "full"
-    }
-
-    if (System.getenv("CI") == null) {
-        maxParallelForks = Runtime.runtime.availableProcessors().intdiv(2) ?: 1
-    }
-}
-
-jacocoTestReport {
-    dependsOn test
-    dependsOn testNG
-
-    reports {
-        xml.enabled = true
-        html.enabled = true
-    }
-}
-
-check.dependsOn jacocoTestReport
-
-checkstyle {
-    configFile = project.file("config/checkstyle/checkstyle.xml")
-    configProperties = [
-            "checkstyle.suppressions.file": project.file("config/checkstyle/suppressions.xml"),
-            "checkstyle.header.file"      : project.file("config/license/HEADER_JAVA")
-    ]
 }
 
 if (project.hasProperty("releaseMode")) {
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,5 @@
 group=io.reactivex.rxjava3
-version=3.0.0-SNAPSHOT
+version=3.1.5
 description=RxJava: Reactive Extensions for the JVM – a library for composing asynchronous and event-based programs using observable sequences for the Java VM.
 
 POM_ARTIFACT_ID=rxjava