Skip to content

Commit 9c5269f

Browse files
committed
UPDATE: Minor tweaks.
1 parent fd6fa50 commit 9c5269f

File tree

7 files changed

+13
-9
lines changed

7 files changed

+13
-9
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
*.iml
22
.gradle
33
/local.gradle
4+
/local.buildscript.gradle
45
/local.properties
56
/.idea
67
/captures
78
build
9+
library/deploy.gradle
810
.DS_Store

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ android:
55
- tools
66
- platform-tools
77
- tools # intentional, see travis-ci/docs-travis-ci-com#779
8-
- build-tools-26.0.0
8+
- build-tools-26.0.2
99
- android-22 # For emulator to work
1010
- android-26
1111
- extra-android-m2repository

build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ buildscript {
1010
// NOTE: Do not place your application dependencies here; they belong
1111
// in the individual module build.gradle files
1212
}
13+
if (file('local.buildscript.gradle').exists()) apply from: 'local.buildscript.gradle', to: buildscript
1314
}
1415

1516
if (file('local.gradle').exists()) apply from: 'local.gradle'
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Sat Mar 25 20:08:09 CST 2017
1+
#Mon Jul 17 17:04:54 CST 2017
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
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

library/build.gradle

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
22

33
android {
44
compileSdkVersion 26
5-
buildToolsVersion "26.0.0"
5+
buildToolsVersion "26.0.2"
66

77
defaultConfig {
88
minSdkVersion 9
@@ -11,7 +11,6 @@ android {
1111
versionName "1.0"
1212

1313
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
14-
1514
}
1615

1716
lintOptions {
@@ -21,6 +20,11 @@ android {
2120
textReport true
2221
}
2322

23+
adbOptions {
24+
timeOutInMs 20 * 60 * 1000 // Extend to 20 minutes for Travis-CI.
25+
installOptions "-d","-t"
26+
}
27+
2428
buildTypes {
2529
release {
2630
minifyEnabled false

library/proguard-rules.pro

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@
44
-dontwarn com.oasisfeng.condom.CondomContext$CondomContentResolver
55
-dontwarn com.oasisfeng.condom.ContentResolverWrapper
66
-dontwarn com.oasisfeng.condom.PackageManagerWrapper
7+
-dontwarn com.oasisfeng.condom.PseudoContextWrapper
78
-dontwarn com.oasisfeng.condom.kit.NullDeviceIdKit$CondomTelephonyManager

library/src/androidTest/java/com/oasisfeng/condom/simulation/TestApplication.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,6 @@ public class TestApplication extends Application {
1313

1414
public static final String FAKE_PACKAGE_NAME = "a.b.c";
1515

16-
@Override public void onCreate() {
17-
super.onCreate();
18-
}
19-
2016
@Override public String getPackageName() {
2117
return sEnablePackageNameFake ? FAKE_PACKAGE_NAME : super.getPackageName();
2218
}

0 commit comments

Comments
 (0)