Skip to content

Commit 57ee6c2

Browse files
SUPERCILEXsamtstern
authored andcommitted
Fix travis
1 parent bc428ed commit 57ee6c2

File tree

2 files changed

+1
-37
lines changed

2 files changed

+1
-37
lines changed

.travis.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
language: android
22
jdk: oraclejdk8
3-
# See https://github.com/travis-ci/travis-ci/issues/5582
4-
sudo: required
3+
sudo: false
54
before_cache:
65
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
76
- rm -fr $HOME/.gradle/caches/*/plugin-resolution/

auth/src/test/java/com/firebase/ui/auth/testhelpers/CustomRobolectricGradleTestRunner.java

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,7 @@
2626
import org.robolectric.RobolectricTestRunner;
2727
import org.robolectric.annotation.Config;
2828
import org.robolectric.internal.bytecode.InstrumentationConfiguration;
29-
import org.robolectric.manifest.AndroidManifest;
30-
import org.robolectric.res.FileFsFile;
31-
import org.robolectric.res.FsFile;
3229

33-
/**
34-
* For custom manifest hack, see:
35-
* https://gist.github.com/venator85/282df3677af9ecac56e5e4b91471cd8f
36-
*/
3730
public class CustomRobolectricGradleTestRunner extends RobolectricTestRunner {
3831
public CustomRobolectricGradleTestRunner(Class<?> klass) throws InitializationError {
3932
super(klass);
@@ -53,32 +46,4 @@ public InstrumentationConfiguration createClassLoaderConfig(Config config) {
5346

5447
return builder.build();
5548
}
56-
57-
@Override
58-
protected AndroidManifest getAppManifest(Config config) {
59-
AndroidManifest appManifest = super.getAppManifest(config);
60-
FsFile androidManifestFile = appManifest.getAndroidManifestFile();
61-
62-
if (androidManifestFile.exists()) {
63-
return appManifest;
64-
} else {
65-
// Fixes error 'No such manifest file: build/intermediates/manifests/full/debug/AndroidManifest.xml'
66-
androidManifestFile = FileFsFile.from(
67-
getModuleRootPath(config),
68-
appManifest.getAndroidManifestFile()
69-
.getPath()
70-
.replace("manifests/full", "manifests/aapt"));
71-
72-
return new AndroidManifest(
73-
androidManifestFile,
74-
appManifest.getResDirectory(),
75-
appManifest.getAssetsDirectory());
76-
}
77-
}
78-
79-
private String getModuleRootPath(Config config) {
80-
String moduleRoot = config.constants().getResource("").toString().replace("file:", "");
81-
return moduleRoot.substring(0, moduleRoot.indexOf("/build"));
82-
}
83-
8449
}

0 commit comments

Comments
 (0)