From 1b880958cb8fd4b1f6272caf766b9a42eb912438 Mon Sep 17 00:00:00 2001 From: Gautam Korlam Date: Fri, 17 Jul 2020 08:52:29 -0700 Subject: [PATCH 1/8] Add java 11 testing bits in travis --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 9a3eed20f..5765d4182 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,7 @@ language: java jdk: - openjdk8 + - openjdk11 before_cache: - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock From 939927f92dbe60583201458733d2d1731133de0f Mon Sep 17 00:00:00 2001 From: Gautam Korlam Date: Fri, 17 Jul 2020 09:20:28 -0700 Subject: [PATCH 2/8] Update commandline sdk tools --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5765d4182..e7ed80d2b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,7 +37,7 @@ install: - python --version - mkdir -p $HOME/android-sdk-dl - mkdir -p $HOME/android-sdk - - curl https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip > $HOME/android-sdk-dl/sdk-tools.zip + - curl https://dl.google.com/android/repository/commandlinetools-linux-6609375_latest.zip > $HOME/android-sdk-dl/sdk-tools.zip - unzip -qq -n $HOME/android-sdk-dl/sdk-tools.zip -d $HOME/android-sdk - yes | $HOME/android-sdk/tools/bin/sdkmanager --licenses From 6f14642c78972fa8a62c41e25b9b6b48b8cc805e Mon Sep 17 00:00:00 2001 From: Gautam Korlam Date: Fri, 17 Jul 2020 09:26:17 -0700 Subject: [PATCH 3/8] Update commandline sdk tools --- .travis.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index e7ed80d2b..6c16cf1a2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,11 +40,9 @@ install: - curl https://dl.google.com/android/repository/commandlinetools-linux-6609375_latest.zip > $HOME/android-sdk-dl/sdk-tools.zip - unzip -qq -n $HOME/android-sdk-dl/sdk-tools.zip -d $HOME/android-sdk - - yes | $HOME/android-sdk/tools/bin/sdkmanager --licenses - - - $HOME/android-sdk/tools/bin/sdkmanager 'platform-tools' > /dev/null - - $HOME/android-sdk/tools/bin/sdkmanager 'build-tools;30.0.0' > /dev/null - - $HOME/android-sdk/tools/bin/sdkmanager 'platforms;android-29' > /dev/null + - yes | $HOME/android-sdk/tools/bin/sdkmanager 'platform-tools' > /dev/null + - yes | $HOME/android-sdk/tools/bin/sdkmanager 'build-tools;30.0.0' > /dev/null + - yes | $HOME/android-sdk/tools/bin/sdkmanager 'platforms;android-29' > /dev/null script: - ./tooling/ci/build_cmd.sh From 3fd5665b4ca253516be7ea12922708246d4dfc4b Mon Sep 17 00:00:00 2001 From: Gautam Korlam Date: Fri, 17 Jul 2020 09:31:20 -0700 Subject: [PATCH 4/8] Update commandline sdk tools --- .travis.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6c16cf1a2..40d2aa435 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,11 +38,13 @@ install: - mkdir -p $HOME/android-sdk-dl - mkdir -p $HOME/android-sdk - curl https://dl.google.com/android/repository/commandlinetools-linux-6609375_latest.zip > $HOME/android-sdk-dl/sdk-tools.zip - - unzip -qq -n $HOME/android-sdk-dl/sdk-tools.zip -d $HOME/android-sdk + - unzip -qq -n $HOME/android-sdk-dl/sdk-tools.zip -d $HOME/android-sdk/cmdline-tools - - yes | $HOME/android-sdk/tools/bin/sdkmanager 'platform-tools' > /dev/null - - yes | $HOME/android-sdk/tools/bin/sdkmanager 'build-tools;30.0.0' > /dev/null - - yes | $HOME/android-sdk/tools/bin/sdkmanager 'platforms;android-29' > /dev/null + - yes | $HOME/android-sdk/cmdline-tools/tools/bin/sdkmanager --licenses + + - $HOME/android-sdk/cmdline-tools/tools/bin/sdkmanager 'platform-tools' > /dev/null + - $HOME/android-sdk/cmdline-tools/tools/bin/sdkmanager 'build-tools;30.0.0' > /dev/null + - $HOME/android-sdk/cmdline-tools/tools/bin/sdkmanager 'platforms;android-29' > /dev/null script: - ./tooling/ci/build_cmd.sh From 042612d0cd2efff632d60fd03c0c415b3ebcc5aa Mon Sep 17 00:00:00 2001 From: Gautam Korlam Date: Fri, 17 Jul 2020 10:58:05 -0700 Subject: [PATCH 5/8] Java 11 compatibility changes --- buildSrc/build.gradle | 5 +++-- .../com/uber/okbuck/OkBuckGradlePlugin.java | 8 ++++++-- .../android/AndroidLibraryRuleComposer.java | 4 ++-- .../android/AndroidModuleRuleComposer.java | 4 ++-- .../android/AndroidTestRuleComposer.java | 4 ++-- .../ExopackageAndroidLibraryRuleComposer.java | 4 ++-- .../D8Util.java => manager/D8Manager.java} | 18 ++++++++++++------ dependencies.gradle | 1 + 8 files changed, 30 insertions(+), 18 deletions(-) rename buildSrc/src/main/java/com/uber/okbuck/core/{util/D8Util.java => manager/D8Manager.java} (60%) diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index 95713e8e9..7c9b93b9f 100644 --- 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 index 3cdcf9f14..3bf593af5 100644 --- 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 { 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 index 8847580b4..a9bb206e5 100644 --- 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 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 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 index 6c1188fab..e0fb9656a 100644 --- 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 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 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 index d1a2f9a7b..91f4d9e0a 100644 --- 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 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/buildSrc/src/main/java/com/uber/okbuck/composer/android/ExopackageAndroidLibraryRuleComposer.java b/buildSrc/src/main/java/com/uber/okbuck/composer/android/ExopackageAndroidLibraryRuleComposer.java index 726b68a32..e00901440 100644 --- a/buildSrc/src/main/java/com/uber/okbuck/composer/android/ExopackageAndroidLibraryRuleComposer.java +++ b/buildSrc/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 providedDeps = new LinkedHashSet<>(); - providedDeps.add(D8Util.RT_STUB_JAR_RULE); + providedDeps.add(D8Manager.RT_STUB_JAR_RULE); AndroidRule androidRule = new AndroidRule() diff --git a/buildSrc/src/main/java/com/uber/okbuck/core/util/D8Util.java b/buildSrc/src/main/java/com/uber/okbuck/core/manager/D8Manager.java similarity index 60% rename from buildSrc/src/main/java/com/uber/okbuck/core/util/D8Util.java rename to buildSrc/src/main/java/com/uber/okbuck/core/manager/D8Manager.java index 4454acdc0..bf23232fd 100644 --- a/buildSrc/src/main/java/com/uber/okbuck/core/util/D8Util.java +++ b/buildSrc/src/main/java/com/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 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 index b343b7bca..749bc5775 100644 --- 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}", From 6b09f5e1308ef370b24056161bb16c3aab15dd8e Mon Sep 17 00:00:00 2001 From: Gautam Korlam Date: Fri, 17 Jul 2020 11:19:20 -0700 Subject: [PATCH 6/8] Fix build --- .../src/main/java/com/uber/okbuck/core/manager/D8Manager.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildSrc/src/main/java/com/uber/okbuck/core/manager/D8Manager.java b/buildSrc/src/main/java/com/uber/okbuck/core/manager/D8Manager.java index bf23232fd..872a8aa71 100644 --- a/buildSrc/src/main/java/com/uber/okbuck/core/manager/D8Manager.java +++ b/buildSrc/src/main/java/com/uber/okbuck/core/manager/D8Manager.java @@ -24,7 +24,7 @@ public D8Manager(Project rootProject) { } public void copyDeps(BuckFileManager buckFileManager) { - FileUtil.copyResourceToProject("d8/" + RT_STUB_JAR, rootProject.file(D8_CACHE + File.pathSeparator + RT_STUB_JAR)); + FileUtil.copyResourceToProject("d8/" + RT_STUB_JAR, rootProject.file(D8_CACHE + File.separator + RT_STUB_JAR)); List d8 = Collections.singletonList( @@ -34,6 +34,6 @@ public void copyDeps(BuckFileManager buckFileManager) { .ruleType(RuleType.PREBUILT_JAR.getBuckName()) .name(RT_STUB_JAR)); - buckFileManager.writeToBuckFile(d8, rootProject.file(D8_CACHE + File.pathSeparator + OkBuckGradlePlugin.BUCK)); + buckFileManager.writeToBuckFile(d8, rootProject.file(D8_CACHE + File.separator + OkBuckGradlePlugin.BUCK)); } } From 80ea282a74fb471583e90796ed625b861440530e Mon Sep 17 00:00:00 2001 From: Gautam Korlam Date: Mon, 20 Jul 2020 10:24:29 -0700 Subject: [PATCH 7/8] Add java 11 handling for downloading buck --- .../com/uber/okbuck/core/manager/BuckManager.java | 14 +++++++++++++- .../com/uber/okbuck/extension/OkBuckExtension.java | 9 ++++++++- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/buildSrc/src/main/java/com/uber/okbuck/core/manager/BuckManager.java b/buildSrc/src/main/java/com/uber/okbuck/core/manager/BuckManager.java index cb3d96901..f44037e62 100644 --- a/buildSrc/src/main/java/com/uber/okbuck/core/manager/BuckManager.java +++ b/buildSrc/src/main/java/com/uber/okbuck/core/manager/BuckManager.java @@ -1,6 +1,7 @@ package com.uber.okbuck.core.manager; import com.google.common.base.Preconditions; +import com.google.errorprone.annotations.Var; import com.uber.okbuck.OkBuckGradlePlugin; import com.uber.okbuck.core.util.FileUtil; import com.uber.okbuck.core.util.ProjectUtil; @@ -38,7 +39,7 @@ public void setupBuckBinary() { rootProject .getRepositories() .maven(mavenArtifactRepository -> mavenArtifactRepository.setUrl(JITPACK_URL)); - rootProject.getDependencies().add(BUCK_BINARY_CONFIGURATION, okbuckExt.buckBinary); + rootProject.getDependencies().add(BUCK_BINARY_CONFIGURATION, getJavaVersion() == 11 ? okbuckExt.buckBinaryJava11 : okbuckExt.buckBinary); Set resolvedFiles = buckConfig.getResolvedConfiguration().getFiles(); Preconditions.checkArgument(resolvedFiles.size() == 1); @@ -60,4 +61,15 @@ public void finalizeDependencies() { FileUtil.symlink(linkedBinaryPath, realBuckBinaryPath); } } + + private static int getJavaVersion() { + @Var String version = System.getProperty("java.version"); + if(version.startsWith("1.")) { + version = version.substring(2, 3); + } else { + int dot = version.indexOf("."); + if(dot != -1) { version = version.substring(0, dot); } + } + return Integer.parseInt(version); + } } diff --git a/buildSrc/src/main/java/com/uber/okbuck/extension/OkBuckExtension.java b/buildSrc/src/main/java/com/uber/okbuck/extension/OkBuckExtension.java index 2f47db69b..022e134f0 100644 --- a/buildSrc/src/main/java/com/uber/okbuck/extension/OkBuckExtension.java +++ b/buildSrc/src/main/java/com/uber/okbuck/extension/OkBuckExtension.java @@ -15,6 +15,8 @@ @SuppressWarnings("unused") public class OkBuckExtension { + private static final String DEFAULT_BUCK_BINARY_SHA = "0299f0ff54201b700c06f8892862e1109d9739eb"; + /** Build Tools Version */ @Input public String buildToolVersion = "28.0.2"; @@ -83,7 +85,12 @@ public class OkBuckExtension { /** The prebuilt buck binary to use */ @Input public String buckBinary = - "com.github.facebook:buck:0aeb8be606590c8203827a20dfa3c7f14a12fb5d@pex"; + "com.github.facebook:buck:" + DEFAULT_BUCK_BINARY_SHA + "@pex"; + + /** The prebuilt buck binary to use with java 11 */ + @Input + public String buckBinaryJava11 = + "com.github.facebook:buck:" + DEFAULT_BUCK_BINARY_SHA + ":java11@pex"; private WrapperExtension wrapperExtension = new WrapperExtension(); private KotlinExtension kotlinExtension; From 866dd1275c602b96da2e1be58d2094bfba9520ea Mon Sep 17 00:00:00 2001 From: Gautam Korlam Date: Mon, 20 Jul 2020 10:58:44 -0700 Subject: [PATCH 8/8] Add annotation deps to fix build --- app/build.gradle | 1 + dependencies.gradle | 4 ++-- dummylibrary/build.gradle | 2 ++ java-app/build.gradle | 2 ++ kotlin-app/build.gradle | 4 ++++ libraries/javalibrary/build.gradle | 2 ++ libraries/kotlinlibrary/build.gradle | 3 +++ libraries/lintErrorLibrary/build.gradle | 1 + 8 files changed, 17 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index ff1527e18..8c6eafea8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -54,6 +54,7 @@ repositories { dependencies { compileOnly deps.apt.autoValueAnnotations + compileOnly deps.external.annotationApi implementation fileTree(dir: "libs", include: ["*.jar"]) implementation(name: "rxscreenshotdetector-1.2.0", ext: "aar") diff --git a/dependencies.gradle b/dependencies.gradle index 749bc5775..db9f4b5ad 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -22,7 +22,7 @@ def versions = [ autovalue : "1.7.4", avro : "1.10.0", butterKnife : "10.2.1", - dagger : "2.28.2", + dagger : "2.28.3", jna : "5.6.0", kotlin : "1.3.72", leakCanary : "1.5.4", @@ -78,7 +78,7 @@ def apt = [ ] def external = [ - annotationApi : "javax.annotation:javax.annotation-api:1.3.2", + annotationApi : ["javax.annotation:javax.annotation-api:1.3.2", "com.github.pengrad:jdk9-deps:1.0"], butterKnife : "com.jakewharton:butterknife:${versions.butterKnife}", dagger : "com.google.dagger:dagger:${versions.dagger}", daggerAndroid : "com.google.dagger:dagger-android-support:${versions.dagger}", diff --git a/dummylibrary/build.gradle b/dummylibrary/build.gradle index c763d5296..c535223cd 100644 --- a/dummylibrary/build.gradle +++ b/dummylibrary/build.gradle @@ -20,6 +20,8 @@ android { } dependencies { + compileOnly deps.external.annotationApi + api deps.external.dagger api deps.external.gson diff --git a/java-app/build.gradle b/java-app/build.gradle index 0829f2edd..04f68ab54 100644 --- a/java-app/build.gradle +++ b/java-app/build.gradle @@ -2,6 +2,8 @@ apply plugin: "java-library" apply plugin: "application" dependencies { + compileOnly deps.external.annotationApi + implementation deps.external.gson implementation deps.external.dagger implementation deps.external.avroIpc diff --git a/kotlin-app/build.gradle b/kotlin-app/build.gradle index 4e397174f..7b6533a8f 100644 --- a/kotlin-app/build.gradle +++ b/kotlin-app/build.gradle @@ -38,9 +38,13 @@ dependencies { kapt deps.apt.autoValueGson compileOnly deps.apt.autoValueAnnotations + compileOnly deps.external.annotationApi kaptTest deps.apt.daggerCompiler + testCompileOnly deps.external.annotationApi + androidTestCompileOnly deps.external.annotationApi + kaptAndroidTest deps.apt.daggerCompiler kaptAndroidTest deps.apt.daggerAndroidProcessor diff --git a/libraries/javalibrary/build.gradle b/libraries/javalibrary/build.gradle index e4478cb63..bddb5d8c3 100644 --- a/libraries/javalibrary/build.gradle +++ b/libraries/javalibrary/build.gradle @@ -15,6 +15,8 @@ integrationTest { } dependencies { + compileOnly deps.external.annotationApi + api deps.external.gson implementation deps.external.dagger diff --git a/libraries/kotlinlibrary/build.gradle b/libraries/kotlinlibrary/build.gradle index 297b998eb..c03bc09aa 100644 --- a/libraries/kotlinlibrary/build.gradle +++ b/libraries/kotlinlibrary/build.gradle @@ -3,6 +3,9 @@ apply plugin: "kotlin-kapt" apply plugin: "kotlin-allopen" dependencies { + compileOnly deps.external.annotationApi + testCompileOnly deps.external.annotationApi + implementation deps.external.kotlinStdlib implementation deps.external.dagger kapt deps.apt.daggerCompiler diff --git a/libraries/lintErrorLibrary/build.gradle b/libraries/lintErrorLibrary/build.gradle index f351b0b15..249cdbf3b 100644 --- a/libraries/lintErrorLibrary/build.gradle +++ b/libraries/lintErrorLibrary/build.gradle @@ -2,6 +2,7 @@ apply plugin: "com.android.library" apply plugin: "com.jakewharton.butterknife" dependencies { + compileOnly deps.external.annotationApi buckLint project (":libraries:customLintLibrary") annotationProcessor deps.apt.butterKnifeCompiler