Java 11 compatibility changes

uber · Jul 17, 2020 · 94bad5d · 94bad5d
1 parent 68ea34e
commit 94bad5d
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 18 deletions.
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
@@ -29,8 +29,8 @@ jar {
 }
 
 tasks.withType(JavaCompile) {
-    sourceCompatibility = "1.8"
-    targetCompatibility = "1.8"
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
 }
 
 sourceSets.main.java.srcDirs = ["src/main/rocker", "src/main/java"]
@@ -45,6 +45,7 @@ dependencies {
 
     compileOnly deps.external.inferAnnotations
     compileOnly deps.apt.autoValueAnnotations
+    compileOnly deps.external.annotationApi
 
     implementation gradleApi()
 

diff --git a/buildSrc/src/main/java/com/uber/okbuck/OkBuckGradlePlugin.java b/buildSrc/src/main/java/com/uber/okbuck/OkBuckGradlePlugin.java
@@ -7,6 +7,7 @@
 import com.uber.okbuck.core.dependency.DependencyFactory;
 import com.uber.okbuck.core.manager.BuckFileManager;
 import com.uber.okbuck.core.manager.BuckManager;
+import com.uber.okbuck.core.manager.D8Manager;
 import com.uber.okbuck.core.manager.DependencyManager;
 import com.uber.okbuck.core.manager.GroovyManager;
 import com.uber.okbuck.core.manager.JetifierManager;
@@ -19,7 +20,6 @@
 import com.uber.okbuck.core.model.base.ProjectType;
 import com.uber.okbuck.core.task.OkBuckCleanTask;
 import com.uber.okbuck.core.task.OkBuckTask;
-import com.uber.okbuck.core.util.D8Util;
 import com.uber.okbuck.core.util.FileUtil;
 import com.uber.okbuck.core.util.MoreCollectors;
 import com.uber.okbuck.core.util.ProjectCache;
@@ -109,6 +109,7 @@ public class OkBuckGradlePlugin implements Plugin<Project> {
   public GroovyManager groovyManager;
   public JetifierManager jetifierManager;
   public TransformManager transformManager;
+  public D8Manager d8Manager;
 
   ManifestMergerManager manifestMergerManager;
   RobolectricManager robolectricManager;
@@ -176,6 +177,9 @@ public void apply(Project rootProject) {
           // Create Transform Manager
           transformManager = new TransformManager(rootBuckProject, buckFileManager);
 
+          // Create D8 Manager
+          d8Manager = new D8Manager(rootBuckProject);
+
           // Create Buck Manager
           buckManager = new BuckManager(rootBuckProject);
 
@@ -276,7 +280,7 @@ public void apply(Project rootProject) {
                 }
 
                 // Setup d8 deps
-                D8Util.copyDeps(buckFileManager);
+                d8Manager.copyDeps(buckFileManager);
 
                 // Fetch robolectric deps if needed
                 if (okbuckExt.getTestExtension().robolectric) {

diff --git a/buildSrc/src/main/java/com/uber/okbuck/composer/android/AndroidLibraryRuleComposer.java b/buildSrc/src/main/java/com/uber/okbuck/composer/android/AndroidLibraryRuleComposer.java
@@ -6,7 +6,7 @@
 import com.uber.okbuck.core.model.base.RuleType;
 import com.uber.okbuck.core.model.base.SourceSetType;
 import com.uber.okbuck.core.model.jvm.JvmTarget;
-import com.uber.okbuck.core.util.D8Util;
+import com.uber.okbuck.core.manager.D8Manager;
 import com.uber.okbuck.core.util.FileUtil;
 import com.uber.okbuck.core.util.ProjectUtil;
 import com.uber.okbuck.template.android.AndroidRule;
@@ -44,7 +44,7 @@ public static Rule compose(
     Set<String> providedDeps = new HashSet<>();
     providedDeps.addAll(external(target.getExternalProvidedDeps(SourceSetType.MAIN)));
     providedDeps.addAll(targets(target.getTargetProvidedDeps(SourceSetType.MAIN)));
-    providedDeps.add(D8Util.RT_STUB_JAR_RULE);
+    providedDeps.add(D8Manager.RT_STUB_JAR_RULE);
 
     Set<String> libraryExportedDeps = new HashSet<>();
     libraryExportedDeps.addAll(external(target.getExternalExportedDeps(SourceSetType.MAIN)));

diff --git a/buildSrc/src/main/java/com/uber/okbuck/composer/android/AndroidModuleRuleComposer.java b/buildSrc/src/main/java/com/uber/okbuck/composer/android/AndroidModuleRuleComposer.java
@@ -6,7 +6,7 @@
 import com.uber.okbuck.core.model.base.RuleType;
 import com.uber.okbuck.core.model.base.SourceSetType;
 import com.uber.okbuck.core.model.jvm.JvmTarget;
-import com.uber.okbuck.core.util.D8Util;
+import com.uber.okbuck.core.manager.D8Manager;
 import com.uber.okbuck.core.util.FileUtil;
 import com.uber.okbuck.core.util.ProjectUtil;
 import com.uber.okbuck.template.android.AndroidModuleRule;
@@ -43,7 +43,7 @@ public static Rule compose(
     Set<String> providedDeps = new HashSet<>();
     providedDeps.addAll(external(target.getExternalProvidedDeps(SourceSetType.MAIN)));
     providedDeps.addAll(targets(target.getTargetProvidedDeps(SourceSetType.MAIN)));
-    providedDeps.add(D8Util.RT_STUB_JAR_RULE);
+    providedDeps.add(D8Manager.RT_STUB_JAR_RULE);
 
     Set<String> libraryExportedDeps = new HashSet<>();
     libraryExportedDeps.addAll(external(target.getExternalExportedDeps(SourceSetType.MAIN)));

diff --git a/buildSrc/src/main/java/com/uber/okbuck/composer/android/AndroidTestRuleComposer.java b/buildSrc/src/main/java/com/uber/okbuck/composer/android/AndroidTestRuleComposer.java
@@ -5,7 +5,7 @@
 import com.uber.okbuck.core.model.android.AndroidLibTarget;
 import com.uber.okbuck.core.model.base.RuleType;
 import com.uber.okbuck.core.model.base.SourceSetType;
-import com.uber.okbuck.core.util.D8Util;
+import com.uber.okbuck.core.manager.D8Manager;
 import com.uber.okbuck.template.android.AndroidTestRule;
 import com.uber.okbuck.template.core.Rule;
 import java.util.ArrayList;
@@ -42,7 +42,7 @@ public static Rule compose(
     Set<String> providedDeps = new LinkedHashSet<>();
     providedDeps.addAll(external(target.getExternalProvidedDeps(SourceSetType.TEST)));
     providedDeps.addAll(targets(target.getTargetProvidedDeps(SourceSetType.TEST)));
-    providedDeps.add(D8Util.RT_STUB_JAR_RULE);
+    providedDeps.add(D8Manager.RT_STUB_JAR_RULE);
 
     AndroidTestRule androidTest =
         new AndroidTestRule()

diff --git a/.../src/main/java/com/uber/okbuck/composer/android/ExopackageAndroidLibraryRuleComposer.java b/.../src/main/java/com/uber/okbuck/composer/android/ExopackageAndroidLibraryRuleComposer.java
@@ -5,7 +5,7 @@
 import com.uber.okbuck.core.model.android.ExoPackageScope;
 import com.uber.okbuck.core.model.base.RuleType;
 import com.uber.okbuck.core.model.base.SourceSetType;
-import com.uber.okbuck.core.util.D8Util;
+import com.uber.okbuck.core.manager.D8Manager;
 import com.uber.okbuck.template.android.AndroidRule;
 import com.uber.okbuck.template.core.Rule;
 import java.util.ArrayList;
@@ -38,7 +38,7 @@ public static Rule compose(AndroidAppTarget target) {
     libraryAptDeps.addAll(targetsApt(target.getTargetAptDeps(SourceSetType.MAIN)));
 
     Set<String> providedDeps = new LinkedHashSet<>();
-    providedDeps.add(D8Util.RT_STUB_JAR_RULE);
+    providedDeps.add(D8Manager.RT_STUB_JAR_RULE);
 
     AndroidRule androidRule =
         new AndroidRule()

diff --git a/...ava/com/uber/okbuck/core/util/D8Util.java → ...m/uber/okbuck/core/manager/D8Manager.java b/...ava/com/uber/okbuck/core/util/D8Util.java → ...m/uber/okbuck/core/manager/D8Manager.java
@@ -1,24 +1,30 @@
-package com.uber.okbuck.core.util;
+package com.uber.okbuck.core.manager;
 
 import com.uber.okbuck.OkBuckGradlePlugin;
 import com.uber.okbuck.core.manager.BuckFileManager;
 import com.uber.okbuck.core.model.base.RuleType;
 import com.uber.okbuck.template.core.Rule;
 import com.uber.okbuck.template.java.NativePrebuilt;
+import com.uber.okbuck.core.util.FileUtil;
 import java.io.File;
 import java.util.Collections;
 import java.util.List;
+import org.gradle.api.Project;
 
-public final class D8Util {
+public final class D8Manager {
 
   private static final String D8_CACHE = OkBuckGradlePlugin.WORKSPACE_PATH + "/d8";
   private static final String RT_STUB_JAR = "rt-stub.jar";
   public static final String RT_STUB_JAR_RULE = "//" + D8_CACHE + ":" + RT_STUB_JAR;
 
-  private D8Util() {}
+  private final Project rootProject;
 
-  public static void copyDeps(BuckFileManager buckFileManager) {
-    FileUtil.copyResourceToProject("d8/" + RT_STUB_JAR, new File(D8_CACHE, RT_STUB_JAR));
+  public D8Manager(Project rootProject) {
+    this.rootProject = rootProject;
+  }
+
+  public void copyDeps(BuckFileManager buckFileManager) {
+    FileUtil.copyResourceToProject("d8/" + RT_STUB_JAR, rootProject.file(D8_CACHE + File.pathSeparator + RT_STUB_JAR));
 
     List<Rule> d8 =
         Collections.singletonList(
@@ -28,6 +34,6 @@ public static void copyDeps(BuckFileManager buckFileManager) {
                 .ruleType(RuleType.PREBUILT_JAR.getBuckName())
                 .name(RT_STUB_JAR));
 
-    buckFileManager.writeToBuckFile(d8, new File(D8_CACHE, OkBuckGradlePlugin.BUCK));
+    buckFileManager.writeToBuckFile(d8, rootProject.file(D8_CACHE + File.pathSeparator + OkBuckGradlePlugin.BUCK));
   }
 }
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -78,6 +78,7 @@ def apt = [
 ]
 
 def external = [
+        annotationApi   : "javax.annotation:javax.annotation-api:1.3.2",
         butterKnife     : "com.jakewharton:butterknife:${versions.butterKnife}",
         dagger          : "com.google.dagger:dagger:${versions.dagger}",
         daggerAndroid   : "com.google.dagger:dagger-android-support:${versions.dagger}",