Need for build speed! (firebase#289)

devalp-pro · Jun 20, 2017 · 88146c0 · 88146c0
1 parent 0a60203
commit 88146c0
Show file tree

Hide file tree

Showing 70 changed files with 217 additions and 186 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,16 +1,15 @@
 language: android
-jdk:
-    - oraclejdk8
+jdk: oraclejdk8
+sudo: required # For faster internet speeds and more memory
+before_install:
+  - mkdir "$ANDROID_HOME/licenses" || true
+  - echo -e "\n8933bad161af4178b1185d1a37fbf41ea5269c55" > "$ANDROID_HOME/licenses/android-sdk-license"
+  - echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "$ANDROID_HOME/licenses/android-sdk-preview-license"
 android:
   components:
     # https://github.com/travis-ci/travis-ci/issues/6040#issuecomment-219367943
     - tools
     - tools
-  licenses:
-    - 'android-sdk-preview-license-.+'
-    - 'android-sdk-license-.+'
-    - 'google-gdk-license-.+'
-
 before_cache:
   - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
   - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
@@ -20,27 +19,6 @@ cache:
     - $HOME/.gradle/wrapper/
     - $HOME/.android/build-cache
 
-env:
-  - SAMPLE=admob
-  - SAMPLE=analytics
-  - SAMPLE=app-indexing
-  - SAMPLE=auth
-  - SAMPLE=config
-  - SAMPLE=crash
-  - SAMPLE=database
-  - SAMPLE=dynamiclinks
-  - SAMPLE=invites
-  - SAMPLE=perf
-  - SAMPLE=messaging
-  - SAMPLE=storage
-
-before_install:
-  - mkdir "$ANDROID_HOME/licenses" || true
-  - echo -e "\n8933bad161af4178b1185d1a37fbf41ea5269c55" > "$ANDROID_HOME/licenses/android-sdk-license"
-  - echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "$ANDROID_HOME/licenses/android-sdk-preview-license"
-
 before_script:
-  - ${ANDROID_HOME}tools/bin/sdkmanager --channel=3 "tools" "platform-tools" "build-tools;25.0.3" "platforms;android-25" "extras;google;m2repository" "extras;android;m2repository"
-
-script:
-  - ./build.sh
+  - ${ANDROID_HOME}tools/bin/sdkmanager --channel=3 "tools" "platform-tools" "build-tools;25.0.3" "platforms;android-25" "extras;google;m2repository"
+script: ./build.sh
diff --git a/admob/app/build.gradle b/admob/app/build.gradle
@@ -1,4 +1,5 @@
 apply plugin: 'com.android.application'
+check.dependsOn 'assembleDebugAndroidTest'
 
 android {
     compileSdkVersion 25
@@ -32,7 +33,6 @@ configurations.all {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    // AppCompat
     compile 'com.android.support:appcompat-v7:25.3.1'
 
     // [START gradle_play_config]

diff --git a/admob/build.gradle b/admob/build.gradle
@@ -4,9 +4,10 @@ buildscript {
     repositories {
         jcenter()
         mavenLocal()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.2'
+        classpath 'com.android.tools.build:gradle:3.0.0-alpha4'
         classpath 'com.google.gms:google-services:3.1.0'
 
         // NOTE: Do not place your application dependencies here; they belong
@@ -18,5 +19,6 @@ allprojects {
     repositories {
         jcenter()
         mavenLocal()
+        google()
     }
 }
diff --git a/admob/gradle/wrapper/gradle-wrapper.jar b/admob/gradle/wrapper/gradle-wrapper.jar
diff --git a/admob/gradle/wrapper/gradle-wrapper.properties b/admob/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Apr 11 22:51:31 SGT 2017
+#Mon Jun 19 12:20:27 PDT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-all.zip
diff --git a/admob/gradlew b/admob/gradlew
@@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn ( ) {
+warn () {
     echo "$*"
 }
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
@@ -155,7 +155,7 @@ if $cygwin ; then
 fi
 
 # Escape application args
-save ( ) {
+save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }

diff --git a/analytics/app/build.gradle b/analytics/app/build.gradle
@@ -1,4 +1,5 @@
 apply plugin: 'com.android.application'
+check.dependsOn 'assembleDebugAndroidTest'
 
 android {
     compileSdkVersion 25

diff --git a/analytics/build.gradle b/analytics/build.gradle
@@ -4,9 +4,10 @@ buildscript {
     repositories {
         jcenter()
         mavenLocal()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.2'
+        classpath 'com.android.tools.build:gradle:3.0.0-alpha4'
         classpath 'com.google.gms:google-services:3.1.0'
 
         // NOTE: Do not place your application dependencies here; they belong
@@ -18,5 +19,6 @@ allprojects {
     repositories {
         jcenter()
         mavenLocal()
+        google()
     }
 }
diff --git a/analytics/gradle/wrapper/gradle-wrapper.jar b/analytics/gradle/wrapper/gradle-wrapper.jar
diff --git a/analytics/gradle/wrapper/gradle-wrapper.properties b/analytics/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Apr 11 22:51:47 SGT 2017
+#Mon Jun 19 12:19:06 PDT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-all.zip
diff --git a/analytics/gradlew b/analytics/gradlew
@@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn ( ) {
+warn () {
     echo "$*"
 }
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
@@ -155,7 +155,7 @@ if $cygwin ; then
 fi
 
 # Escape application args
-save ( ) {
+save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }

diff --git a/app-indexing/app/build.gradle b/app-indexing/app/build.gradle
@@ -1,4 +1,5 @@
 apply plugin: 'com.android.application'
+check.dependsOn 'assembleDebugAndroidTest'
 
 android {
     compileSdkVersion 25

diff --git a/app-indexing/build.gradle b/app-indexing/build.gradle
@@ -4,9 +4,10 @@ buildscript {
     repositories {
         jcenter()
         mavenLocal()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.2'
+        classpath 'com.android.tools.build:gradle:3.0.0-alpha4'
         classpath 'com.google.gms:google-services:3.1.0'
 
         // NOTE: Do not place your application dependencies here; they belong
@@ -18,5 +19,6 @@ allprojects {
     repositories {
         jcenter()
         mavenLocal()
+        google()
     }
 }
diff --git a/app-indexing/gradle/wrapper/gradle-wrapper.jar b/app-indexing/gradle/wrapper/gradle-wrapper.jar
diff --git a/app-indexing/gradle/wrapper/gradle-wrapper.properties b/app-indexing/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Apr 11 22:51:51 SGT 2017
+#Mon Jun 19 12:17:08 PDT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-all.zip
diff --git a/app-indexing/gradlew b/app-indexing/gradlew
@@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn ( ) {
+warn () {
     echo "$*"
 }
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
@@ -155,7 +155,7 @@ if $cygwin ; then
 fi
 
 # Escape application args
-save ( ) {
+save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }

diff --git a/auth/app/build.gradle b/auth/app/build.gradle
@@ -1,8 +1,10 @@
 apply plugin: 'com.android.application'
+check.dependsOn 'assembleMinSdkJellybeanDebugAndroidTest', 'assembleMinSdkIcsDebugAndroidTest'
 
 android {
     compileSdkVersion 25
     buildToolsVersion "25.0.3"
+    flavorDimensions "minSdkVersion"
 
     defaultConfig {
         applicationId "com.google.firebase.quickstart.auth"
@@ -21,18 +23,20 @@ android {
     }
 
     lintOptions {
-      abortOnError false
+        abortOnError false
     }
 
     productFlavors {
 
         // Build variant with minSdk 16 to include Facebook and FirebaseUI libraries.
         minSdkJellybean {
+            dimension "minSdkVersion"
             minSdkVersion 16
         }
 
         // Build variant with minSdk 14, excludes Facebook and FirebaseUI libraries.
         minSdkIcs {
+            dimension "minSdkVersion"
             minSdkVersion 14
         }
 
@@ -71,7 +75,7 @@ dependencies {
         transitive = true
     }
     compile('com.twitter.sdk.android:twitter:1.13.1@aar') {
-        transitive = true;
+        transitive = true
     }
 
     androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2'

diff --git a/auth/build.gradle b/auth/build.gradle
@@ -4,18 +4,20 @@ buildscript {
     repositories {
         jcenter()
         mavenLocal()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.1'
+        classpath 'com.android.tools.build:gradle:3.0.0-alpha4'
         classpath 'com.google.gms:google-services:3.1.0'
     }
 }
 
 allprojects {
     repositories {
         jcenter()
-        maven { url 'https://maven.fabric.io/public' }
         mavenLocal()
+        google()
+        maven { url 'https://maven.fabric.io/public' }
     }
 }
 

diff --git a/auth/gradle/wrapper/gradle-wrapper.jar b/auth/gradle/wrapper/gradle-wrapper.jar
diff --git a/auth/gradle/wrapper/gradle-wrapper.properties b/auth/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Apr 11 22:51:56 SGT 2017
+#Mon Jun 19 12:15:17 PDT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-all.zip
diff --git a/auth/gradlew b/auth/gradlew
@@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn ( ) {
+warn () {
     echo "$*"
 }
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
@@ -155,7 +155,7 @@ if $cygwin ; then
 fi
 
 # Escape application args
-save ( ) {
+save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }

diff --git a/build.gradle b/build.gradle
@@ -2,19 +2,20 @@ buildscript {
     repositories {
         jcenter()
         mavenLocal()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.2'
+        classpath 'com.android.tools.build:gradle:3.0.0-alpha4'
         classpath 'com.google.gms:google-services:3.1.0'
     }
 }
 
 allprojects {
     repositories {
         jcenter()
-        maven { url 'https://maven.fabric.io/public' }
-        maven { url 'https://maven.google.com' }
+        google()
         mavenLocal()
+        maven { url 'https://maven.fabric.io/public' }
     }
 }