Add compatibility with KindedJ standard encoding

build.gradle

@@ -7,7 +7,7 @@ buildscript {
   }
   dependencies {
     //Check for the latest version here: http://plugins.gradle.org/plugin/com.jfrog.artifactory
-    classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:4.2.0'
+    classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:4.5.4'
   }
 }
 
@@ -36,8 +36,8 @@ ext {
   hktBaseVersion = '0.9.3'
   hktVersion = hktBaseVersion + (isSnapshot ? '-SNAPSHOT' : '')
 
-  derive4jVersion = '0.10.2'
-  autoService = 'com.google.auto.service:auto-service:1.0-rc2'
+  derive4jVersion = '0.12.3'
+  autoService = 'com.google.auto.service:auto-service:1.0-rc4'
 }
 
 
@@ -50,14 +50,16 @@ dependencies {
 
   compile files(Jvm.current().toolsJar)
 
+  compile 'io.kindedj:kindedj:1.0.1'
+
   compileOnly "org.derive4j:derive4j-annotation:${derive4jVersion}"
   compileOnly autoService
 
   apt "org.derive4j:derive4j:${derive4jVersion}"
   apt autoService
 
   testCompile 'junit:junit:4.12'
-  testCompile 'com.google.testing.compile:compile-testing:0.8'
+  testCompile 'com.google.testing.compile:compile-testing:0.14'
   testApt rootProject
 }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Wed May 04 21:04:30 CEST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.12-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-bin.zip

src/main/java/org/derive4j/hkt/__.java

@@ -1,8 +1,10 @@
 package org.derive4j.hkt;
 
+import io.kindedj.Hk;
+
 /**
  * Represents a higher order type (or higher kinded type or type constructor) of arity 1
  * @param <f> the 'witness' of the class/interface to be lifted as type constructor: a static nested class or enum, or the class applied with wildcard type arguments.
  * @param <T> the type parameter of the type constructor
  */
-public interface __<f, T> {}
+public interface __<f, T> extends Hk<f, T> {}

src/main/java/org/derive4j/hkt/processor/GenCode.java

@@ -47,7 +47,9 @@ String prefix() {
     }
     private static final String CLASS_TEMPLATE = "package {0};\n" +
         "\n" +
-        "import org.derive4j.hkt.*;\n" +
+        "import org.derive4j.hkt.__;\n" +
+        "import org.derive4j.hkt.TypeEq;\n" +
+        "import io.kindedj.Hk;\n" +
         "{3}\n"+
         "\n" +
         "{1}final class {2} '{'\n" +
@@ -56,13 +58,13 @@ String prefix() {
         "{4}\n" +
         "}";
 
-    private static final String METHODS_TEMPLATE = "  {0}static {2} {1} " +
-        "{4}({3} hkt) '{'\n" +
+    private static final String METHODS_TEMPLATE = "  @SuppressWarnings(\"unchecked\")\n" +
+        "  {0}static {2} {1} {5}({3} hkt) '{'\n" +
         "    return ({1}) hkt;\n" +
         "  }\n" +
         "\n" +
         "  @SuppressWarnings(\"unchecked\")\n" +
-        "  {0}static {2} TypeEq<{3}, {1}> {5}()'{'\n" +
+        "  {0}static {2} TypeEq<{4}, {1}> {6}()'{'\n" +
         "    return (TypeEq) TypeEq.refl();\n" +
         "  }";
 
@@ -215,14 +217,21 @@ private P2<HktEffectiveVisibility, String> genCoerceMethod(TypeElement typeConst
 
         CharSequence typeParams = MessageFormat.format(TYPE_PARAMS_TEMPLATE, showTypeParams(typeConstructor));
 
+        String hkInterfaceFQN = Visitors.asTypeElement.visit(hktInterface.asElement()).get().getQualifiedName().toString();
+
+        String kindedJInterfaceAsString = hktInterface.toString()
+            .replace("<" + hkInterfaceFQN, "<? extends Hk")
+            .replace(hkInterfaceFQN, "Hk")
+            .replace(packageRelativeTypeElement.getQualifiedName(), packageRelativeTypeElement.getSimpleName());
+
         String hktInterfaceAsString = hktInterface.toString()
-            .replace(Visitors.asTypeElement.visit(hktInterface.asElement()).get().getQualifiedName(), hktInterface
-                .asElement().getSimpleName())
+            .replace(hkInterfaceFQN, hktInterface.asElement().getSimpleName())
+            .replace("io.kindedj.Hk", "Hk")
             .replace(packageRelativeTypeElement.getQualifiedName(), packageRelativeTypeElement.getSimpleName());
 
         return _P2.of(visibility,
             MessageFormat.format(METHODS_TEMPLATE, visibility.prefix(), typeAsString, typeParams,
-                hktInterfaceAsString, coerceMethodName, typeEqMethodName));
+                kindedJInterfaceAsString, hktInterfaceAsString, coerceMethodName, typeEqMethodName));
     }
 
     private TypeElement packageRelativeTypeElement(TypeElement typeElement) {