File: 01-edit-build-system.patch

package info (click to toggle)
libjxmpp-java 1.0.1-5
  • links: PTS, VCS
  • area: main
  • in suites: forky, sid
  • size: 904 kB
  • sloc: java: 5,826; xml: 687; sh: 21; python: 11; makefile: 9
file content (227 lines) | stat: -rw-r--r-- 6,160 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
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
From: Sunil Mohan Adapa <sunil@medhas.org>
Date: Sat, 1 May 2021 12:31:16 -0700
Subject: Alter gradle build file to suite Debian

The following build system functionality is disabled because it is not needed in
Debian and simplifies packaging effort by not needed dependencies.

Error Prone and Animal Sniffer tools help upstream in avoiding errors and
ensuring compatibility with multiple version of Java.

JMH is used for benchmarking.

Coveralls and Jacoco are needed for code coverage analysis and reporting that
upstream developers can use to increase number of tests.

Eclipse and Idea plugins are needed for generating project files that can be
opened in respective IDEs.

Disable tests until all the dependencies are packaged and they can be run
reliably.

Disable sub-projects that have additional dependencies and focus on parts that
are needed for Smack and Jitsi.

Forwarded: not-needed
---
 build.gradle    | 58 ++++++++++++++++++++++++++++-----------------------------
 settings.gradle | 10 +++++-----
 2 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/build.gradle b/build.gradle
index 194c9df..0010922 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,22 +6,22 @@ buildscript {
 		mavenCentral()
 	}
 
-	dependencies {
-		classpath "org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.8.2"
-	}
+	// dependencies {
+	// 	classpath "org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.8.2"
+	// }
 }
 
 plugins {
-	id 'ru.vyarus.animalsniffer' version '1.5.0'
-	id 'net.ltgt.errorprone' version '0.8.1'
-	id 'me.champeau.gradle.jmh' version '0.4.8'
+	// id 'ru.vyarus.animalsniffer' version '1.5.0'
+	// id 'net.ltgt.errorprone' version '0.8.1'
+	// id 'me.champeau.gradle.jmh' version '0.4.8'
 }
 
 allprojects {
 	apply plugin: 'java'
-	apply plugin: 'eclipse'
-	apply plugin: 'idea'
-	apply plugin: 'jacoco'
+	// apply plugin: 'eclipse'
+	// apply plugin: 'idea'
+	// apply plugin: 'jacoco'
 
 	repositories {
 		mavenLocal()
@@ -45,14 +45,14 @@ allprojects {
 		sonatypeStagingUrl = 'https://oss.sonatype.org/service/local/staging/deploy/maven2'
 		builtDate = (new java.text.SimpleDateFormat("yyyy-MM-dd")).format(new Date())
 		oneLineDesc = 'An Open Source XMPP (Jabber) library'
-		androidProjects = [':jxmpp-core', ':jxmpp-jid', ':jxmpp-stringprep-libidn', ':jxmpp-util-cache'].collect{ project(it) }
+		androidProjects = [':jxmpp-core', ':jxmpp-jid', ':jxmpp-util-cache'].collect{ project(it) }
 		jmhProjects = [':jxmpp-util-cache'].collect { project(it) }
 		junit4Projects = [
 			':jxmpp-core',
 			':jxmpp-jid',
-			':jxmpp-repl',
+			// ':jxmpp-repl',
 			':jxmpp-stringprep-icu4j',
-			':jxmpp-stringprep-libidn',
+			// ':jxmpp-stringprep-libidn',
 			':jxmpp-util-cache',
 		].collect { project(it) }
 		// Only enable Error Prone for non JMH projects, as JMH
@@ -79,11 +79,11 @@ allprojects {
 				  )
 	}
 
-	eclipse {
+	/* eclipse {
 		classpath {
 			downloadJavadoc = true
 		}
-	}
+	} */
 
 	// Make all project's 'test' target depend on javadoc, so that
 	// javadoc is also linted.
@@ -100,7 +100,6 @@
 			// warning if source/target is set to 1.7 and
 			// bootclasspath is *not* set.
 			'-Xlint:-options',
-			'-Werror',
 		]
 	}
 	if (JavaVersion.current().isJava8Compatible()) {
@@ -132,7 +131,7 @@
 		options.charSet = "UTF-8"
 	}
 
-	jacoco {
+	/* jacoco {
 		toolVersion = "0.8.3"
 	}
 
@@ -158,7 +158,7 @@ allprojects {
 			events "failed"
 			exceptionFormat "full"
 		}
-	}
+	} */
 }
 
 task javadocAll(type: Javadoc) {
@@ -195,12 +195,12 @@ uploadArchives.enabled = false
 evaluationDependsOnChildren()
 subprojects {
 	apply plugin: 'maven-publish'
-	apply plugin: 'signing'
-	apply plugin: 'checkstyle'
+	// apply plugin: 'signing'
+	// apply plugin: 'checkstyle'
 
-	checkstyle {
-		toolVersion = '8.22'
-	}
+	// checkstyle {
+	// 	toolVersion = '8.22'
+	// }
 	task sourcesJar(type: Jar, dependsOn: classes) {
 		classifier = 'sources'
 		from sourceSets.main.allSource
@@ -218,7 +218,7 @@ subprojects {
 		testRuntime testsJar
 	}
 
-	publishing {
+	/* publishing {
 		publications {
 			mavenJava(MavenPublication) {
 				from components.java
@@ -272,7 +272,7 @@ subprojects {
 				}
 			}
 		}
-	}
+	} */
 	rootProject.distributionZip {
 		dependsOn build
 		from(buildDir) {
@@ -283,7 +283,7 @@ subprojects {
 	// Workaround for gpg signatory not supporting the 'required' option
 	// See https://github.com/gradle/gradle/issues/5064#issuecomment-381924984
 	// Note what we use 'signing.gnupg.keyName' instead of 'signing.keyId'.
-	tasks.withType(Sign) {
+	/* tasks.withType(Sign) {
 		onlyIf {
 			project.hasProperty('signing.gnupg.keyName')
 		}
@@ -292,10 +292,10 @@ subprojects {
 		required { signingRequired }
 		useGpgCmd()
 		sign publishing.publications.mavenJava
-	}
+	} */
 }
 
-configure (errorProneProjects) {
+/* configure (errorProneProjects) {
 	apply plugin: 'net.ltgt.errorprone'
 
 	tasks.withType(JavaCompile) {
@@ -319,7 +319,7 @@ configure (errorProneProjects) {
 		errorprone 'com.google.errorprone:error_prone_core:2.3.3'
 		errorproneJavac('com.google.errorprone:javac:9+181-r4173-1')
 	}
-}
+} */
 
 dependencies {
 	androidProjects.each { project ->
@@ -327,7 +327,7 @@ dependencies {
 	}
 }
 
-configure (junit4Projects) {
+/* configure (junit4Projects) {
 	dependencies {
 		testImplementation "junit:junit:4.12"
 		testRuntimeOnly "org.junit.vintage:junit-vintage-engine:$junitVersion"
@@ -381,7 +381,7 @@ task jacocoRootReport(type: org.gradle.testing.jacoco.tasks.JacocoReport) {
 	// the subprojects is wrong (e.g. a project is missing
 	// in there).
 	setOnlyIf { true }
-}
+} */
 
 def getGitCommit() {
 	def projectDirFile = new File("$projectDir")
diff --git a/settings.gradle b/settings.gradle
index ff18801..b1c8476 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,8 +1,8 @@
 include 'jxmpp-core',
 		'jxmpp-jid',
-		'jxmpp-strings-testframework',
+		// 'jxmpp-strings-testframework',
 		'jxmpp-stringprep-icu4j',
-		'jxmpp-stringprep-libidn',
-		'jxmpp-stringprep-rocksxmppprecis',
-		'jxmpp-util-cache',
-		'jxmpp-repl'
+		// 'jxmpp-stringprep-libidn',
+		// 'jxmpp-stringprep-rocksxmppprecis',
+		'jxmpp-util-cache'
+		// 'jxmpp-repl'