Use different module names for hamcrest jars.

Resolves issue #269. Changes the module name of hamcrest-core and hamcrest-libary to avoid split package problems with Java 9.
hamcrest · Aug 24, 2019 · c1ea49a · c1ea49a
1 parent 976a60f
commit c1ea49a
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/hamcrest-core/hamcrest-core.gradle b/hamcrest-core/hamcrest-core.gradle
@@ -7,7 +7,7 @@ jar {
         attributes 'Implementation-Title': project.name,
                 'Implementation-Vendor': 'hamcrest.org',
                 'Implementation-Version': version,
-                'Automatic-Module-Name': 'org.hamcrest'
+                'Automatic-Module-Name': 'org.hamcrest.core.deprecated'
     }
 }
 

diff --git a/...rg/hamcrest/HamcrestCoreIsDeprecated.java → .../deprecated/HamcrestCoreIsDeprecated.java b/...rg/hamcrest/HamcrestCoreIsDeprecated.java → .../deprecated/HamcrestCoreIsDeprecated.java
@@ -1,4 +1,4 @@
-package org.hamcrest;
+package org.hamcrest.core.deprecated;
 
 /**
  * All the classes in <code>hamcrest-core.jar</code> have moved to

diff --git a/.../main/java/org/hamcrest/package-info.java → ...amcrest/core/deprecated/package-info.java b/.../main/java/org/hamcrest/package-info.java → ...amcrest/core/deprecated/package-info.java
@@ -2,4 +2,4 @@
  * All classes in <code>hamcrest-core.jar</code> have been migrated to
  * <code>hamcrest.jar</code>. Please use that dependency instead.
  */
-package org.hamcrest;
+package org.hamcrest.core.deprecated;
diff --git a/hamcrest-library/hamcrest-library.gradle b/hamcrest-library/hamcrest-library.gradle
@@ -7,7 +7,7 @@ jar {
         attributes 'Implementation-Title': project.name,
                 'Implementation-Vendor': 'hamcrest.org',
                 'Implementation-Version': version,
-                'Automatic-Module-Name': 'org.hamcrest'
+                'Automatic-Module-Name': 'org.hamcrest.library.deprecated'
     }
 }
 

diff --git a/...hamcrest/HamcrestLibraryIsDeprecated.java → ...precated/HamcrestLibraryIsDeprecated.java b/...hamcrest/HamcrestLibraryIsDeprecated.java → ...precated/HamcrestLibraryIsDeprecated.java
@@ -1,4 +1,4 @@
-package org.hamcrest;
+package org.hamcrest.library.deprecated;
 
 /**
  * All the classes in <code>hamcrest-library.jar</code> have moved to

diff --git a/.../main/java/org/hamcrest/package-info.java → ...rest/library/deprecated/package-info.java b/.../main/java/org/hamcrest/package-info.java → ...rest/library/deprecated/package-info.java
@@ -2,4 +2,4 @@
  * All classes in <code>hamcrest-library.jar</code> have been migrated to
  * <code>hamcrest.jar</code>. Please use that dependency instead.
  */
-package org.hamcrest;
+package org.hamcrest.library.deprecated;