Merge core and library, revive hamcrest-integration

build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'osgi'
 apply plugin: 'maven-publish'
 
 group = "org.hamcrest"
-version = "1.4-SNAPSHOT"
+version = "2.1-SNAPSHOT"
 
 subprojects {
     apply plugin: 'java-library'
@@ -12,8 +12,6 @@ subprojects {
     sourceCompatibility = JavaVersion.VERSION_1_7
     targetCompatibility = JavaVersion.VERSION_1_7
 
-    version = rootProject.version
-
     repositories {
         mavenCentral()
     }
@@ -47,46 +45,6 @@ subprojects {
     }
 }
 
-task allClassesJar(type: Jar, dependsOn: subprojects.tasks['build']) {
-    baseName = 'hamcrest-all'
-    subprojects.each { subproject ->
-        from zipTree(subproject.jar.archivePath)
-    }
-    manifest {
-        attributes 'Implementation-Title': 'hamcrest-all',
-                'Implementation-Vendor': 'hamcrest.org',
-                'Implementation-Version': version
-    }
-}
-
-
-task allSourcesJar(type: Jar) {
-    baseName = 'hamcrest-all'
-    classifier = 'sources'
-    subprojects.each { subproject ->
-        from subproject.sourceSets.main.allSource
-    }
-}
-
-task allJavadoc(type: Javadoc) {
-    group = 'Documentation'
-    description = 'Generate combined Javadoc for all projects'
-    title = "Hamcrest All $version API"
-    subprojects.each { proj ->
-        proj.tasks.withType(Javadoc).each { javadocTask ->
-            source += javadocTask.source
-            classpath += javadocTask.classpath
-            excludes += javadocTask.excludes
-            includes += javadocTask.includes
-        }
-    }
-}
-
-task allJavadocJar(type: Jar) {
-    classifier = 'javadoc'
-    from allJavadoc
-}
-
 def pomConfigurationFor(String pomName, String pomDescription) {
     return {
         name = pomName
@@ -124,36 +82,15 @@ def pomConfigurationFor(String pomName, String pomDescription) {
 
 publishing {
     publications {
-        def coreProject = project(':hamcrest-core')
+        def hamcrestProject = project(':hamcrest')
         hamcrestCore(MavenPublication) {
-            from coreProject.components.java
-            artifactId coreProject.name
-            artifact coreProject.sourcesJar
-            artifact coreProject.javadocJar
-            pom pomConfigurationFor(
-                    'Hamcrest Core',
-                    'This is the core API of hamcrest matcher framework to be used by third-party framework providers. This includes the a foundation set of matcher implementations for common operations.')
-        }
-
-        def libraryProject = project(':hamcrest-library')
-        hamcrestLibrary(MavenPublication) {
-            from libraryProject.components.java
-            artifactId = libraryProject.name
-            artifact libraryProject.sourcesJar
-            artifact libraryProject.javadocJar
-            pom pomConfigurationFor(
-                    'Hamcrest Library',
-                    'Hamcrest library of matcher implementations.')
-        }
-
-        hamcrestAll(MavenPublication) {
-            artifactId = 'hamcrest-all'
-            artifact allClassesJar
-            artifact allSourcesJar
-            artifact allJavadocJar
+            from hamcrestProject.components.java
+            artifactId hamcrestProject.name
+            artifact hamcrestProject.sourcesJar
+            artifact hamcrestProject.javadocJar
             pom pomConfigurationFor(
-                    'Hamcrest All',
-                    'A self-contained hamcrest jar containing all of the sub-modules in a single artifact.')
+                    'Hamcrest',
+                    'Core API and libraries of hamcrest matcher framework.')
         }
     }
     repositories {
@@ -174,6 +111,4 @@ publishing {
 signing {
     required { hasProperty('ossrhUsername') && hasProperty('ossrhPassword') }
     sign publishing.publications.hamcrestCore
-    sign publishing.publications.hamcrestLibrary
-    sign publishing.publications.hamcrestAll
 }

hamcrest-integration/hamcrest-integration.gradle

@@ -0,0 +1,15 @@
+version = '1.3.1-SNAPSHOT'
+
+dependencies {
+    api 'org.hamcrest:hamcrest-library:1.3'
+    api 'org.easymock:easymock:2.2'
+    api('jmock:jmock:1.1.0') {
+        transitive = false
+    }
+
+    testImplementation(group: 'junit', name: 'junit', version: '4.12') {
+        transitive = false
+    }
+}
+
+javadoc.title = "Hamcrest Integration $version API"

hamcrest-integration/src/main/java/org/hamcrest/EasyMock2Matchers.java

@@ -0,0 +1,17 @@
+package org.hamcrest;
+
+import org.hamcrest.integration.EasyMock2Adapter;
+import org.hamcrest.core.IsEqual;
+
+/**
+ *
+ * @author Joe Walnes
+ */
+public class EasyMock2Matchers {
+
+    public static String equalTo(String string) {
+        EasyMock2Adapter.adapt(IsEqual.equalTo(string));
+        return null;
+    }
+
+}

hamcrest-integration/src/main/java/org/hamcrest/JMock1Matchers.java

@@ -0,0 +1,12 @@
+package org.hamcrest;
+
+import org.hamcrest.integration.JMock1Adapter;
+import org.hamcrest.core.IsEqual;
+import org.jmock.core.Constraint;
+
+public class JMock1Matchers {
+
+    public static Constraint equalTo(String string) {
+        return JMock1Adapter.adapt(IsEqual.equalTo(string));
+    }
+}

hamcrest-integration/src/main/java/org/hamcrest/JavaLangMatcherAssert.java

@@ -0,0 +1,18 @@
+package org.hamcrest;
+
+/**
+ * Integration method for use with Java's <code>assert</code> keyword.
+ * Example:
+ * <pre>
+ * assert that("Foo", startsWith("f"));
+ * </pre>
+ *
+ * @author Neil Dunn
+ */
+public class JavaLangMatcherAssert {
+    private JavaLangMatcherAssert() {};
+
+    public static <T> boolean that(T argument, Matcher<? super T> matcher) {
+        return matcher.matches(argument);
+    }
+}

hamcrest-integration/src/main/java/org/hamcrest/integration/EasyMock2Adapter.java

@@ -0,0 +1,43 @@
+package org.hamcrest.integration;
+
+import org.easymock.IArgumentMatcher;
+import org.easymock.EasyMock;
+import org.hamcrest.Matcher;
+import org.hamcrest.StringDescription;
+
+/**
+ * An adapter allowing a Hamcrest {@link org.hamcrest.Matcher}
+ * to act as an EasyMock {@link org.easymock.IArgumentMatcher}.
+ *
+ * @author Joe Walnes
+ */
+public class EasyMock2Adapter implements IArgumentMatcher {
+
+    /**
+     * Convenience factory method that will adapt a
+     * Hamcrest {@link org.hamcrest.Matcher} to act as an
+     * EasyMock {@link org.easymock.IArgumentMatcher} and
+     * report it to EasyMock so it can be kept track of.
+     */
+    public static IArgumentMatcher adapt(Matcher<?> matcher) {
+        EasyMock2Adapter easyMock2Matcher = new EasyMock2Adapter(matcher);
+        EasyMock.reportMatcher(easyMock2Matcher);
+        return easyMock2Matcher;
+    }
+
+    private final Matcher<?> hamcrestMatcher;
+
+    public EasyMock2Adapter(Matcher<?> matcher) {
+        this.hamcrestMatcher = matcher;
+    }
+
+    @Override
+    public boolean matches(Object argument) {
+        return hamcrestMatcher.matches(argument);
+    }
+
+    @Override
+    public void appendTo(StringBuffer buffer) {
+        hamcrestMatcher.describeTo(new StringDescription(buffer));
+    }
+}

hamcrest-integration/src/main/java/org/hamcrest/integration/JMock1Adapter.java

@@ -0,0 +1,42 @@
+package org.hamcrest.integration;
+
+import org.jmock.core.Constraint;
+import org.hamcrest.Matcher;
+import org.hamcrest.StringDescription;
+
+/**
+ * An adapter allowing a Hamcrest {@link org.hamcrest.Matcher}
+ * to act as an jMock1 {@link org.jmock.core.Constraint}.
+ * Note, this is not necessary for jMock2 as it supports Hamcrest
+ * out of the box.
+ *
+ * @author Joe Walnes
+ */
+public class JMock1Adapter implements Constraint {
+
+    /**
+     * Convenience factory method that will adapt a
+     * Hamcrest {@link org.hamcrest.Matcher} to act as an
+     * jMock {@link org.jmock.core.Constraint}.
+     */
+    public static Constraint adapt(Matcher<?> matcher) {
+        return new JMock1Adapter(matcher);
+    }
+
+    private final Matcher<?> hamcrestMatcher;
+
+    public JMock1Adapter(Matcher<?> matcher) {
+        this.hamcrestMatcher = matcher;
+    }
+
+    @Override
+    public boolean eval(Object o) {
+        return hamcrestMatcher.matches(o);
+    }
+
+    @Override
+    public StringBuffer describeTo(StringBuffer buffer) {
+        hamcrestMatcher.describeTo(new StringDescription(buffer));
+        return buffer;
+    }
+}

hamcrest/hamcrest.gradle

@@ -0,0 +1,24 @@
+version = rootProject.version
+
+sourceSets {
+    main {
+        java {
+            srcDirs rootProject.file('hamcrest-core/src/main/java'),
+                    rootProject.file('hamcrest-library/src/main/java')
+        }
+    }
+    test {
+        java {
+            srcDirs rootProject.file('hamcrest-core/src/test/java'),
+                    rootProject.file('hamcrest-library/src/test/java')
+        }
+    }
+}
+
+dependencies {
+    testImplementation(group: 'junit', name: 'junit', version: '4.12') {
+        transitive = false
+    }
+}
+
+javadoc.title = "Hamcrest $version API"

settings.gradle

@@ -1,9 +1,9 @@
 enableFeaturePreview('STABLE_PUBLISHING')
 
-include 'hamcrest-core',
-        'hamcrest-library'
+include 'hamcrest',
+        'hamcrest-integration'
 
-rootProject.name = 'hamcrest'
+rootProject.name = 'JavaHamcrest'
 
 // Change the file name of the child project build file to match the directory name
 // This avoids having multiple `build.gradle` files, making them easier to distinguish