File: 01-edit-gradle-buildsystem.patch

package info (click to toggle)
libminidns-java 1.0.0-2
  • links: PTS, VCS
  • area: main
  • in suites: bookworm
  • size: 1,528 kB
  • sloc: java: 13,430; xml: 171; sh: 22; perl: 16; makefile: 3
file content (204 lines) | stat: -rw-r--r-- 5,989 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
From: Sunil Mohan Adapa <sunil@medhas.org>
Date: Sat, 1 May 2021 07:54:52 -0700
Subject: Alter gradle build system to suite Debian

The following parts of the build system were disabled as they are not relevant
in Debian and disabling them makes packaging easier.

Eclipse plugin generates a project file that can be opened in Eclipse IDE.

Coveralls and Jacoco analyze and report the test coverage so that upstream can
work on improving automated tests.

Error Prone and Checksytle indicate potential coding errors.

Animal Sniffer helps with ensuring that project runs on multiple versions of
Java.

Android component appears to need Android SDK.

REPL component allows developers to play with the library and is not necessary
for reverse depending packages.

Running tests is disabled until all dependencies are avialable and they can be
run reliably. Enable tests if future.

Forwarded: not-needed
---
 build.gradle    | 48 ++++++++++++++++++++++++------------------------
 settings.gradle |  4 ++--
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/build.gradle b/build.gradle
index 102f837..2d5b566 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,22 +8,22 @@ buildscript {
         mavenCentral()
     }
 
-    dependencies {
-		classpath "org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.3.1"
-    }
+    // dependencies {
+    //     	classpath "org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.3.1"
+    // }
 }
 
 plugins {
-    id 'ru.vyarus.animalsniffer' version '1.5.1'
-	id 'net.ltgt.errorprone' version '0.8.1'
+    // id 'ru.vyarus.animalsniffer' version '1.5.1'
+	// id 'net.ltgt.errorprone' version '0.8.1'
 }
 
 allprojects {
 	apply plugin: 'java'
-	apply plugin: 'eclipse'
-	apply plugin: 'checkstyle'
-	apply plugin: 'jacoco'
-	apply plugin: 'net.ltgt.errorprone'
+	// apply plugin: 'eclipse'
+	// apply plugin: 'checkstyle'
+	// apply plugin: 'jacoco'
+	// apply plugin: 'net.ltgt.errorprone'
 
 	group = 'org.minidns'
 	description = "A minimal DNS client library with support for A, AAAA, NS and SRV records"
@@ -33,7 +33,7 @@ allprojects {
 		isSnapshot = version.endsWith('-SNAPSHOT')
 		minidnsMinAndroidSdk = 19
 		junitVersion = '5.5.2'
-		androidBootClasspath = getAndroidRuntimeJar(minidnsMinAndroidSdk)
+		// androidBootClasspath = getAndroidRuntimeJar(minidnsMinAndroidSdk)
 		rootConfigDir = new File(rootDir, 'config')
 		gitCommit = getGitCommit()
 		builtDate = (new java.text.SimpleDateFormat("yyyy-MM-dd")).format(new Date())
@@ -49,7 +49,7 @@ allprojects {
 
 	sourceCompatibility = javaCompatilibity
 
-	if (!ext.isSnapshot && !'git describe --exact-match HEAD'.execute().text.trim().equals(version)) {
+	/* if (!ext.isSnapshot && !'git describe --exact-match HEAD'.execute().text.trim().equals(version)) {
 		throw new org.gradle.api.InvalidUserDataException('Untagged version detected! Please tag every release.')
 	}
 	if (!version.endsWith('-SNAPSHOT') && version != 'git tag --points-at HEAD'.execute().text.trim()) {
@@ -69,7 +69,7 @@ allprojects {
 			events "failed"
 			exceptionFormat "full"
 		}
-	}
+	} */
 
 	repositories {
 		mavenLocal()
@@ -93,7 +93,7 @@ allprojects {
 			'-Xlint:-options',
 			'-Werror',
 		]
-		options.errorprone {
+		/* options.errorprone {
 			error(
 				"UnusedVariable",
 				"UnusedMethod",
@@ -110,11 +110,11 @@ allprojects {
 				'-Xep:MixedMutabilityReturnType:OFF',
 				'-Xep:ImmutableEnumChecker:OFF',
 			]
-		}
+		} */
 
 	}
 
-	checkstyle {
+	/* checkstyle {
 		toolVersion = '8.24'
 	}
 
@@ -135,7 +135,7 @@ allprojects {
 		classpath {
 			downloadJavadoc = true
 		}
-	}
+	} */
 
 	// Make all project's 'test' targets depend on javadoc, so that
 	// javadoc is also linted.
@@ -167,14 +167,14 @@ allprojects {
 		}
 	}
 
-	dependencies {
+	/* dependencies {
 		testImplementation "org.junit.jupiter:junit-jupiter-api:$junitVersion"
 		testImplementation "org.junit.jupiter:junit-jupiter-params:$junitVersion"
 		testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junitVersion"
 
 		errorprone 'com.google.errorprone:error_prone_core:2.3.3'
 		errorproneJavac('com.google.errorprone:javac:9+181-r4173-1')
-	}
+	} */
 
 }
 
@@ -203,7 +203,7 @@ subprojects {
 		testRuntime testsJar
 	}
 
-	publishing {
+	/* publishing {
 		publications {
 			mavenJava(MavenPublication) {
 				from components.java
@@ -270,10 +270,10 @@ subprojects {
 		required { signingRequired }
 		useGpgCmd()
 		sign publishing.publications.mavenJava
-	}
+	} */
 }
 
-configure(subprojects.findAll{!it.name.endsWith('-java7') && !it.name.endsWith('-android21')}) {
+/* configure(subprojects.findAll{!it.name.endsWith('-java7') && !it.name.endsWith('-android21')}) {
    apply plugin: 'ru.vyarus.animalsniffer'
    dependencies {
        signature "net.sf.androidscents.signature:android-api-level-${minidnsMinAndroidSdk}:4.4.2_r4@signature"
@@ -281,14 +281,14 @@ configure(subprojects.findAll{!it.name.endsWith('-java7') && !it.name.endsWith('
    animalsniffer {
        sourceSets = [sourceSets.main]
    }
-}
+} */
 
 jar {
 	// Root project should not create empty jar artifact
 	enabled = false
 }
 
-apply plugin: "com.github.kt3k.coveralls"
+/* apply plugin: "com.github.kt3k.coveralls"
 coveralls {
 	sourceDirs = files(subprojects.sourceSets.main.allSource.srcDirs).files.absolutePath
 }
@@ -307,7 +307,7 @@ task jacocoRootReport(type: org.gradle.testing.jacoco.tasks.JacocoReport) {
 	// the subprojects is wrong (e.g. a project is missing
 	// in there).
 	setOnlyIf { true }
-}
+} */
 
 task integrationTest {
 	// Depend on the integration test's 'run' task using a closure, as
diff --git a/settings.gradle b/settings.gradle
index ca59a4d..d363399 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -10,6 +10,6 @@ include 'minidns-iterative-resolver'
 include 'minidns-dnssec'
 include 'minidns-dane-java7'
 include 'minidns-integration-test'
-include 'minidns-repl'
+// include 'minidns-repl'
 include 'minidns-hla'
-include 'minidns-android21'
+// include 'minidns-android21'