Skip to content

Commit c7fd497

Browse files
SUPERCILEXsamtstern
authored andcommitted
Remove unused proguard files and fix ./gradlew build not working because of failing tests (#573)
1 parent 28cee3f commit c7fd497

12 files changed

+14
-72
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ android:
1919
- extra-android-m2repository
2020
- extra-google-m2repository
2121
before_script: mv library/google-services.json app/google-services.json
22-
script: ./gradlew clean assembleDebug check -x testReleaseUnitTest # Running release tests fails because Facebook automatically enables app logger.
22+
script: ./gradlew clean assembleDebug check
2323
after_failure:
2424
# tests
2525
- cat app/build/reports/tests/testDebugUnitTest/index.html

app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ android {
1717
buildTypes {
1818
release {
1919
minifyEnabled true
20-
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
20+
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt')
2121

2222
// For the purposes of the sample, allow testing of a proguarded release build
2323
// using the debug key

app/proguard-rules.pro

Lines changed: 0 additions & 30 deletions
This file was deleted.

auth/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ android {
1818
manifestPlaceholders = [enableFbLogging: true]
1919

2020
minifyEnabled false
21-
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
21+
proguardFiles getDefaultProguardFile('proguard-android.txt')
2222
}
2323

2424
debug {

auth/proguard-rules.pro

Whitespace-only changes.

build.gradle

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,11 @@ allprojects {
2525
}
2626
}
2727

28+
// TODO Remove once either Facebook or Robolectric fix the crash: https://github.com/robolectric/robolectric/issues/2579#issuecomment-276526911
29+
gradle.taskGraph.whenReady { graph ->
30+
graph.allTasks.findAll { it.name ==~ /testReleaseUnitTest/ }*.enabled = false
31+
}
32+
2833
//Skip Javadoc generation for Java 1.8 as it breaks build
2934
if (JavaVersion.current().isJava8Compatible()) {
3035
allprojects {

database/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ android {
1515
buildTypes {
1616
release {
1717
minifyEnabled false
18-
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
18+
proguardFiles getDefaultProguardFile('proguard-android.txt')
1919
}
2020
}
2121
}

database/proguard-rules.pro

Lines changed: 0 additions & 17 deletions
This file was deleted.

library/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ android {
1111
versionCode 1
1212
versionName "0.0.0"
1313

14-
consumerProguardFiles 'consumer-proguard-rules.txt'
14+
consumerProguardFiles 'consumer-proguard-rules.pro'
1515
}
1616

1717
buildTypes {

library/consumer-proguard-rules.txt renamed to library/consumer-proguard-rules.pro

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
-keepattributes *Annotation*
44

55
# Don't warn about retrofit or okio classes
6-
-dontwarn retrofit.**
7-
-dontwarn retrofit2.**
86
-dontwarn okio.**
7+
-dontnote retrofit2.Platform
8+
-dontnote retrofit2.Platform$IOS$MainThreadExecutor
9+
-dontwarn retrofit2.Platform$Java8

storage/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ android {
1515
buildTypes {
1616
release {
1717
minifyEnabled false
18-
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
18+
proguardFiles getDefaultProguardFile('proguard-android.txt')
1919
}
2020
}
2121
}

storage/proguard-rules.pro

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)