From 21187290c4eed399ea0fa95fe4633a77cd64d491 Mon Sep 17 00:00:00 2001 From: shaishavgandhi05 Date: Thu, 11 Oct 2018 10:54:23 -0700 Subject: [PATCH 1/3] Add animal-sniffer to guard against Java 8 only APIs Signed-off-by: shaishavgandhi05 --- autodispose-rxlifecycle/build.gradle | 2 ++ autodispose/build.gradle | 2 ++ build.gradle | 1 + gradle/dependencies.gradle | 4 +++- lifecycle/autodispose-lifecycle-jdk8/build.gradle | 2 ++ lifecycle/autodispose-lifecycle/build.gradle | 2 ++ settings.gradle | 3 +++ 7 files changed, 15 insertions(+), 1 deletion(-) diff --git a/autodispose-rxlifecycle/build.gradle b/autodispose-rxlifecycle/build.gradle index e9c96c4a0..8d668e099 100644 --- a/autodispose-rxlifecycle/build.gradle +++ b/autodispose-rxlifecycle/build.gradle @@ -17,6 +17,7 @@ plugins { id 'java-library' id 'net.ltgt.errorprone' + id 'ru.vyarus.animalsniffer' } sourceCompatibility = deps.build.javaVersion @@ -33,6 +34,7 @@ dependencies { api project(':autodispose') api deps.misc.rxlifecycle + signature deps.build.animalSniffer errorprone deps.build.errorProne testCompile project(':test-utils') diff --git a/autodispose/build.gradle b/autodispose/build.gradle index 7f4aa6ae5..05458fcdb 100755 --- a/autodispose/build.gradle +++ b/autodispose/build.gradle @@ -17,6 +17,7 @@ plugins { id 'java-library' id 'net.ltgt.errorprone' + id 'ru.vyarus.animalsniffer' } sourceCompatibility = deps.build.javaVersion @@ -32,6 +33,7 @@ dependencies { api deps.rx.java + signature deps.build.animalSniffer errorprone deps.build.errorProne testCompile project(':test-utils') diff --git a/build.gradle b/build.gradle index 00422bb9a..70114575e 100755 --- a/build.gradle +++ b/build.gradle @@ -29,6 +29,7 @@ subprojects { classpath deps.build.gradlePlugins.kotlin classpath "org.jetbrains.dokka:dokka-android-gradle-plugin:${deps.versions.dokka}" classpath "org.jetbrains.dokka:dokka-gradle-plugin:${deps.versions.dokka}" + classpath "ru.vyarus:gradle-animalsniffer-plugin:${deps.versions.animalSniffer}" } } diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index 7f8696e14..6dfebb0e2 100755 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -20,7 +20,8 @@ def versions = [ dokka: '0.9.17', errorProne: '2.3.1', errorPronePlugin: '0.0.13', - kotlin: '1.2.71' + kotlin: '1.2.71', + animalSniffer: '1.4.6' ] def apt = [ @@ -39,6 +40,7 @@ def build = [ errorProneCheckApi: "com.google.errorprone:error_prone_check_api:${versions.errorProne}", errorProneTestHelpers: "com.google.errorprone:error_prone_test_helpers:${versions.errorProne}", nullAway: 'com.uber.nullaway:nullaway:0.4.7', + animalSniffer: 'org.codehaus.mojo.signature:java17:1.0@signature', gradlePlugins: [ android: 'com.android.tools.build:gradle:3.2.0', diff --git a/lifecycle/autodispose-lifecycle-jdk8/build.gradle b/lifecycle/autodispose-lifecycle-jdk8/build.gradle index 059ac15d0..247da4f93 100755 --- a/lifecycle/autodispose-lifecycle-jdk8/build.gradle +++ b/lifecycle/autodispose-lifecycle-jdk8/build.gradle @@ -17,6 +17,7 @@ plugins { id 'java-library' id 'net.ltgt.errorprone' + id 'ru.vyarus.animalsniffer' } sourceCompatibility = deps.build.javaVersion @@ -32,6 +33,7 @@ dependencies { api project(":lifecycle:autodispose-lifecycle") + signature deps.build.animalSniffer errorprone deps.build.errorProne testCompile project(':test-utils') diff --git a/lifecycle/autodispose-lifecycle/build.gradle b/lifecycle/autodispose-lifecycle/build.gradle index acc6076c3..90703aaae 100755 --- a/lifecycle/autodispose-lifecycle/build.gradle +++ b/lifecycle/autodispose-lifecycle/build.gradle @@ -17,6 +17,7 @@ plugins { id 'java-library' id 'net.ltgt.errorprone' + id 'ru.vyarus.animalsniffer' } sourceCompatibility = deps.build.javaVersion @@ -32,6 +33,7 @@ dependencies { api project(":autodispose") + signature deps.build.animalSniffer errorprone deps.build.errorProne testCompile project(':test-utils') diff --git a/settings.gradle b/settings.gradle index 4c8e5be6b..9ce62569c 100755 --- a/settings.gradle +++ b/settings.gradle @@ -40,6 +40,9 @@ pluginManagement { case 'net.ltgt.errorprone': useVersion(deps.versions.errorPronePlugin) break + case 'ru.vyarus.animalsniffer': + useVersion(deps.versions.animalSniffer) + break } } } From 6e6391ec556727af4dfbd7cc256c9d85c2d5d2b8 Mon Sep 17 00:00:00 2001 From: shaishavgandhi05 Date: Fri, 12 Oct 2018 21:14:52 -0600 Subject: [PATCH 2/3] Add Java 8 Only API: ZonedDateTime Signed-off-by: shaishavgandhi05 --- .../java/com/uber/autodispose/TestZonedDateTime.java | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 autodispose/src/test/java/com/uber/autodispose/TestZonedDateTime.java diff --git a/autodispose/src/test/java/com/uber/autodispose/TestZonedDateTime.java b/autodispose/src/test/java/com/uber/autodispose/TestZonedDateTime.java new file mode 100644 index 000000000..34f7a6a23 --- /dev/null +++ b/autodispose/src/test/java/com/uber/autodispose/TestZonedDateTime.java @@ -0,0 +1,11 @@ +package com.uber.autodispose; + +import java.time.ZonedDateTime; +import org.junit.Test; + +public class TestZonedDateTime { + + @Test public void testJava8Signature() { + ZonedDateTime dateTime = ZonedDateTime.now(); + } +} From 53dc0a896b7e86da74ba899fd61d8c7d6ea9238f Mon Sep 17 00:00:00 2001 From: shaishavgandhi05 Date: Sat, 13 Oct 2018 19:55:59 -0600 Subject: [PATCH 3/3] Revert "Add animal-sniffer to guard against Java 8 only APIs" This reverts commit 21187290c4eed399ea0fa95fe4633a77cd64d491. --- autodispose-rxlifecycle/build.gradle | 2 -- autodispose/build.gradle | 2 -- build.gradle | 1 - gradle/dependencies.gradle | 4 +--- lifecycle/autodispose-lifecycle-jdk8/build.gradle | 2 -- lifecycle/autodispose-lifecycle/build.gradle | 2 -- settings.gradle | 3 --- 7 files changed, 1 insertion(+), 15 deletions(-) diff --git a/autodispose-rxlifecycle/build.gradle b/autodispose-rxlifecycle/build.gradle index 8d668e099..e9c96c4a0 100644 --- a/autodispose-rxlifecycle/build.gradle +++ b/autodispose-rxlifecycle/build.gradle @@ -17,7 +17,6 @@ plugins { id 'java-library' id 'net.ltgt.errorprone' - id 'ru.vyarus.animalsniffer' } sourceCompatibility = deps.build.javaVersion @@ -34,7 +33,6 @@ dependencies { api project(':autodispose') api deps.misc.rxlifecycle - signature deps.build.animalSniffer errorprone deps.build.errorProne testCompile project(':test-utils') diff --git a/autodispose/build.gradle b/autodispose/build.gradle index 05458fcdb..7f4aa6ae5 100755 --- a/autodispose/build.gradle +++ b/autodispose/build.gradle @@ -17,7 +17,6 @@ plugins { id 'java-library' id 'net.ltgt.errorprone' - id 'ru.vyarus.animalsniffer' } sourceCompatibility = deps.build.javaVersion @@ -33,7 +32,6 @@ dependencies { api deps.rx.java - signature deps.build.animalSniffer errorprone deps.build.errorProne testCompile project(':test-utils') diff --git a/build.gradle b/build.gradle index 70114575e..00422bb9a 100755 --- a/build.gradle +++ b/build.gradle @@ -29,7 +29,6 @@ subprojects { classpath deps.build.gradlePlugins.kotlin classpath "org.jetbrains.dokka:dokka-android-gradle-plugin:${deps.versions.dokka}" classpath "org.jetbrains.dokka:dokka-gradle-plugin:${deps.versions.dokka}" - classpath "ru.vyarus:gradle-animalsniffer-plugin:${deps.versions.animalSniffer}" } } diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index 6dfebb0e2..7f8696e14 100755 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -20,8 +20,7 @@ def versions = [ dokka: '0.9.17', errorProne: '2.3.1', errorPronePlugin: '0.0.13', - kotlin: '1.2.71', - animalSniffer: '1.4.6' + kotlin: '1.2.71' ] def apt = [ @@ -40,7 +39,6 @@ def build = [ errorProneCheckApi: "com.google.errorprone:error_prone_check_api:${versions.errorProne}", errorProneTestHelpers: "com.google.errorprone:error_prone_test_helpers:${versions.errorProne}", nullAway: 'com.uber.nullaway:nullaway:0.4.7', - animalSniffer: 'org.codehaus.mojo.signature:java17:1.0@signature', gradlePlugins: [ android: 'com.android.tools.build:gradle:3.2.0', diff --git a/lifecycle/autodispose-lifecycle-jdk8/build.gradle b/lifecycle/autodispose-lifecycle-jdk8/build.gradle index 247da4f93..059ac15d0 100755 --- a/lifecycle/autodispose-lifecycle-jdk8/build.gradle +++ b/lifecycle/autodispose-lifecycle-jdk8/build.gradle @@ -17,7 +17,6 @@ plugins { id 'java-library' id 'net.ltgt.errorprone' - id 'ru.vyarus.animalsniffer' } sourceCompatibility = deps.build.javaVersion @@ -33,7 +32,6 @@ dependencies { api project(":lifecycle:autodispose-lifecycle") - signature deps.build.animalSniffer errorprone deps.build.errorProne testCompile project(':test-utils') diff --git a/lifecycle/autodispose-lifecycle/build.gradle b/lifecycle/autodispose-lifecycle/build.gradle index 90703aaae..acc6076c3 100755 --- a/lifecycle/autodispose-lifecycle/build.gradle +++ b/lifecycle/autodispose-lifecycle/build.gradle @@ -17,7 +17,6 @@ plugins { id 'java-library' id 'net.ltgt.errorprone' - id 'ru.vyarus.animalsniffer' } sourceCompatibility = deps.build.javaVersion @@ -33,7 +32,6 @@ dependencies { api project(":autodispose") - signature deps.build.animalSniffer errorprone deps.build.errorProne testCompile project(':test-utils') diff --git a/settings.gradle b/settings.gradle index 9ce62569c..4c8e5be6b 100755 --- a/settings.gradle +++ b/settings.gradle @@ -40,9 +40,6 @@ pluginManagement { case 'net.ltgt.errorprone': useVersion(deps.versions.errorPronePlugin) break - case 'ru.vyarus.animalsniffer': - useVersion(deps.versions.animalSniffer) - break } } }