Skip to content

Major syncing issues resolved #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lionuncle wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Major syncing issues resolved #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 12 additions & 13 deletions app-mvp/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ apply plugin: 'com.android.application'

android {
compileSdkVersion rootProject.ext.androidCompileSdkVersion
buildToolsVersion rootProject.ext.androidBuildToolsVersion

defaultConfig {
applicationId "uk.ivanc.archimvp"
Expand All @@ -22,17 +21,17 @@ android {
dependencies {
Map<String, String> dependencies = rootProject.ext.dependencies;

compile dependencies.appCompat
compile dependencies.cardView
compile dependencies.recyclerView
compile dependencies.retrofit
compile dependencies.retrofitConverterGson
compile dependencies.retrofitAdapterRxJava
compile dependencies.picasso
compile dependencies.rxAndroid
compile dependencies.circleImageView
implementation dependencies.appCompat
implementation dependencies.cardView
implementation dependencies.recyclerView
implementation dependencies.retrofit
implementation dependencies.retrofitConverterGson
implementation dependencies.retrofitAdapterRxJava
implementation dependencies.picasso
implementation dependencies.rxAndroid
implementation dependencies.circleImageView

testCompile dependencies.jUnit
testCompile dependencies.mockito
testCompile dependencies.robolectric
implementation dependencies.jUnit
implementation dependencies.mockito
implementation dependencies.robolectric
}
25 changes: 12 additions & 13 deletions app-mvvm/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ apply plugin: 'com.android.application'

android {
compileSdkVersion rootProject.ext.androidCompileSdkVersion
buildToolsVersion rootProject.ext.androidBuildToolsVersion

defaultConfig {
applicationId "uk.ivanc.archimvvm"
Expand All @@ -27,17 +26,17 @@ android {
dependencies {
Map<String, String> dependencies = rootProject.ext.dependencies;

compile dependencies.appCompat
compile dependencies.cardView
compile dependencies.recyclerView
compile dependencies.retrofit
compile dependencies.retrofitConverterGson
compile dependencies.retrofitAdapterRxJava
compile dependencies.picasso
compile dependencies.rxAndroid
compile dependencies.circleImageView
implementation dependencies.appCompat
implementation dependencies.cardView
implementation dependencies.recyclerView
implementation dependencies.retrofit
implementation dependencies.retrofitConverterGson
implementation dependencies.retrofitAdapterRxJava
implementation dependencies.picasso
implementation dependencies.rxAndroid
implementation dependencies.circleImageView

testCompile dependencies.jUnit
testCompile dependencies.mockito
testCompile dependencies.robolectric
implementation dependencies.jUnit
implementation dependencies.mockito
implementation dependencies.robolectric
}
19 changes: 9 additions & 10 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ apply plugin: 'com.android.application'

android {
compileSdkVersion rootProject.ext.androidCompileSdkVersion
buildToolsVersion rootProject.ext.androidBuildToolsVersion

defaultConfig {
applicationId "uk.ivanc.archi"
Expand All @@ -22,13 +21,13 @@ android {
dependencies {
Map<String, String> dependencies = rootProject.ext.dependencies;

compile dependencies.appCompat
compile dependencies.cardView
compile dependencies.recyclerView
compile dependencies.retrofit
compile dependencies.retrofitConverterGson
compile dependencies.retrofitAdapterRxJava
compile dependencies.picasso
compile dependencies.rxAndroid
compile dependencies.circleImageView
implementation dependencies.appCompat
implementation dependencies.cardView
implementation dependencies.recyclerView
implementation dependencies.retrofit
implementation dependencies.retrofitConverterGson
implementation dependencies.retrofitAdapterRxJava
implementation dependencies.picasso
implementation dependencies.rxAndroid
implementation dependencies.circleImageView
}
4 changes: 3 additions & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,17 @@ apply from: 'dependencies.gradle'
buildscript {
repositories {
jcenter()
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.2.3'
classpath 'com.android.tools.build:gradle:3.5.1'
}
}

allprojects {
repositories {
jcenter()
google()
}
}

Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Wed Feb 08 10:20:43 GMT 2017
#Thu Oct 03 16:49:46 PKT 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip