Skip to content

Commit f1bc573

Browse files
committed
Fix build errors.
1 parent 0551da6 commit f1bc573

File tree

8 files changed

+13
-12
lines changed

8 files changed

+13
-12
lines changed

encoders/firebase-encoders-processor/src/main/java/com/google/firebase/encoders/processor/EncodableProcessor.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import com.google.firebase.encoders.annotations.Encodable;
2121
import com.google.firebase.encoders.processor.getters.Getter;
2222
import com.google.firebase.encoders.processor.getters.GetterFactory;
23-
import com.squareup.javapoet.AnnotationSpec;
2423
import com.squareup.javapoet.ClassName;
2524
import com.squareup.javapoet.FieldSpec;
2625
import com.squareup.javapoet.JavaFile;
@@ -63,6 +62,11 @@ public class EncodableProcessor extends AbstractProcessor {
6362
private Types types;
6463
private GetterFactory getterFactory;
6564

65+
@Override
66+
public SourceVersion getSupportedSourceVersion() {
67+
return SourceVersion.latestSupported();
68+
}
69+
6670
@Override
6771
public synchronized void init(ProcessingEnvironment processingEnvironment) {
6872
super.init(processingEnvironment);
@@ -88,6 +92,9 @@ private void processClass(Element element) {
8892
ClassName className =
8993
ClassName.bestGuess("Auto" + Names.generatedClassName(element) + "Encoder");
9094
ClassName configurator = ClassName.get("com.google.firebase.encoders.config", "Configurator");
95+
96+
// TODO(vkryachko): add @Generated annotation in a way that is compatible with Java versions
97+
// before and after 9. See https://github.com/google/dagger/pull/882
9198
TypeSpec.Builder encoderBuilder =
9299
TypeSpec.classBuilder(className)
93100
.addJavadoc("@hide")

encoders/firebase-encoders-processor/src/test/resources/ExpectedGenericsEncoder.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@
1818
import com.google.firebase.encoders.config.EncoderConfig;
1919
import java.io.IOException;
2020
import java.lang.Override;
21-
import javax.annotation.Generated;
2221

23-
@Generated("com.google.firebase.encoders.processor.EncodableProcessor")
2422
public final class AutoGenericsEncoder implements Configurator {
2523
public static final int CODEGEN_VERSION = 1;
2624

encoders/firebase-encoders-processor/src/test/resources/ExpectedGenericsEncoderWithUnknownType.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,9 @@
1818
import com.google.firebase.encoders.config.EncoderConfig;
1919
import java.io.IOException;
2020
import java.lang.Override;
21-
import javax.annotation.Generated;
2221

2322
/**
2423
* @hide */
25-
@Generated("com.google.firebase.encoders.processor.EncodableProcessor")
2624
public final class AutoGenericClassEncoder implements Configurator {
2725
public static final int CODEGEN_VERSION = 1;
2826

encoders/firebase-encoders-processor/src/test/resources/ExpectedRecursiveGenericEncoder.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@
2020
import com.google.firebase.encoders.config.EncoderConfig;
2121
import java.io.IOException;
2222
import java.lang.Override;
23-
import javax.annotation.Generated;
2423

25-
@Generated("com.google.firebase.encoders.processor.EncodableProcessor")
2624
public final class AutoMainClassEncoder implements Configurator {
2725
public static final int CODEGEN_VERSION = 1;
2826

encoders/firebase-encoders-processor/src/test/resources/ExpectedSimpleClassEncoder.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@
1818
import com.google.firebase.encoders.config.EncoderConfig;
1919
import java.io.IOException;
2020
import java.lang.Override;
21-
import javax.annotation.Generated;
2221

23-
@Generated("com.google.firebase.encoders.processor.EncodableProcessor")
2422
public final class AutoSimpleClassEncoder implements Configurator {
2523
public static final int CODEGEN_VERSION = 1;
2624

encoders/firebase-encoders-processor/src/test/resources/ExpectedTypeWithListEncoder.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,9 @@
1818
import com.google.firebase.encoders.config.EncoderConfig;
1919
import java.io.IOException;
2020
import java.lang.Override;
21-
import javax.annotation.Generated;
2221

2322
/**
2423
* @hide */
25-
@Generated("com.google.firebase.encoders.processor.EncodableProcessor")
2624
public final class AutoTypeWithListEncoder implements Configurator {
2725
public static final int CODEGEN_VERSION = 1;
2826

firebase-inappmessaging/firebase-inappmessaging.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,9 @@ dependencies {
119119
implementation project(':firebase-installations-interop')
120120
runtimeOnly project(':firebase-installations')
121121

122+
//To provide @Generated annotations
123+
compileOnly 'javax.annotation:jsr250-api:1.0'
124+
122125
implementation 'com.google.android.gms:play-services-tasks:17.0.0'
123126
implementation 'io.grpc:grpc-stub:1.21.0'
124127
implementation 'io.grpc:grpc-protobuf-lite:1.21.0'

gradle.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@ org.gradle.jvmargs=-Xmx8g -XX:MaxPermSize=8g
1515

1616
org.gradle.jvmargs=-Xmx8g -XX:MaxPermSize=8g
1717

18-
android.enableJetifier=false
18+
android.enableJetifier=true
1919
android.useAndroidX=true
20+
android.jetifier.blacklist=errorprone
2021

2122
org.gradle.parallel=true
2223
org.gradle.caching=true

0 commit comments

Comments
 (0)