Skip to content

Commit a94d79a

Browse files
authored
Make repository usable on JDK11. (#1370)
* Make repository usable on JDK11. * Fix build errors.
1 parent 6251d0c commit a94d79a

File tree

12 files changed

+38
-18
lines changed

12 files changed

+38
-18
lines changed

buildSrc/src/main/groovy/com/google/firebase/gradle/plugins/ci/CheckCoveragePlugin.groovy

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,12 @@ class CheckCoveragePlugin implements Plugin<Project> {
3030
toolVersion = '0.8.5'
3131
}
3232

33+
tasks.withType(Test) {
34+
jacoco {
35+
excludes = ['jdk.internal.*']
36+
}
37+
}
38+
3339
task('checkCoverage', type: JacocoReport) {
3440
dependsOn 'check'
3541
description 'Generates check coverage report and uploads to Codecov.io.'

encoders/firebase-encoders-processor/firebase-encoders-processor.gradle

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ plugins {
1616
id 'java-library'
1717
}
1818

19+
def jvm = org.gradle.internal.jvm.Jvm.current()
20+
21+
1922
dependencies {
2023
implementation project(':encoders:firebase-encoders-processor:test-support')
2124
implementation 'com.google.auto.service:auto-service-annotations:1.0-rc6'
@@ -30,7 +33,7 @@ dependencies {
3033
annotationProcessor 'com.google.auto.service:auto-service:1.0-rc6'
3134

3235
testImplementation 'com.google.testing.compile:compile-testing:0.18'
33-
testImplementation files(org.gradle.internal.jvm.Jvm.current().getToolsJar())
36+
if (jvm.getToolsJar() != null) testImplementation files(jvm.getToolsJar())
3437
testImplementation 'com.google.truth:truth:1.0'
3538

3639
}

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

Lines changed: 8 additions & 5 deletions
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,15 +92,14 @@ 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")
94101
.addModifiers(Modifier.PUBLIC, Modifier.FINAL)
95102
.addSuperinterface(configurator)
96-
.addAnnotation(
97-
AnnotationSpec.builder(ClassName.get("javax.annotation", "Generated"))
98-
.addMember("value", "$S", getClass().getName())
99-
.build())
100103
.addField(
101104
FieldSpec.builder(
102105
TypeName.INT,

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

fiamui-app/fiamui-app.gradle

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,19 @@ android {
5656
dependencies {
5757
implementation project(path: ":firebase-inappmessaging-display")
5858
implementation project(path: ":firebase-inappmessaging")
59-
implementation "com.google.firebase:firebase-measurement-connector:18.0.0"
6059
implementation 'com.google.guava:guava:24.1-jre-android'
6160

62-
implementation('com.google.firebase:firebase-analytics:17.0.0') {
61+
implementation('com.google.firebase:firebase-analytics:17.2.3') {
6362
exclude group: 'com.google.firebase', module: 'firebase-common'
63+
exclude group: 'com.google.firebase', module: 'firebase-components'
64+
exclude group: 'com.google.firebase', module: 'firebase-installations'
65+
exclude group: 'com.google.firebase', module: 'firebase-installations-interop'
66+
}
67+
implementation('com.google.firebase:firebase-iid:20.1.1') {
68+
exclude group: 'com.google.firebase', module: 'firebase-common'
69+
exclude group: 'com.google.firebase', module: 'firebase-components'
70+
exclude group: 'com.google.firebase', module: 'firebase-installations'
71+
exclude group: 'com.google.firebase', module: 'firebase-installations-interop'
6472
}
6573

6674
implementation "com.android.installreferrer:installreferrer:1.0"

firebase-database-collection/firebase-database-collection.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@ android {
2626
targetSdkVersion project.targetSdkVersion
2727
minSdkVersion project.minSdkVersion
2828
}
29+
compileOptions {
30+
sourceCompatibility JavaVersion.VERSION_1_8
31+
targetCompatibility JavaVersion.VERSION_1_8
32+
}
2933
}
3034

3135
dependencies {

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: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,12 @@ org.gradle.jvmargs=-Xmx8g -XX:MaxPermSize=8g
1717

1818
android.enableJetifier=true
1919
android.useAndroidX=true
20+
android.jetifier.blacklist=errorprone,firebase-encoders-processor
2021

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

2425
firebase.checks.errorproneProjects=:tools:errorprone
2526
firebase.checks.lintProjects=:tools:lint
27+
28+
systemProp.illegal-access=warn

0 commit comments

Comments
 (0)