File tree Expand file tree Collapse file tree 7 files changed +13
-9
lines changed
src/androidTest/java/com/oasisfeng/condom/simulation Expand file tree Collapse file tree 7 files changed +13
-9
lines changed Original file line number Diff line number Diff line change 1
1
* .iml
2
2
.gradle
3
3
/local.gradle
4
+ /local.buildscript.gradle
4
5
/local.properties
5
6
/.idea
6
7
/captures
7
8
build
9
+ library /deploy.gradle
8
10
.DS_Store
Original file line number Diff line number Diff line change 5
5
- tools
6
6
- platform-tools
7
7
- tools # intentional, see travis-ci/docs-travis-ci-com#779
8
- - build-tools-26.0.0
8
+ - build-tools-26.0.2
9
9
- android-22 # For emulator to work
10
10
- android-26
11
11
- extra-android-m2repository
Original file line number Diff line number Diff line change @@ -10,6 +10,7 @@ buildscript {
10
10
// NOTE: Do not place your application dependencies here; they belong
11
11
// in the individual module build.gradle files
12
12
}
13
+ if (file(' local.buildscript.gradle' ). exists()) apply from : ' local.buildscript.gradle' , to : buildscript
13
14
}
14
15
15
16
if (file(' local.gradle' ). exists()) apply from : ' local.gradle'
Original file line number Diff line number Diff line change 1
- # Sat Mar 25 20:08:09 CST 2017
1
+ # Mon Jul 17 17:04:54 CST 2017
2
2
distributionBase =GRADLE_USER_HOME
3
3
distributionPath =wrapper/dists
4
4
zipStoreBase =GRADLE_USER_HOME
5
5
zipStorePath =wrapper/dists
6
- distributionUrl =https\://services.gradle.org/distributions/gradle-3.5 -all.zip
6
+ distributionUrl =https\://services.gradle.org/distributions/gradle-4.1 -all.zip
Original file line number Diff line number Diff line change @@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
2
2
3
3
android {
4
4
compileSdkVersion 26
5
- buildToolsVersion " 26.0.0 "
5
+ buildToolsVersion " 26.0.2 "
6
6
7
7
defaultConfig {
8
8
minSdkVersion 9
@@ -11,7 +11,6 @@ android {
11
11
versionName " 1.0"
12
12
13
13
testInstrumentationRunner " android.support.test.runner.AndroidJUnitRunner"
14
-
15
14
}
16
15
17
16
lintOptions {
@@ -21,6 +20,11 @@ android {
21
20
textReport true
22
21
}
23
22
23
+ adbOptions {
24
+ timeOutInMs 20 * 60 * 1000 // Extend to 20 minutes for Travis-CI.
25
+ installOptions " -d" ," -t"
26
+ }
27
+
24
28
buildTypes {
25
29
release {
26
30
minifyEnabled false
Original file line number Diff line number Diff line change 4
4
-dontwarn com.oasisfeng.condom.CondomContext$CondomContentResolver
5
5
-dontwarn com.oasisfeng.condom.ContentResolverWrapper
6
6
-dontwarn com.oasisfeng.condom.PackageManagerWrapper
7
+ -dontwarn com.oasisfeng.condom.PseudoContextWrapper
7
8
-dontwarn com.oasisfeng.condom.kit.NullDeviceIdKit$CondomTelephonyManager
Original file line number Diff line number Diff line change @@ -13,10 +13,6 @@ public class TestApplication extends Application {
13
13
14
14
public static final String FAKE_PACKAGE_NAME = "a.b.c" ;
15
15
16
- @ Override public void onCreate () {
17
- super .onCreate ();
18
- }
19
-
20
16
@ Override public String getPackageName () {
21
17
return sEnablePackageNameFake ? FAKE_PACKAGE_NAME : super .getPackageName ();
22
18
}
You can’t perform that action at this time.
0 commit comments