diff --git a/firebase-abt/firebase-abt.gradle b/firebase-abt/firebase-abt.gradle index 4c9c0cdf48d..67a341547f5 100644 --- a/firebase-abt/firebase-abt.gradle +++ b/firebase-abt/firebase-abt.gradle @@ -14,6 +14,7 @@ plugins { id 'firebase-library' + id 'com.google.protobuf' } firebaseLibrary { @@ -21,6 +22,28 @@ firebaseLibrary { publishSources = true } +// TODO(issue/568): Remove this once legacy logic is removed from Remote Config. +protobuf { + protoc { + artifact = 'com.google.protobuf:protoc:3.4.0' + } + plugins { + javalite { + artifact = 'com.google.protobuf:protoc-gen-javalite:3.0.0' + } + } + generateProtoTasks { + all().each { task -> + task.builtins { + remove java + } + task.plugins { + javalite {} + } + } + } +} + android { lintOptions { @@ -28,12 +51,13 @@ android { } sourceSets { main { - java { - } - } - test { - java { + proto { + srcDir 'src/proto' } + + resources { + srcDir 'src/proto/com/google/protos' + } } } @@ -61,6 +85,7 @@ dependencies { implementation ('com.google.firebase:firebase-measurement-connector:18.0.0') { exclude group: "com.google.firebase", module: "firebase-common" } + implementation 'com.google.protobuf:protobuf-lite:3.0.1' testImplementation 'org.mockito:mockito-core:2.25.0' testImplementation 'com.google.truth:truth:0.44' testImplementation 'junit:junit:4.13-beta-2' diff --git a/firebase-config/src/proto/com/google/protos/developers/mobile/abt/proto/experiment_payload.proto b/firebase-abt/src/proto/com/google/protos/developers/mobile/abt/proto/experiment_payload.proto similarity index 100% rename from firebase-config/src/proto/com/google/protos/developers/mobile/abt/proto/experiment_payload.proto rename to firebase-abt/src/proto/com/google/protos/developers/mobile/abt/proto/experiment_payload.proto diff --git a/firebase-config/firebase-config.gradle b/firebase-config/firebase-config.gradle index e37988538a2..c2ae397f254 100644 --- a/firebase-config/firebase-config.gradle +++ b/firebase-config/firebase-config.gradle @@ -50,11 +50,6 @@ protobuf { } } -firebaseLibrary { - testLab.enabled = true - publishSources = true -} - android { compileSdkVersion project.targetSdkVersion defaultConfig {