Skip to content

Commit 05a3a34

Browse files
committed
Removed shadow plugin and other unused configs from build.gradle
1 parent f001661 commit 05a3a34

3 files changed

Lines changed: 8 additions & 42 deletions

File tree

gradle/dependencies.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ def versions = [
2525
]
2626

2727
def apt = [
28-
autoService : "com.google.auto.service:auto-service:1.0-rc3",
28+
autoService : "com.google.auto.service:auto-service:1.0-rc4",
2929
]
3030

3131
def build = [
@@ -36,8 +36,8 @@ def build = [
3636
targetSdkVersion: 26,
3737

3838
checkerFramework: 'org.checkerframework:dataflow:2.3.0',
39-
errorProneCheckApi: "com.google.errorprone:error_prone_check_api:${versions.errorProne}",
4039
errorProne: "com.google.errorprone:error_prone_core:${versions.errorProne}",
40+
errorProneCheckApi: "com.google.errorprone:error_prone_check_api:${versions.errorProne}",
4141
errorProneTestHelpers: "com.google.errorprone:error_prone_test_helpers:${versions.errorProne}",
4242
nullAway: 'com.uber.nullaway:nullaway:0.2.0',
4343

Lines changed: 2 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,21 @@
11
plugins {
22
id "net.ltgt.errorprone" version "0.0.13"
3-
id "com.github.johnrengelman.shadow" version "2.0.1"
4-
id "com.github.johnrengelman.plugin-shadow" version "2.0.0"
53
id "java"
64
}
75

86
// we use this config to get the path of the JDK 9 javac jar, to
97
// stick it in the bootclasspath when running tests
108
configurations.maybeCreate("epJavac")
119

12-
sourceCompatibility = "1.8"
13-
targetCompatibility = "1.8"
10+
sourceCompatibility = 1.8
11+
targetCompatibility = 1.8
1412

1513
dependencies {
1614
compileOnly deps.apt.autoService
1715
testCompile deps.rx.java
1816

1917
compileOnly deps.build.errorProneCheckApi
2018

21-
errorprone deps.build.errorProne
22-
2319
testCompile deps.test.junit
2420
testCompile(deps.build.errorProneTestHelpers) {
2521
exclude group: "junit", module: "junit"
@@ -29,42 +25,8 @@ dependencies {
2925
epJavac deps.build.errorProneCheckApi
3026
}
3127

32-
shadowJar {
33-
classifier = null
34-
}
35-
build.dependsOn shadowJar
36-
37-
javadoc {
38-
failOnError = false
39-
}
40-
41-
compileJava {
42-
options.compilerArgs += ["-Xlint:unchecked", "-Werror"]
43-
}
44-
4528
test {
46-
maxHeapSize = "1024m"
4729
jvmArgs "-Xbootclasspath/p:${configurations.epJavac.asPath}"
4830
}
4931

5032
apply from: rootProject.file("gradle/gradle-mvn-push.gradle")
51-
52-
def configurePomForShadow(pom) {
53-
pom.scopeMappings.mappings.remove(project.configurations.compile)
54-
pom.scopeMappings.mappings.remove(project.configurations.runtime)
55-
pom.scopeMappings.addMapping(MavenPlugin.COMPILE_PRIORITY, project.configurations.shadow, Conf2ScopeMappingContainer.COMPILE)
56-
}
57-
58-
install {
59-
repositories.mavenInstaller {
60-
configurePomForShadow(pom)
61-
}
62-
}
63-
install.dependsOn shadowJar
64-
65-
uploadArchives {
66-
repositories.mavenDeployer {
67-
configurePomForShadow(pom)
68-
}
69-
}
70-
uploadArchives.dependsOn shadowJar

tooling/autodispose-rx-error-prone-checker/src/main/java/com/uber/autodispose/rx/error/prone/checker/RxJavaMissingAutoDisposeErrorChecker.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,10 @@ public final class RxJavaMissingAutoDisposeErrorChecker extends BugChecker
6262

6363
private final ImmutableList<String> classesWithLifecycle;
6464

65+
public RxJavaMissingAutoDisposeErrorChecker() {
66+
this(ErrorProneFlags.empty());
67+
}
68+
6569
public RxJavaMissingAutoDisposeErrorChecker(ErrorProneFlags flags) {
6670
Optional<ImmutableList<String>> inputClasses = flags.getList("AutoDisposeLeakCheck");
6771
ImmutableList.Builder<String> builder = new ImmutableList.Builder<>();

0 commit comments

Comments
 (0)