Update to 1.1.0

- moved to com.github package and group id
- package repository is now jitpack
- updated source to java 14
- down-compiling to java 8 using jabel

Author: nename0

.github/workflows/build.yml

@@ -0,0 +1,23 @@
+name: gradle build
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up JDK 14
+        uses: actions/setup-java@v1
+        with:
+          java-version: 14
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+      - name: Build with Gradle
+        run: ./gradlew build

README.md

@@ -1,6 +1,8 @@
 moshi-java-codegen
 =====
 
+[![](https://jitpack.io/v/nename0/moshi-java-codegen.svg)](https://jitpack.io/#nename0/moshi-java-codegen/1.1.0)
+
 This annotation processor generates small and fast [JsonAdapters](https://square.github.io/moshi/1.x/moshi/com/squareup/moshi/JsonAdapter.html)
 for Moshi from Java classes, just like the [moshi-kotlin-codegen](https://github.com/square/moshi#codegen) for Kotlin.
 To use it just annotate your class like this:
@@ -18,16 +20,13 @@ and add the annotation processor to your project. For Gradle:
 
 ```groovy   
 repositories {
-    maven {
-        name = "GitHubPackages - moshi-java-codegen"
-        url = uri("https://maven.pkg.github.com/nename0/moshi-java-codegen")
-    }
     mavenCentral()
+    maven { url 'https://jitpack.io' }
     ...
 }
 
 dependencies {
-    annotationProcessor "io.github.nename0:moshi-java-codegen:1.0.0-SNAPSHOT" 
+    annotationProcessor "com.github.nename0:moshi-java-codegen:1.1.0" 
 }
 ``` 
 

build.gradle

@@ -1,21 +1,21 @@
-subprojects {
-    apply plugin: "java"
+buildscript {
+    ext {
+        moshiVersion = "1.9.2"
+    }
+}
 
-    group 'io.github.nename0'
-    version '1.0.0-SNAPSHOT'
+allprojects {
+    apply plugin: "java"
 
-    sourceCompatibility = 1.8
+    group 'com.github.nename0'
+    version '1.1.0'
 
     repositories {
         mavenCentral()
     }
 
-    ext {
-        moshiVersion = "1.9.2"
-    }
-
     dependencies {
-        testCompile "org.junit.jupiter:junit-jupiter:5.6.1"
+        testImplementation "org.junit.jupiter:junit-jupiter:5.6.1"
     }
 
     test {
@@ -24,5 +24,5 @@ subprojects {
 }
 
 wrapper {
-    gradleVersion = '5.6.4' //version required
+    gradleVersion = '6.3' //version required
 }

codegen/build.gradle

@@ -1,4 +1,4 @@
-import org.gradle.internal.jvm.Jvm
+// import org.gradle.internal.jvm.Jvm
 
 plugins {
     id 'java-library'
@@ -8,28 +8,55 @@ plugins {
 ext {
     autoServiceVersion = "1.0-rc6"
     incapVersion = "0.2"
+    jabelVersion = "records-SNAPSHOT"
 }
 
+repositories {
+    maven { url 'https://jitpack.io' }
+}
+
+sourceCompatibility = 14
+targetCompatibility = 8
+
 dependencies {
     api "com.squareup.moshi:moshi:$moshiVersion"
     implementation "com.squareup:javapoet:1.12.1"
+
     implementation "com.google.auto.service:auto-service-annotations:$autoServiceVersion"
     annotationProcessor "com.google.auto.service:auto-service:$autoServiceVersion"
+
     implementation  "net.ltgt.gradle.incap:incap:$incapVersion"
     annotationProcessor "net.ltgt.gradle.incap:incap-processor:$incapVersion"
 
-    testCompile "com.google.testing.compile:compile-testing:0.18"
-    testCompile files(Jvm.current().getToolsJar()) // we need the tools.jar from the jdk for google compile-testing
+    // use java 14 but compile to java 8
+    annotationProcessor "com.github.bsideup:jabel:$jabelVersion"
+    compileOnly "com.github.bsideup:jabel:$jabelVersion"
+
+    testImplementation "com.google.testing.compile:compile-testing:0.18"
+    // testCompile files(Jvm.current().getToolsJar()) // we need the tools.jar from the jdk for google compile-testing
     testAnnotationProcessor project // use self to process tests
 }
 
+tasks.withType(JavaCompile).all {
+    options.compilerArgs = [
+            "--release", "8", // Avoid using Java 9+ APIs
+            '--enable-preview',
+    ]
+
+    doFirst {
+        options.compilerArgs = options.compilerArgs.findAll {
+            it != '--enable-preview'
+        }
+    }
+}
+
 def defaultResourceDir = sourceSets.test.resources.srcDirs[0]
 
 sourceSets {
     test {
         resources {
             // add java source of test-adapters tests to out test resources so we can do regression testing with them
-            srcDirs defaultResourceDir, project(':test-adapters').sourceSets.test.java.srcDirs
+            srcDirs project(':test-adapters').sourceSets.test.java.srcDirs
         }
     }
 }
@@ -38,6 +65,11 @@ sourceSets {
 task updateRegressionTestExpectedOutput(type: Copy, dependsOn: project(':test-adapters').compileTestJava) {
     from(project(':test-adapters').sourceSets.test.output.generatedSourcesDirs)
     into(file(defaultResourceDir.path + '/regression'))
+
+    doLast {
+        println "From: " + project(':test-adapters').sourceSets.test.output.generatedSourcesDirs.join(", ")
+        println "To: " + file(defaultResourceDir.path + '/regression')
+    }
 }
 
 

…a/codegen/JsonClassCodegenProcessor.java …a/codegen/JsonClassCodegenProcessor.javacodegen/src/main/java/io/github/nename0/moshi/java/codegen/JsonClassCodegenProcessor.java renamed to codegen/src/main/java/com/github/nename0/moshi/java/codegen/JsonClassCodegenProcessor.java codegen/src/main/java/io/github/nename0/moshi/java/codegen/JsonClassCodegenProcessor.java renamed to codegen/src/main/java/com/github/nename0/moshi/java/codegen/JsonClassCodegenProcessor.java

@@ -18,10 +18,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.github.nename0.moshi.java.codegen;
+package com.github.nename0.moshi.java.codegen;
 
 import com.google.auto.service.AutoService;
-import io.github.nename0.moshi.java.codegen.renderer.JsonAdapterRenderer;
+import com.github.nename0.moshi.java.codegen.renderer.JsonAdapterRenderer;
 import net.ltgt.gradle.incap.IncrementalAnnotationProcessor;
 import net.ltgt.gradle.incap.IncrementalAnnotationProcessorType;
 

…/moshi/java/codegen/JsonClassHolder.java …/moshi/java/codegen/JsonClassHolder.javacodegen/src/main/java/io/github/nename0/moshi/java/codegen/JsonClassHolder.java renamed to codegen/src/main/java/com/github/nename0/moshi/java/codegen/JsonClassHolder.java codegen/src/main/java/io/github/nename0/moshi/java/codegen/JsonClassHolder.java renamed to codegen/src/main/java/com/github/nename0/moshi/java/codegen/JsonClassHolder.java

@@ -18,7 +18,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.github.nename0.moshi.java.codegen;
+package com.github.nename0.moshi.java.codegen;
 
 import com.squareup.javapoet.ClassName;
 import com.squareup.javapoet.TypeName;
@@ -28,7 +28,6 @@
 import java.util.TreeMap;
 
 import javax.lang.model.element.TypeElement;
-import javax.lang.model.element.TypeParameterElement;
 
 /**
  * contains information about a parsed json class

…/moshi/java/codegen/JsonClassParser.java …/moshi/java/codegen/JsonClassParser.javacodegen/src/main/java/io/github/nename0/moshi/java/codegen/JsonClassParser.java renamed to codegen/src/main/java/com/github/nename0/moshi/java/codegen/JsonClassParser.java codegen/src/main/java/io/github/nename0/moshi/java/codegen/JsonClassParser.java renamed to codegen/src/main/java/com/github/nename0/moshi/java/codegen/JsonClassParser.java

@@ -18,7 +18,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.github.nename0.moshi.java.codegen;
+package com.github.nename0.moshi.java.codegen;
 
 import com.squareup.javapoet.ClassName;
 import com.squareup.javapoet.TypeName;
@@ -28,18 +28,18 @@
 
 import javax.annotation.processing.ProcessingEnvironment;
 import javax.annotation.processing.RoundEnvironment;
-import javax.lang.model.element.*;
-import javax.lang.model.type.DeclaredType;
+import javax.lang.model.element.Element;
+import javax.lang.model.element.ElementKind;
+import javax.lang.model.element.ExecutableElement;
+import javax.lang.model.element.TypeElement;
 import javax.lang.model.type.TypeKind;
-import javax.lang.model.type.TypeMirror;
 import javax.lang.model.util.ElementFilter;
 import javax.lang.model.util.Elements;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.lang.annotation.Annotation;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.stream.Collectors;
 
 import static javax.lang.model.element.Modifier.*;
@@ -72,12 +72,12 @@ public void findAndParseObjects(RoundEnvironment env, Map<String, JsonClassHolde
             if (!annotation.generateAdapter() || !JsonClassCodegenProcessor.GENERATOR_NAME.equals(annotation.generator())) {
                 continue;
             }
-            if (elem.getKind() != ElementKind.CLASS || !(elem instanceof TypeElement)) {
+            if (elem.getKind() != ElementKind.CLASS || !(elem instanceof TypeElement typeElement)) {
                 error(elem, "@JsonClass can't be applied to %s - %s: must be a Class type.", elem.getEnclosingElement().toString(), elem.toString());
                 continue;
             }
             try {
-                processJsonClassAnnotation((TypeElement) elem, jsonClassMap);
+                processJsonClassAnnotation(typeElement, jsonClassMap);
             } catch (Exception e) {
                 StringWriter stackTrace = new StringWriter();
                 e.printStackTrace(new PrintWriter(stackTrace));
@@ -135,11 +135,11 @@ private boolean checkClassAccessibleFromPackage(TypeElement element) {
                 return false;
             }
             Element parent = current.getEnclosingElement();
-            if (parent.asType().getKind() != TypeKind.DECLARED || !(parent instanceof TypeElement)) {
+            if (parent.asType().getKind() != TypeKind.DECLARED || !(parent instanceof TypeElement child)) {
                 error(parent, "Expected %s(%s) nesting %s to be a class/interface", parent.getSimpleName(), parent.getKind().toString(), current.getQualifiedName());
                 return false;
             }
-            current = (TypeElement) parent;
+            current = child;
         }
         return true;
     }

…/moshi/java/codegen/JsonFieldHolder.java …/moshi/java/codegen/JsonFieldHolder.javacodegen/src/main/java/io/github/nename0/moshi/java/codegen/JsonFieldHolder.java renamed to codegen/src/main/java/com/github/nename0/moshi/java/codegen/JsonFieldHolder.java codegen/src/main/java/io/github/nename0/moshi/java/codegen/JsonFieldHolder.java renamed to codegen/src/main/java/com/github/nename0/moshi/java/codegen/JsonFieldHolder.java

@@ -1,25 +1,10 @@
-package io.github.nename0.moshi.java.codegen;
+package com.github.nename0.moshi.java.codegen;
 
 import com.squareup.javapoet.ClassName;
 import com.squareup.javapoet.FieldSpec;
 import com.squareup.javapoet.TypeName;
-import com.squareup.moshi.Json;
-import com.squareup.moshi.JsonQualifier;
 
-import javax.lang.model.element.*;
-import javax.lang.model.type.DeclaredType;
-import javax.lang.model.type.ExecutableType;
-import javax.lang.model.type.TypeKind;
-import javax.lang.model.type.TypeMirror;
-import javax.lang.model.util.ElementFilter;
-import javax.lang.model.util.Elements;
-import javax.lang.model.util.Types;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * contains information about a parsed json field

…/moshi/java/codegen/JsonFieldParser.java …/moshi/java/codegen/JsonFieldParser.javacodegen/src/main/java/io/github/nename0/moshi/java/codegen/JsonFieldParser.java renamed to codegen/src/main/java/com/github/nename0/moshi/java/codegen/JsonFieldParser.java codegen/src/main/java/io/github/nename0/moshi/java/codegen/JsonFieldParser.java renamed to codegen/src/main/java/com/github/nename0/moshi/java/codegen/JsonFieldParser.java

@@ -18,7 +18,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.github.nename0.moshi.java.codegen;
+package com.github.nename0.moshi.java.codegen;
 
 import com.squareup.javapoet.ClassName;
 import com.squareup.javapoet.TypeName;
@@ -111,12 +111,15 @@ private JsonFieldHolder getGetterAndSetter(TypeElement originClass, TypeElement
 
         List<String> possibleGetterMethodNames = new ArrayList<>();
         possibleGetterMethodNames.add("get" + elementNameLowerCase);
+        // in preparation for Java 14 JEP 359 Records where getters have the field name
+        possibleGetterMethodNames.add(elementNameLowerCase);
         if (elementTypeKind == TypeKind.BOOLEAN) {
             possibleGetterMethodNames.add("is" + elementNameLowerCase);
             possibleGetterMethodNames.add("has" + elementNameLowerCase);
-            possibleGetterMethodNames.add(elementNameLowerCase);
         }
 
+        // TODO allow constructor arguments instead of setters especially for JEP 359 Records
+
         List<String> possibleSetterMethodNames = new ArrayList<>();
         possibleSetterMethodNames.add("set" + elementNameLowerCase);
 

…nderer/DelegateAdapterFieldRenderer.java …nderer/DelegateAdapterFieldRenderer.javacodegen/src/main/java/io/github/nename0/moshi/java/codegen/renderer/DelegateAdapterFieldRenderer.java renamed to codegen/src/main/java/com/github/nename0/moshi/java/codegen/renderer/DelegateAdapterFieldRenderer.java codegen/src/main/java/io/github/nename0/moshi/java/codegen/renderer/DelegateAdapterFieldRenderer.java renamed to codegen/src/main/java/com/github/nename0/moshi/java/codegen/renderer/DelegateAdapterFieldRenderer.java

@@ -1,10 +1,10 @@
-package io.github.nename0.moshi.java.codegen.renderer;
+package com.github.nename0.moshi.java.codegen.renderer;
 
 import com.squareup.javapoet.*;
 import com.squareup.moshi.JsonAdapter;
 import com.squareup.moshi.Types;
-import io.github.nename0.moshi.java.codegen.JsonClassHolder;
-import io.github.nename0.moshi.java.codegen.JsonFieldHolder;
+import com.github.nename0.moshi.java.codegen.JsonClassHolder;
+import com.github.nename0.moshi.java.codegen.JsonFieldHolder;
 
 import javax.lang.model.element.Modifier;
 import java.lang.annotation.Annotation;
@@ -38,6 +38,8 @@ public void addAdapterInitializers(MethodSpec.Builder constructorBuilder, TypeRe
             List<CodeBlock> parameters = new ArrayList<>();
             parameters.add(typeRenderer.render(fieldHolder.type));
 
+            // TODO implement the annotations to prevent using reflection in Types.getFieldJsonQualifierAnnotations()
+
             if (fieldHolder.jsonAnnotations.size() > 0) {
                 ParameterizedTypeName fieldType = ParameterizedTypeName.get(Set.class, Types.subtypeOf(Annotation.class));
                 String fieldName = "ANNOTATIONS_" + fieldHolder.fieldName.toUpperCase() + "_" + (annotationCount++);