Skip to content

Commit

Permalink
updated gradle and dependencies, updated realm
Browse files Browse the repository at this point in the history
  • Loading branch information
Zeyad-37 committed Dec 12, 2017
1 parent 0eca3ad commit 85570f6
Show file tree
Hide file tree
Showing 13 changed files with 446 additions and 132 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,5 @@ captures/

# Keystore files
*.jks

/.idea/sonarlint
229 changes: 229 additions & 0 deletions .idea/codeStyleSettings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions .idea/eclipseCodeFormatter.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions .idea/findbugs-idea.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

47 changes: 44 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,16 +1,57 @@
project.ext {
supportLibrary = '26.1.0'
butterKnife = '8.8.1'
rxbinding = '2.0.0'
okhttpVersion = '3.9.1'
archComp = '1.0.0'
rxjava = '2.1.7'
rxAndroid = '2.0.1'
genericRecyclerViewAdapter = '1.6.2'
rxredux = '2.0.0'
glide = '4.0.0'
lottie = '2.2.0'
retrofit = '2.3.0'

rxlint = '1.6'
leakCanary = '1.5.4'
androidSupportTest = '1.0.1'
espressoCore = '3.0.1'
powerMock = '1.7.3'
robolectric = '3.3.2'
// robolectric = '3.5.1'
okhttpIdelingResource = '1.0.0'
mockito = '1.10.19'
// mockito = '2.10.0'
mockitoKotlin = '1.5.0'
restMock = '0.2.2'
junit = '4.12'
}

// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
ext.kotlin_version = '1.2.0'
repositories {
jcenter()
google()
mavenCentral()
maven {
url "https://plugins.gradle.org/m2/" // error-prone
}
}
dependencies {
classpath 'com.android.tools.build:gradle:2.3.3'
classpath 'com.android.tools.build:gradle:3.0.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
// classpath 'com.google.gms:google-services:3.1.0'
classpath 'io.realm:realm-gradle-plugin:3.4.0'
classpath 'io.realm:realm-gradle-plugin:4.2.0'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
// classpath "com.uber:infer-plugin:0.7.4"
classpath "com.uber:infer-plugin:0.7.4"
classpath "net.ltgt.gradle:gradle-errorprone-plugin:0.0.13"
classpath 'pl.droidsonroids.gradle:gradle-pitest-plugin:0.1.4'
classpath 'com.dicedmelon.gradle:jacoco-android:0.1.2'
classpath "gradle.plugin.org.jmailen.gradle:kotlinter-gradle:1.5.1"
classpath "gradle.plugin.io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.0.0.RC5-5"
}
}

Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Thu Jul 27 15:41:02 COT 2017
#Mon Dec 11 16:14:29 CET 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
Loading

0 comments on commit 85570f6

Please sign in to comment.