Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow substituting the new proguard namespace #914

Merged
merged 1 commit into from
Jul 15, 2020
Merged

Allow substituting the new proguard namespace #914

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions buildSrc/src/main/java/com/uber/okbuck/core/util/ProguardUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.uber.okbuck.core.util;

import com.google.errorprone.annotations.Var;
import com.uber.okbuck.composer.base.BuckRuleComposer;
import com.uber.okbuck.core.dependency.DependencyCache;
import com.uber.okbuck.core.dependency.OExternalDependency;
Expand All @@ -13,21 +14,31 @@
public final class ProguardUtil {

private static final String PROGUARD_GROUP = "net.sf.proguard";
private static final String PROGUARD_NEW_GROUP = "com.guardsquare";
private static final String PROGUARD_MODULE = "proguard-base";

private ProguardUtil() {}

@Nullable
public static String getProguardJarPath(Project project) {
String proguardVersion =
@Var String proguardVersion =
ProjectUtil.findVersionInClasspath(project, PROGUARD_NEW_GROUP, PROGUARD_MODULE);
@Var String currentGroup = PROGUARD_NEW_GROUP;

if (proguardVersion == null) {
proguardVersion =
ProjectUtil.findVersionInClasspath(project, PROGUARD_GROUP, PROGUARD_MODULE);
currentGroup = PROGUARD_GROUP;
}



Configuration proguardConfiguration =
project
.getConfigurations()
.detachedConfiguration(
new DefaultExternalModuleDependency(
PROGUARD_GROUP, PROGUARD_MODULE, proguardVersion));
currentGroup, PROGUARD_MODULE, proguardVersion));

DependencyCache cache = new DependencyCache(project, ProjectUtil.getDependencyManager(project));
Set<OExternalDependency> dependencies = cache.build(proguardConfiguration);
Expand All @@ -37,7 +48,7 @@ public static String getProguardJarPath(Project project) {
.stream()
.filter(
dependency ->
dependency.getGroup().equals(PROGUARD_GROUP)
(dependency.getGroup().equals(PROGUARD_GROUP) || dependency.getGroup().equals(PROGUARD_NEW_GROUP))
&& dependency.getName().equals(PROGUARD_MODULE))
.findAny();

Expand Down