Skip to content

Simplify proguard handling logic. #2744

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

Merged
merged 2 commits into from
Jun 18, 2021
Merged

Simplify proguard handling logic. #2744

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e7f386
Simplify proguard handling logic.
vkryachko Jun 17, 2021
f80edcc
Fix
vkryachko Jun 17, 2021
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
49 changes: 0 additions & 49 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,55 +101,6 @@ configure(subprojects) {
apply plugin: "org.jlleitschuh.gradle.ktlint"
}


/**
* Configure "Preguarding" for the subprojects.
*
* <p> The way it works is every library subproject that has the android plugin applied and:
*
* <ul>
* <li>Contains a file named "preguard.txt" will get proguarded using that file as proguard
* configuration in release mode.
* <li>Contains a file named "proguard.txt" will ship this file inside its release aar as a
* consumer proguard file.
*/
configure(subprojects) {
def PREGUARD_FILE_NAME = 'preguard.txt'
def CONSUMER_PROGUARD_FILE_NAME = 'proguard.txt'
afterEvaluate { Project sub ->

if (sub.plugins.findPlugin('com.android.library') == null) {
return
}

boolean skipPreguard = sub.getProperties().getOrDefault('firebaseSkipPreguard', 'true').toBoolean()
def defaultPreguard = rootProject.getProperties().getOrDefault('firebaseDefaultPreguardFile', 'default-preguard.txt')

if(!skipPreguard) {

sub.android {
buildTypes {
release {
// default behavior for minifyEnabled is:
// useProguard true
// shrinkResources false
minifyEnabled true
proguardFiles file(defaultPreguard), sub.file(PREGUARD_FILE_NAME)
}
}
}
}

// Ship consumer proguard config if it exists.
if (sub.file(CONSUMER_PROGUARD_FILE_NAME).exists()) {
sub.android { buildTypes { release { consumerProguardFiles 'proguard.txt' } } }
}

sub.apply plugin: LicenseResolverPlugin
}
}


task clean(type: Delete) {
delete rootProject.buildDir
}
2 changes: 2 additions & 0 deletions buildSrc/src/main/java/com/google/firebase/gradle/plugins/FirebaseLibraryPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import com.google.firebase.gradle.plugins.apiinfo.GetMetalavaJarTask;
import com.google.firebase.gradle.plugins.ci.Coverage;
import com.google.firebase.gradle.plugins.ci.device.FirebaseTestServer;
import com.google.firebase.gradle.plugins.license.LicenseResolverPlugin;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this change related to the proguard logic?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes and no :)

It used to live in the root project configuration alongside the proguard logic. So it makes sense to move it here

import java.io.File;
import java.nio.file.Paths;
import org.gradle.api.JavaVersion;
Expand All @@ -40,6 +41,7 @@ public class FirebaseLibraryPlugin implements Plugin<Project> {
@Override
public void apply(Project project) {
project.apply(ImmutableMap.of("plugin", "com.android.library"));
project.apply(ImmutableMap.of("plugin", LicenseResolverPlugin.class));

FirebaseLibraryExtension firebaseLibrary =
project
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/src/main/java/com/google/firebase/gradle/plugins/license/LicenseResolverPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
* GenerateLicensesTask} to create the artifacts necessary for our release.
* </ul>
*/
class LicenseResolverPlugin implements Plugin<Project> {
public class LicenseResolverPlugin implements Plugin<Project> {
private static final String[] ANDROID_PLUGINS = {
"com.android.application", "com.android.library", "com.android.test"
};
Expand Down
Empty file removed encoders/firebase-encoders-json/proguard.txt
View file
Open in desktop
Empty file.
1 change: 1 addition & 0 deletions firebase-common/firebase-common.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ android {
versionName version
multiDexEnabled true
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles 'proguard.txt'
}
sourceSets {
androidTest {
Expand Down
412 changes: 0 additions & 412 deletions firebase-common/mapping.txt
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions firebase-components/firebase-components.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ android {
targetSdkVersion project.targetSdkVersion
versionName version
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles 'proguard.txt'
}

compileOptions {
Expand Down
Empty file removed firebase-database-collection/mapping.txt
View file
Open in desktop
Empty file.
32 changes: 0 additions & 32 deletions firebase-database-collection/preguard.txt
View file
Open in desktop

This file was deleted.

Empty file removed firebase-database/proguard.txt
View file
Open in desktop
Empty file.
1 change: 1 addition & 0 deletions firebase-firestore/firebase-firestore.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ android {
versionName version
multiDexEnabled true
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles 'proguard.txt'
}

sourceSets {
Expand Down
1 change: 1 addition & 0 deletions firebase-functions/firebase-functions.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ android {
versionName version
multiDexEnabled true
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles 'proguard.txt'
}
sourceSets {
androidTest {
Expand Down
18 changes: 0 additions & 18 deletions firebase-inappmessaging-display/preguard.txt
View file
Open in desktop

This file was deleted.

Empty file removed firebase-inappmessaging-display/proguard.txt
View file
Open in desktop
Empty file.
1 change: 1 addition & 0 deletions firebase-inappmessaging/firebase-inappmessaging.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ android {
multiDexEnabled true
versionName version
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles 'proguard.txt'
}
sourceSets {
main {
Expand Down
Empty file removed firebase-inappmessaging/mapping.txt
View file
Open in desktop
Empty file.
20 changes: 0 additions & 20 deletions firebase-inappmessaging/preguard.txt
View file
Open in desktop

This file was deleted.

Empty file removed firebase-storage/mapping.txt
View file
Open in desktop
Empty file.
Empty file removed firebase-storage/proguard.txt
View file
Open in desktop
Empty file.
1 change: 1 addition & 0 deletions transport/transport-api/transport-api.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ android {
minSdkVersion 14
targetSdkVersion project.targetSdkVersion
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles 'proguard.txt'
}

compileOptions {
Expand Down
1 change: 1 addition & 0 deletions transport/transport-backend-cct/transport-backend-cct.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ android {
targetSdkVersion project.targetSdkVersion
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
versionName version
consumerProguardFiles 'proguard.txt'
}
compileOptions {
sourceCompatibility = '1.8'
Expand Down