Skip to content

Commit 88146c0

Browse files
SUPERCILEXsamtstern
SUPERCILEX
authored and
samtstern
committed
Need for build speed! (firebase#289)
1 parent 0a60203 commit 88146c0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+217
-186
lines changed

‎.travis.yml

+8-30
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
language: android
2-
jdk:
3-
- oraclejdk8
2+
jdk: oraclejdk8
3+
sudo: required # For faster internet speeds and more memory
4+
before_install:
5+
- mkdir "$ANDROID_HOME/licenses" || true
6+
- echo -e "\n8933bad161af4178b1185d1a37fbf41ea5269c55" > "$ANDROID_HOME/licenses/android-sdk-license"
7+
- echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "$ANDROID_HOME/licenses/android-sdk-preview-license"
48
android:
59
components:
610
# https://github.com/travis-ci/travis-ci/issues/6040#issuecomment-219367943
711
- tools
812
- tools
9-
licenses:
10-
- 'android-sdk-preview-license-.+'
11-
- 'android-sdk-license-.+'
12-
- 'google-gdk-license-.+'
13-
1413
before_cache:
1514
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
1615
- rm -fr $HOME/.gradle/caches/*/plugin-resolution/
@@ -20,27 +19,6 @@ cache:
2019
- $HOME/.gradle/wrapper/
2120
- $HOME/.android/build-cache
2221

23-
env:
24-
- SAMPLE=admob
25-
- SAMPLE=analytics
26-
- SAMPLE=app-indexing
27-
- SAMPLE=auth
28-
- SAMPLE=config
29-
- SAMPLE=crash
30-
- SAMPLE=database
31-
- SAMPLE=dynamiclinks
32-
- SAMPLE=invites
33-
- SAMPLE=perf
34-
- SAMPLE=messaging
35-
- SAMPLE=storage
36-
37-
before_install:
38-
- mkdir "$ANDROID_HOME/licenses" || true
39-
- echo -e "\n8933bad161af4178b1185d1a37fbf41ea5269c55" > "$ANDROID_HOME/licenses/android-sdk-license"
40-
- echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "$ANDROID_HOME/licenses/android-sdk-preview-license"
41-
4222
before_script:
43-
- ${ANDROID_HOME}tools/bin/sdkmanager --channel=3 "tools" "platform-tools" "build-tools;25.0.3" "platforms;android-25" "extras;google;m2repository" "extras;android;m2repository"
44-
45-
script:
46-
- ./build.sh
23+
- ${ANDROID_HOME}tools/bin/sdkmanager --channel=3 "tools" "platform-tools" "build-tools;25.0.3" "platforms;android-25" "extras;google;m2repository"
24+
script: ./build.sh

‎admob/app/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
apply plugin: 'com.android.application'
2+
check.dependsOn 'assembleDebugAndroidTest'
23

34
android {
45
compileSdkVersion 25
@@ -32,7 +33,6 @@ configurations.all {
3233

3334
dependencies {
3435
compile fileTree(dir: 'libs', include: ['*.jar'])
35-
// AppCompat
3636
compile 'com.android.support:appcompat-v7:25.3.1'
3737

3838
// [START gradle_play_config]

‎admob/build.gradle

+3-1
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@ buildscript {
44
repositories {
55
jcenter()
66
mavenLocal()
7+
google()
78
}
89
dependencies {
9-
classpath 'com.android.tools.build:gradle:2.3.2'
10+
classpath 'com.android.tools.build:gradle:3.0.0-alpha4'
1011
classpath 'com.google.gms:google-services:3.1.0'
1112

1213
// NOTE: Do not place your application dependencies here; they belong
@@ -18,5 +19,6 @@ allprojects {
1819
repositories {
1920
jcenter()
2021
mavenLocal()
22+
google()
2123
}
2224
}

‎admob/gradle/wrapper/gradle-wrapper.jar

494 Bytes
Binary file not shown.

‎admob/gradle/wrapper/gradle-wrapper.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Tue Apr 11 22:51:31 SGT 2017
1+
#Mon Jun 19 12:20:27 PDT 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.0-all.zip

‎admob/gradlew

+3-3
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
3333
# Use the maximum available, or set MAX_FD != -1 to use that value.
3434
MAX_FD="maximum"
3535

36-
warn ( ) {
36+
warn () {
3737
echo "$*"
3838
}
3939

40-
die ( ) {
40+
die () {
4141
echo
4242
echo "$*"
4343
echo
@@ -155,7 +155,7 @@ if $cygwin ; then
155155
fi
156156

157157
# Escape application args
158-
save ( ) {
158+
save () {
159159
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
160160
echo " "
161161
}

‎analytics/app/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
apply plugin: 'com.android.application'
2+
check.dependsOn 'assembleDebugAndroidTest'
23

34
android {
45
compileSdkVersion 25

‎analytics/build.gradle

+3-1
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@ buildscript {
44
repositories {
55
jcenter()
66
mavenLocal()
7+
google()
78
}
89
dependencies {
9-
classpath 'com.android.tools.build:gradle:2.3.2'
10+
classpath 'com.android.tools.build:gradle:3.0.0-alpha4'
1011
classpath 'com.google.gms:google-services:3.1.0'
1112

1213
// NOTE: Do not place your application dependencies here; they belong
@@ -18,5 +19,6 @@ allprojects {
1819
repositories {
1920
jcenter()
2021
mavenLocal()
22+
google()
2123
}
2224
}

‎analytics/gradle/wrapper/gradle-wrapper.jar

494 Bytes
Binary file not shown.

‎analytics/gradle/wrapper/gradle-wrapper.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Tue Apr 11 22:51:47 SGT 2017
1+
#Mon Jun 19 12:19:06 PDT 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.0-all.zip

‎analytics/gradlew

+3-3
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
3333
# Use the maximum available, or set MAX_FD != -1 to use that value.
3434
MAX_FD="maximum"
3535

36-
warn ( ) {
36+
warn () {
3737
echo "$*"
3838
}
3939

40-
die ( ) {
40+
die () {
4141
echo
4242
echo "$*"
4343
echo
@@ -155,7 +155,7 @@ if $cygwin ; then
155155
fi
156156

157157
# Escape application args
158-
save ( ) {
158+
save () {
159159
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
160160
echo " "
161161
}

‎app-indexing/app/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
apply plugin: 'com.android.application'
2+
check.dependsOn 'assembleDebugAndroidTest'
23

34
android {
45
compileSdkVersion 25

‎app-indexing/build.gradle

+3-1
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@ buildscript {
44
repositories {
55
jcenter()
66
mavenLocal()
7+
google()
78
}
89
dependencies {
9-
classpath 'com.android.tools.build:gradle:2.3.2'
10+
classpath 'com.android.tools.build:gradle:3.0.0-alpha4'
1011
classpath 'com.google.gms:google-services:3.1.0'
1112

1213
// NOTE: Do not place your application dependencies here; they belong
@@ -18,5 +19,6 @@ allprojects {
1819
repositories {
1920
jcenter()
2021
mavenLocal()
22+
google()
2123
}
2224
}

‎app-indexing/gradle/wrapper/gradle-wrapper.jar

494 Bytes
Binary file not shown.

‎app-indexing/gradle/wrapper/gradle-wrapper.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Tue Apr 11 22:51:51 SGT 2017
1+
#Mon Jun 19 12:17:08 PDT 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.0-all.zip

‎app-indexing/gradlew

+3-3
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
3333
# Use the maximum available, or set MAX_FD != -1 to use that value.
3434
MAX_FD="maximum"
3535

36-
warn ( ) {
36+
warn () {
3737
echo "$*"
3838
}
3939

40-
die ( ) {
40+
die () {
4141
echo
4242
echo "$*"
4343
echo
@@ -155,7 +155,7 @@ if $cygwin ; then
155155
fi
156156

157157
# Escape application args
158-
save ( ) {
158+
save () {
159159
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
160160
echo " "
161161
}

‎auth/app/build.gradle

+6-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
apply plugin: 'com.android.application'
2+
check.dependsOn 'assembleMinSdkJellybeanDebugAndroidTest', 'assembleMinSdkIcsDebugAndroidTest'
23

34
android {
45
compileSdkVersion 25
56
buildToolsVersion "25.0.3"
7+
flavorDimensions "minSdkVersion"
68

79
defaultConfig {
810
applicationId "com.google.firebase.quickstart.auth"
@@ -21,18 +23,20 @@ android {
2123
}
2224

2325
lintOptions {
24-
abortOnError false
26+
abortOnError false
2527
}
2628

2729
productFlavors {
2830

2931
// Build variant with minSdk 16 to include Facebook and FirebaseUI libraries.
3032
minSdkJellybean {
33+
dimension "minSdkVersion"
3134
minSdkVersion 16
3235
}
3336

3437
// Build variant with minSdk 14, excludes Facebook and FirebaseUI libraries.
3538
minSdkIcs {
39+
dimension "minSdkVersion"
3640
minSdkVersion 14
3741
}
3842

@@ -71,7 +75,7 @@ dependencies {
7175
transitive = true
7276
}
7377
compile('com.twitter.sdk.android:twitter:1.13.1@aar') {
74-
transitive = true;
78+
transitive = true
7579
}
7680

7781
androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2'

‎auth/build.gradle

+4-2
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,20 @@ buildscript {
44
repositories {
55
jcenter()
66
mavenLocal()
7+
google()
78
}
89
dependencies {
9-
classpath 'com.android.tools.build:gradle:2.2.1'
10+
classpath 'com.android.tools.build:gradle:3.0.0-alpha4'
1011
classpath 'com.google.gms:google-services:3.1.0'
1112
}
1213
}
1314

1415
allprojects {
1516
repositories {
1617
jcenter()
17-
maven { url 'https://maven.fabric.io/public' }
1818
mavenLocal()
19+
google()
20+
maven { url 'https://maven.fabric.io/public' }
1921
}
2022
}
2123

‎auth/gradle/wrapper/gradle-wrapper.jar

494 Bytes
Binary file not shown.

‎auth/gradle/wrapper/gradle-wrapper.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Tue Apr 11 22:51:56 SGT 2017
1+
#Mon Jun 19 12:15:17 PDT 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.0-all.zip

‎auth/gradlew

+3-3
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
3333
# Use the maximum available, or set MAX_FD != -1 to use that value.
3434
MAX_FD="maximum"
3535

36-
warn ( ) {
36+
warn () {
3737
echo "$*"
3838
}
3939

40-
die ( ) {
40+
die () {
4141
echo
4242
echo "$*"
4343
echo
@@ -155,7 +155,7 @@ if $cygwin ; then
155155
fi
156156

157157
# Escape application args
158-
save ( ) {
158+
save () {
159159
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
160160
echo " "
161161
}

‎build.gradle

+4-3
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,20 @@ buildscript {
22
repositories {
33
jcenter()
44
mavenLocal()
5+
google()
56
}
67
dependencies {
7-
classpath 'com.android.tools.build:gradle:2.3.2'
8+
classpath 'com.android.tools.build:gradle:3.0.0-alpha4'
89
classpath 'com.google.gms:google-services:3.1.0'
910
}
1011
}
1112

1213
allprojects {
1314
repositories {
1415
jcenter()
15-
maven { url 'https://maven.fabric.io/public' }
16-
maven { url 'https://maven.google.com' }
16+
google()
1717
mavenLocal()
18+
maven { url 'https://maven.fabric.io/public' }
1819
}
1920
}
2021

0 commit comments

Comments
 (0)