Skip to content
Permalink
Browse files

Merge pull request #625 from squanchy-dev/update-stuff

Update stuff
  • Loading branch information...
fourlastor committed May 15, 2019
2 parents 67f1f0d + c5997d5 commit 2c910b763365f1710aaf1eff80888e3a8c7a6b49
Showing with 30 additions and 29 deletions.
  1. +8 −8 CONTRIBUTORS.md
  2. +1 −0 app/build.gradle
  3. +2 −2 build.gradle
  4. +18 −18 dependencies.gradle
  5. +1 −1 gradle/wrapper/gradle-wrapper.properties
@@ -1,19 +1,19 @@
### Squanchy Android is brought to you by:
Squanchy Android is brought to you by:

#### Mantainers:
#### Mantainers

* Sebastiano Poggi - [@rock3r](https://github.com/rock3r)
* Daniele Conti - [@fourlastor](https://github.com/fourlastor)
* Lorenzo Quiroli - [@quiro91](https://github.com/quiro91)
* Daniele Bonaldo - [@danybony](https://github.com/danybony)
* Dave Clements - [@digitalpencils](https://github.com/digitalpencils)

#### Contributors:

#### Contributors

* Chris Basha - [@chris95x8](https://github.com/chris95x8)
* Stefano Cattaneo - [@catt-stefano](https://github.com/catt-stefano)
* Jon Reeve - [@jonreeve](https://github.com/jonreeve)
* Alexandros Stylianidis - [@alexstyl](https://github.com/alexstyl)
* Dave Clements - [@digitalpencils](https://github.com/digitalpencils)
* Roberto Orgiu - [@tiwiz](https://github.com/tiwiz)
* Francesco Pontillo - [@frapontillo](https://github.com/frapontillo)
* Chris Basha - [@chris95x8](https://github.com/chris95x8)
* Jon Reeve - [@jonreeve](https://github.com/jonreeve)
* Alexandros Stylianidis - [@alexstyl](https://github.com/alexstyl)
* vishnus1224 - [@vishnus1224](https://github.com/vishnus1224)
@@ -104,6 +104,7 @@ play {
// TODO uncomment these lines if you want to be able to publish to the Play Store, but *ONLY* do it
// on a release branch or you'll risk shipping random stuff to the Store (don't ask)

enabled = false // Enable to allow publishing to Google Play
// jsonFile = teamPropsFile('play-store-keys.json')
// errorOnSizeLimit = true
// uploadImages = true
@@ -14,9 +14,9 @@ buildscript {
}

plugins {
id 'com.github.ben-manes.versions' version '0.20.0'
id 'com.github.ben-manes.versions' version '0.21.0'
id 'io.gitlab.arturbosch.detekt' version '1.0.0-RC14'
id 'org.jlleitschuh.gradle.ktlint' version '7.0.0'
id 'org.jlleitschuh.gradle.ktlint' version '7.2.1'
}

def teamPropsFile(propsFile) {
@@ -1,7 +1,7 @@
ext {
daggerVersion = '2.21'
daggerVersion = '2.22.1'
glideVersion = '4.9.0'
workManagerVersion = '1.0.0'
workManagerVersion = '1.0.1-rc01'
kotlinVersion = '1.3.21'
moshiVersion = '1.8.0'

@@ -10,31 +10,31 @@ ext {

gradlePlugins = [
buildProperties: 'com.novoda:gradle-build-properties-plugin:0.4.1',
fabric : 'io.fabric.tools:gradle:1.28.0',
fabric : 'io.fabric.tools:gradle:1.28.1',
kotlin : "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}"
]

libraries = [
app : [
algolia : 'com.algolia:algoliasearch-android:3.27.0',
androidxAnnotations : "androidx.annotation:annotation:1.0.1",
androidxAppCompat : "androidx.appcompat:appcompat:1.1.0-alpha03",
androidxConstraintLayout: 'androidx.constraintlayout:constraintlayout:2.0.0-alpha3',
androidxAnnotations : 'androidx.annotation:annotation:1.1.0-beta01',
androidxAppCompat : 'androidx.appcompat:appcompat:1.1.0-alpha04',
androidxConstraintLayout: 'androidx.constraintlayout:constraintlayout:2.0.0-alpha4',
androidxKtx : 'androidx.core:core-ktx:1.1.0-alpha05',
androidxMaterial : 'com.google.android.material:material:1.1.0-alpha04',
androidxMaterial : 'com.google.android.material:material:1.1.0-alpha05',
androidxWorkManager : "android.arch.work:work-runtime-ktx:$workManagerVersion",
androidxWorkManagerRx : "android.arch.work:work-rxjava2:$workManagerVersion",
arrowCore : 'io.arrow-kt:arrow-core:0.8.2',
crashlytics : 'com.crashlytics.sdk.android:crashlytics:2.9.9',
dagger : "com.google.dagger:dagger:${daggerVersion}",
daggerCompiler : "com.google.dagger:dagger-compiler:${daggerVersion}",
firebaseAuth : 'com.google.firebase:firebase-auth:16.2.0',
firebaseConfig : 'com.google.firebase:firebase-config:16.4.0',
firebaseAuth : 'com.google.firebase:firebase-auth:16.2.1',
firebaseConfig : 'com.google.firebase:firebase-config:16.5.0',
firebaseCore : 'com.google.firebase:firebase-core:16.0.8',
firebaseFirestore : 'com.google.firebase:firebase-firestore:18.1.0',
firebaseMessaging : 'com.google.firebase:firebase-messaging:17.4.0',
firebaseFirestore : 'com.google.firebase:firebase-firestore:18.2.0',
firebaseMessaging : 'com.google.firebase:firebase-messaging:17.6.0',
firebaseStorage : 'com.google.firebase:firebase-storage:16.1.0',
firebaseUiStorage : 'com.firebaseui:firebase-ui-storage:4.3.1',
firebaseUiStorage : 'com.firebaseui:firebase-ui-storage:4.3.2',
flexbox : 'com.google.android:flexbox:1.1.0',
glide : "com.github.bumptech.glide:glide:${glideVersion}",
glideCompiler : "com.github.bumptech.glide:compiler:${glideVersion}",
@@ -45,7 +45,7 @@ ext {
moshiKotlin : "com.squareup.moshi:moshi-kotlin:${moshiVersion}",
playServicesAuth : 'com.google.android.gms:play-services-auth:16.0.1',
rxAndroid : 'io.reactivex.rxjava2:rxandroid:2.1.1',
rxJava : 'io.reactivex.rxjava2:rxjava:2.2.7',
rxJava : 'io.reactivex.rxjava2:rxjava:2.2.8',
rxKotlin : 'io.reactivex.rxjava2:rxkotlin:2.3.0',
rxLint : 'nl.littlerobots.rxlint:rxlint:1.7.3',
threeTenAbp : 'com.jakewharton.threetenabp:threetenabp:1.2.0',
@@ -54,16 +54,16 @@ ext {
],

test: [
truth : 'com.google.truth:truth:0.43',
truth : 'com.google.truth:truth:0.44',
jUnit4 : 'junit:junit:4.12',
mockito : 'org.mockito:mockito-inline:2.25.1',
mockito : 'org.mockito:mockito-inline:2.26.0',
threeTenBp: 'org.threeten:threetenbp:1.3.8'
]
]

buildScript = [
android : 'com.android.tools.build:gradle:3.3.0',
googleServices: 'com.google.gms:google-services:3.2.0',
playPublisher : 'com.github.triplet.gradle:play-publisher:1.2.0'
android : 'com.android.tools.build:gradle:3.3.2',
googleServices: 'com.google.gms:google-services:4.2.0',
playPublisher : 'com.github.triplet.gradle:play-publisher:2.2.0'
]
}
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.3.1-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

0 comments on commit 2c910b7

Please sign in to comment.
You can’t perform that action at this time.