Add automatic-module-name to relevant modules (#281)

* Opportunistic fix package for error prone artifacts This has been bothering me, and moving while we're at it. Not breaking since it's expected to be pick up via ServiceLoader and not a dependency * Add support for AUTOMATIC_MODULE_NAME in mvn-gradle-push * Add AUTOMATIC_MODULE_NAME to java artifacts
uber · Nov 26, 2018 · 3b34830 · 3b34830
1 parent 0cb91c2
commit 3b34830
Show file tree

Hide file tree

Showing 15 changed files with 30 additions and 11 deletions.
diff --git a/android/autodispose-android-archcomponents-test/gradle.properties b/android/autodispose-android-archcomponents-test/gradle.properties
@@ -17,3 +17,4 @@
 POM_NAME=AutoDispose (Android Architecture Components Test Extensions)
 POM_ARTIFACT_ID=autodispose-android-archcomponents-test
 POM_PACKAGING=aar
+AUTOMATIC_MODULE_NAME=com.uber.autodispose.android.lifecycle.test
diff --git a/android/autodispose-android-archcomponents/gradle.properties b/android/autodispose-android-archcomponents/gradle.properties
@@ -17,3 +17,4 @@
 POM_NAME=AutoDispose (Android Architecture Components Extensions)
 POM_ARTIFACT_ID=autodispose-android-archcomponents
 POM_PACKAGING=aar
+AUTOMATIC_MODULE_NAME=com.uber.autodispose.android.lifecycle
diff --git a/android/autodispose-android/gradle.properties b/android/autodispose-android/gradle.properties
@@ -17,3 +17,4 @@
 POM_NAME=AutoDispose (Android Extensions)
 POM_ARTIFACT_ID=autodispose-android
 POM_PACKAGING=aar
+AUTOMATIC_MODULE_NAME=com.uber.autodispose.android
diff --git a/autodispose-rxlifecycle/gradle.properties b/autodispose-rxlifecycle/gradle.properties
@@ -17,3 +17,4 @@
 POM_NAME=AutoDispose (RxLifecycle Interop)
 POM_ARTIFACT_ID=autodispose-rxlifecycle
 POM_PACKAGING=jar
+AUTOMATIC_MODULE_NAME=com.uber.autodispose.rxlifecycle
diff --git a/autodispose/gradle.properties b/autodispose/gradle.properties
@@ -17,3 +17,4 @@
 POM_NAME=AutoDispose
 POM_ARTIFACT_ID=autodispose
 POM_PACKAGING=jar
+AUTOMATIC_MODULE_NAME=com.uber.autodispose
diff --git a/gradle/gradle-mvn-push.gradle b/gradle/gradle-mvn-push.gradle
@@ -193,6 +193,14 @@ afterEvaluate { project ->
     sign configurations.archives
   }
 
+  if (hasProperty("AUTOMATIC_MODULE_NAME")) {
+    jar {
+      manifest {
+        attributes('Automatic-Module-Name': properties.get("AUTOMATIC_MODULE_NAME"))
+      }
+    }
+  }
+
   if (project.getPlugins().hasPlugin('com.android.application') || project.getPlugins().
       hasPlugin('com.android.library')) {
     task install(type: Upload, dependsOn: assemble) {

diff --git a/lifecycle/autodispose-lifecycle-jdk8/gradle.properties b/lifecycle/autodispose-lifecycle-jdk8/gradle.properties
@@ -17,3 +17,4 @@
 POM_NAME=AutoDispose (Lifecycle JDK8 Extensions)
 POM_ARTIFACT_ID=autodispose-lifecycle-jdk8
 POM_PACKAGING=jar
+AUTOMATIC_MODULE_NAME=com.uber.autodispose.lifecycle.jdk8
diff --git a/lifecycle/autodispose-lifecycle/gradle.properties b/lifecycle/autodispose-lifecycle/gradle.properties
@@ -17,3 +17,4 @@
 POM_NAME=AutoDispose (Lifecycle)
 POM_ARTIFACT_ID=autodispose-lifecycle
 POM_PACKAGING=jar
+AUTOMATIC_MODULE_NAME=com.uber.autodispose.lifecycle
diff --git a/static-analysis/autodispose-error-prone-checker/gradle.properties b/static-analysis/autodispose-error-prone-checker/gradle.properties
@@ -17,3 +17,4 @@
 POM_NAME=AutoDispose Error-Prone Checker
 POM_ARTIFACT_ID=autodispose-error-prone-checker
 POM_PACKAGING=jar
+AUTOMATIC_MODULE_NAME=com.uber.autodispose.errorprone
diff --git a/...e/error/prone/checker/UseAutoDispose.java → ...utodispose/errorprone/UseAutoDispose.java b/...e/error/prone/checker/UseAutoDispose.java → ...utodispose/errorprone/UseAutoDispose.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.uber.autodispose.error.prone.checker;
+package com.uber.autodispose.errorprone;
 
 import com.google.auto.service.AutoService;
 import com.google.common.collect.ImmutableList;

diff --git a/...prone/checker/ComponentWithLifeCycle.java → ...se/errorprone/ComponentWithLifecycle.java b/...prone/checker/ComponentWithLifeCycle.java → ...se/errorprone/ComponentWithLifecycle.java
@@ -14,6 +14,6 @@
  * limitations under the License.
  */
 
-package com.uber.autodispose.error.prone.checker;
+package com.uber.autodispose.errorprone;
 
-public class ComponentWithLifeCycle {}
+public class ComponentWithLifecycle {}
diff --git a/...ror/prone/checker/UseAutoDisposeTest.java → ...ispose/errorprone/UseAutoDisposeTest.java b/...ror/prone/checker/UseAutoDisposeTest.java → ...ispose/errorprone/UseAutoDisposeTest.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.uber.autodispose.error.prone.checker;
+package com.uber.autodispose.errorprone;
 
+import com.google.common.collect.ImmutableList;
 import com.google.errorprone.CompilationTestHelper;
-import java.util.Collections;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -42,8 +42,8 @@ public class UseAutoDisposeTest {
   }
 
   @Test public void test_autodisposePositiveCaseswithCustomClass() {
-    compilationHelper.setArgs(Collections.singletonList(
-        "-XepOpt:ClassesWithScope" + "=com.uber.autodispose.error.prone.checker.ComponentWithLifeCycle"));
+    compilationHelper.setArgs(ImmutableList.of("-XepOpt:ClassesWithScope"
+        + "=com.uber.autodispose.errorprone.ComponentWithLifecycle"));
     compilationHelper.addSourceFile("UseAutoDisposeCustomClassPositiveCases.java")
         .doTest();
   }

diff --git a/...eAutoDisposeCustomClassPositiveCases.java → ...eAutoDisposeCustomClassPositiveCases.java b/...eAutoDisposeCustomClassPositiveCases.java → ...eAutoDisposeCustomClassPositiveCases.java
@@ -14,16 +14,17 @@
  * limitations under the License.
  */
 
-package com.uber.autodispose.error.prone.checker;
+package com.uber.autodispose.errorprone;
 
+import com.uber.autodispose.errorprone.ComponentWithLifecycle;
 import io.reactivex.Completable;
 import io.reactivex.Flowable;
 import io.reactivex.Maybe;
 import io.reactivex.Observable;
 import io.reactivex.Single;
 import org.reactivestreams.Subscriber;
 
-public class UseAutoDisposeCustomClassPositiveCases extends ComponentWithLifeCycle {
+public class UseAutoDisposeCustomClassPositiveCases extends ComponentWithLifecycle {
   public void observable_subscribeWithoutAutoDispose() {
     Observable.empty()
         // BUG: Diagnostic contains: Always apply an AutoDispose scope before subscribing within defined scoped elements.

diff --git a/...AutoDisposeDefaultClassPositiveCases.java → ...AutoDisposeDefaultClassPositiveCases.java b/...AutoDisposeDefaultClassPositiveCases.java → ...AutoDisposeDefaultClassPositiveCases.java
@@ -14,8 +14,9 @@
  * limitations under the License.
  */
 
-package com.uber.autodispose.error.prone.checker;
+package com.uber.autodispose.errorprone;
 
+import com.uber.autodispose.errorprone.UseAutoDispose;
 import com.uber.autodispose.lifecycle.CorrespondingEventsFunction;
 import com.uber.autodispose.lifecycle.LifecycleEndedException;
 import com.uber.autodispose.lifecycle.LifecycleScopeProvider;

diff --git a/.../checker/UseAutoDisposeNegativeCases.java → ...rorprone/UseAutoDisposeNegativeCases.java b/.../checker/UseAutoDisposeNegativeCases.java → ...rorprone/UseAutoDisposeNegativeCases.java
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-package com.uber.autodispose.error.prone.checker;
+package com.uber.autodispose.errorprone;
 
 import com.uber.autodispose.AutoDispose;
+import com.uber.autodispose.errorprone.UseAutoDispose;
 import com.uber.autodispose.lifecycle.CorrespondingEventsFunction;
 import com.uber.autodispose.lifecycle.LifecycleEndedException;
 import com.uber.autodispose.lifecycle.LifecycleScopeProvider;