commit fc49cb4d9dee5b6176f83e3dfd9579f8dfc7a410
author Alexander Dorokhine <adorokhine@google.com> Mon Apr 06 16:17:09 2020 -0700
committer Alexander Dorokhine <adorokhine@google.com> Mon Apr 06 16:17:09 2020 -0700
tree cac50834aa24250c4a9f09896789ad239c75673d
parent eb39d4d685848d8ef810c70acd9de0ff70a0bc8a

Implement jarjar for icing protos.

This is required to avoid the diamond dependency problem for users of
our lib who also use a separate version of protobuf.

This implementation of jarjar is based on the jarjar of flatbuffers for
emoji-compat.

Bug: 153380375
Test: ./gradlew appsearch:appsearch:connectedCheck --daemon --info
Change-Id: I8495b0a0a70d6e2c5f16683895d3b1879de610ec

java/build.gradle

diff --git a/java/build.gradle b/java/build.gradle
index 7f75fd5..caaa116 100644
--- a/java/build.gradle
+++ b/java/build.gradle
@@ -24,11 +24,13 @@
     }
     dependencies {
         classpath('gradle.plugin.com.google.protobuf:protobuf-gradle-plugin:0.8.8')
+        classpath('org.anarres.jarjar:jarjar-gradle:1.0.1')
     }
 }
 
 apply plugin: 'java-library'
 apply plugin: 'com.google.protobuf'
+apply plugin: 'org.anarres.jarjar'
 apply plugin: 'idea'
 
 sourceSets {
@@ -40,8 +42,13 @@
     }
 }
 
+compileJava {
+    sourceCompatibility = JavaVersion.VERSION_1_7
+    targetCompatibility = JavaVersion.VERSION_1_7
+}
+
 dependencies {
-    api('com.google.protobuf:protobuf-javalite:3.10.0')
+    implementation('com.google.protobuf:protobuf-javalite:3.10.0')
 }
 
 protobuf {
@@ -59,3 +66,23 @@
         }
     }
 }
+
+jarjar.repackage('jarjarTask') {
+    destinationName "icing-java-jarjar.jar"
+    from 'com.google.protobuf:protobuf-javalite:3.10.0'
+    from files(sourceSets.main.output.classesDirs)
+    dependsOn sourceSets.main.output
+    classRename 'com.google.protobuf.**', 'com.google.android.icing.protobuf.@1'
+}
+
+configurations {
+    jarjarConf
+}
+
+artifacts {
+    jarjarConf(jarjarTask.destinationPath) {
+        name 'icing-java-jarjar'
+        type 'jar'
+        builtBy jarjarTask
+    }
+}