diff --git a/.gitignore b/.gitignore index fedc0f90b..0195ac149 100644 --- a/.gitignore +++ b/.gitignore @@ -6,7 +6,7 @@ .DS_Store build google-services.json +!/library/google-services.json crashlytics-build.properties auth/src/main/res/values/com_crashlytics_export_strings.xml - diff --git a/.travis.yml b/.travis.yml index c8bc246f1..507ae8109 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,15 +10,18 @@ cache: - $HOME/.gradle/caches/ - $HOME/.gradle/wrapper/ - $HOME/.android/build-cache +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 - - build-tools-25.0.3 - - android-25 - - platform-tools - - extra-android-m2repository - - extra-google-m2repository -before_script: mv library/google-services.json app/google-services.json + - tools +before_script: + - mv library/google-services.json app/google-services.json + - ${ANDROID_HOME}tools/bin/sdkmanager --channel=3 "tools" "platform-tools" "build-tools;25.0.3" "platforms;android-25" "extras;google;m2repository" script: ./gradlew clean assembleDebug check after_failure: # tests diff --git a/app/build.gradle b/app/build.gradle index 2b22a1a84..5658ad3cb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -38,13 +38,13 @@ dependencies { compile "com.google.firebase:firebase-database:$firebaseVersion" compile "com.google.firebase:firebase-storage:$firebaseVersion" - compile('com.facebook.android:facebook-android-sdk:4.22.1') + compile('com.facebook.android:facebook-android-sdk:4.23.0') compile("com.twitter.sdk.android:twitter-core:3.0.0@aar") { transitive = true } // The following dependencies are not required to use the Firebase UI library. // They are used to make some aspects of the demo app implementation simpler for // demonstrative purposes, and you may find them useful in your own apps; YMMV. - compile 'pub.devrel:easypermissions:0.4.0' + compile 'pub.devrel:easypermissions:0.4.2' compile 'com.jakewharton:butterknife:8.5.1' annotationProcessor 'com.jakewharton:butterknife-compiler:8.5.1' debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5' diff --git a/build.gradle b/build.gradle index b87124738..71e319871 100644 --- a/build.gradle +++ b/build.gradle @@ -2,19 +2,21 @@ apply from: 'constants.gradle' buildscript { repositories { + google() jcenter() mavenLocal() } dependencies { classpath 'com.android.tools.build:gradle:2.3.1' - classpath 'com.google.gms:google-services:3.0.0' + classpath 'com.google.gms:google-services:3.1.0' classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3' } } allprojects { repositories { + google() jcenter() mavenLocal() mavenCentral() diff --git a/constants.gradle b/constants.gradle index ac9ce6b6a..7e9a3781c 100644 --- a/constants.gradle +++ b/constants.gradle @@ -8,8 +8,8 @@ project.ext { targetSdk = 25 minSdk = 14 - buildTools = '25.0.3' + buildTools = '25.0.3' // Remember to also update in .travis.yml firebaseVersion = '11.0.1' - supportLibraryVersion = '25.3.1' + supportLibraryVersion = '25.4.0' } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index abd8d2b92..ccc774a9f 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d6bab735a..d98748dae 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Apr 24 13:49:38 PDT 2017 +#Wed Jun 14 20:14:54 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/gradlew b/gradlew index 4453ccea3..cccdd3d51 100755 --- a/gradlew +++ b/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/library/google-services.json b/library/google-services.json index ca94ded87..3a601f53b 100644 --- a/library/google-services.json +++ b/library/google-services.json @@ -1,43 +1,35 @@ { "project_info": { - "project_number": "", - "firebase_url": "", - "project_id": "", - "storage_bucket": "" + "project_number": "123456789000", + "firebase_url": "https://firebase-ui.firebaseio.com", + "project_id": "firebase-ui", + "storage_bucket": "firebase-ui.appspot.com" }, "client": [ { "client_info": { - "mobilesdk_app_id": "", + "mobilesdk_app_id": "1:123456789000:android:f1bf012572b04063", "android_client_info": { "package_name": "com.firebase.uidemo" } }, "oauth_client": [ { - "client_id": "", + "client_id": "123456789000-hjugbg6ud799v4c49dim8ce2usclthar.apps.googleusercontent.com", "client_type": 1, "android_info": { "package_name": "com.firebase.uidemo", - "certificate_hash": "" + "certificate_hash": "4C20644DE36B8F89D25650C7D1FF9FBAE650FDF7" } }, { - "client_id": "316052285104-forh4hpe453p0u45ij8j68hk61pjfnvf.apps.googleusercontent.com", - "client_type": 1, - "android_info": { - "package_name": "com.firebase.uidemo", - "certificate_hash": "FE3B409037A5F3C394E4DA3F697A1A737205EC67" - } - }, - { - "client_id": "316052285104-rjq9h4q1gbv4cio1nbfht08p4fl3977d.apps.googleusercontent.com", + "client_id": "123456789000-e4uksm38sne0bqrj6uvkbo4oiu4hvigl.apps.googleusercontent.com", "client_type": 3 } ], "api_key": [ { - "current_key": "" + "current_key": "AIzbSzCn1N6LWIe6wthYyrgUUSAlUsdqMb-wvTo" } ], "services": { diff --git a/library/quality/lint-baseline.xml b/library/quality/lint-baseline.xml index 99eba2aad..3d4f73381 100644 --- a/library/quality/lint-baseline.xml +++ b/library/quality/lint-baseline.xml @@ -29,4 +29,25 @@ column="13"/> + + + + + diff --git a/library/quality/quality.gradle b/library/quality/quality.gradle index 0f84db913..472b13742 100644 --- a/library/quality/quality.gradle +++ b/library/quality/quality.gradle @@ -7,11 +7,11 @@ def configDir = "${project.rootDir}/library/quality" def reportsDir = "${project.buildDir}/reports" checkstyle { - toolVersion = '7.7' + toolVersion = '7.8' } pmd { - toolVersion = '5.6.0' + toolVersion = '5.7.0' } task checkstyle(type: Checkstyle) {