Upstream merge

This commit is contained in:
NerdNumber9
2019-03-31 00:23:44 -04:00
178 changed files with 12799 additions and 8435 deletions

View File

@@ -3,14 +3,12 @@ apply plugin: 'com.github.ben-manes.versions'
buildscript {
repositories {
jcenter()
google()
maven {
url 'https://maven.fabric.io/public'
}
jcenter()
maven { url 'https://maven.fabric.io/public' }
}
dependencies {
classpath 'com.android.tools.build:gradle:3.1.3'
classpath 'com.android.tools.build:gradle:3.2.1'
classpath 'com.github.ben-manes:gradle-versions-plugin:0.17.0'
classpath 'com.github.zellius:android-shortcut-gradle-plugin:0.1.2'
classpath 'com.google.gms:google-services:3.2.0'
@@ -28,9 +26,9 @@ buildscript {
allprojects {
repositories {
jcenter()
google()
maven { url "https://jitpack.io" }
maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
jcenter()
}
}