Skip to content

Commit 541bab4

Browse files
committed
Small build cleanup
Change-Id: Id6b37fedf0b36d5878cbe582c05919923bf6c545
1 parent a9f6d16 commit 541bab4

File tree

3 files changed

+6
-34
lines changed

3 files changed

+6
-34
lines changed

app/build.gradle

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,27 +5,20 @@ android {
55
compileSdkVersion 23
66
buildToolsVersion "23.0.2"
77

8-
// STOPSHIP: This is temporarily needed for EAP SDK but should be removed before release
9-
enforceUniquePackageName false
10-
118
defaultConfig {
129
applicationId "com.firebase.uidemo"
1310
minSdkVersion 16
1411
targetSdkVersion 23
1512
versionCode 1
1613
versionName "1.0"
1714
}
15+
1816
buildTypes {
1917
release {
2018
minifyEnabled false
2119
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
2220
}
2321
}
24-
packagingOptions {
25-
exclude 'META-INF/LICENSE'
26-
exclude 'META-INF/NOTICE'
27-
exclude 'META-INF/NOTICE.txt'
28-
}
2922

3023
}
3124

app/proguard-rules.pro

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,8 @@
1515
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
1616
# public *;
1717
#}
18+
19+
# See:
20+
# https://firebase-dot-devsite.googleplex.com/docs/auth/android/start/#proguard
21+
-keepattributes Signature
22+
-keepattributes *Annotation*

library/build.gradle

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@ android {
44
compileSdkVersion 23
55
buildToolsVersion "23.0.2"
66

7-
// STOPSHIP: This is temporarily needed for EAP SDK but should be removed before release
8-
enforceUniquePackageName false
9-
107
defaultConfig {
118
minSdkVersion 16
129
targetSdkVersion 23
@@ -20,29 +17,6 @@ android {
2017
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
2118
}
2219
}
23-
24-
packagingOptions {
25-
exclude 'META-INF/LICENSE'
26-
exclude 'META-INF/LICENSE-FIREBASE.txt'
27-
exclude 'META-INF/NOTICE'
28-
}
29-
}
30-
31-
android.libraryVariants.all { variant ->
32-
task("generate${variant.name.capitalize()}Javadoc", type: Javadoc) {
33-
description "Generates Javadoc for $variant.name."
34-
source = variant.javaCompile.source
35-
ext.androidJar = "${android.sdkDirectory}/platforms/${android.compileSdkVersion}/android.jar"
36-
classpath = files(variant.javaCompile.classpath.files) + files(ext.androidJar)
37-
options.links("http://docs.oracle.com/javase/7/docs/api/");
38-
options.links("http://d.android.com/reference/");
39-
}
40-
task("bundle${variant.name.capitalize()}Javadoc", type: Jar) {
41-
description "Bundles Javadoc into zip for $variant.name."
42-
classifier = "javadoc"
43-
destinationDir = file("build/outputs")
44-
from tasks["generate${variant.name.capitalize()}Javadoc"]
45-
}
4620
}
4721

4822
dependencies {

0 commit comments

Comments
 (0)