Add Android 10 support (29)

noties · Dec 2, 2019 · abe7c0f · abe7c0f
1 parent 99caf7e
commit abe7c0f
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 9 deletions.
diff --git a/build.gradle b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
 }
 
 group 'ru.noties'
-version '1.0.2'
+version '1.0.3'
 
 apply plugin: 'java'
 apply plugin: 'application'
@@ -24,15 +24,10 @@ repositories {
 }
 
 dependencies {
-
     compile 'com.google.code.findbugs:jsr305:3.0.2'
-
     compile 'com.github.javaparser:javaparser-core:3.5.12'
-
     compile 'com.google.googlejavaformat:google-java-format:1.5'
-
     compile 'commons-cli:commons-cli:1.4'
-
     compile 'commons-io:commons-io:2.6'
 }
 

diff --git a/src/main/java/ru/noties/enhance/ApiVersion.java b/src/main/java/ru/noties/enhance/ApiVersion.java
@@ -93,7 +93,8 @@ public String toString() {
             new ApiVersion(25, "7.1", "Nougat"),
             new ApiVersion(26, "8.0", "Oreo"),
             new ApiVersion(27, "8.1", "Oreo"),
-            new ApiVersion(28, "9.0", "Pie")
+            new ApiVersion(28, "9.0", "Pie"),
+            new ApiVersion(29, "10", "Android")
     };
 
     private static final int LENGTH = VERSIONS.length;

diff --git a/src/main/java/ru/noties/enhance/ApiVersionFormatter.java b/src/main/java/ru/noties/enhance/ApiVersionFormatter.java
@@ -17,7 +17,7 @@ private static class Impl extends ApiVersionFormatter {
 
         @Override
         public String format(@Nonnull ApiVersion apiVersion) {
-            // @since 5.1 Lollipop (22)
+            // for example - @since 5.1 Lollipop (22)
             return apiVersion.getVersionName() + " " + apiVersion.getCodeName() + " (" + apiVersion.getSdkInt() + ")";
         }
     }

diff --git a/src/main/java/ru/noties/enhance/EnhanceWriterImpl.java b/src/main/java/ru/noties/enhance/EnhanceWriterImpl.java
@@ -68,7 +68,9 @@ public void write(@Nonnull File source, @Nonnull File destination) {
                 final String name = file.getName();
                 final File f = new File(destination, name);
 
-                if (name.endsWith(".java")) {
+                // @since 1.0.3 there are also `*.annotated.java` files, ignore them
+                if (name.endsWith(".java")
+                        && !name.endsWith(".annotated.java")) {
 
                     final String java = processJavaFile(file);
                     try {