Skip to content

Commit c7ef912

Browse files
SloySloy
committed
Update Gradle and stuff
1 parent ea4acb7 commit c7ef912

File tree

6 files changed

+63
-63
lines changed

6 files changed

+63
-63
lines changed

‎SeviBus/build.gradle

+54-51
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,8 @@ buildscript {
55
}
66

77
dependencies {
8-
classpath 'me.tatarka:gradle-retrolambda:3.2.3'
9-
classpath 'io.fabric.tools:gradle:1.+'
10-
classpath "com.fernandocejas.frodo:frodo-plugin:0.8.1"
11-
classpath 'com.github.triplet.gradle:play-publisher:1.1.4'
8+
classpath 'io.fabric.tools:gradle:1.25.4'
9+
classpath 'com.github.triplet.gradle:play-publisher:1.2.2'
1210
}
1311
}
1412

@@ -18,9 +16,7 @@ repositories {
1816

1917
}
2018
apply plugin: 'com.android.application'
21-
apply plugin: 'me.tatarka.retrolambda'
2219
apply plugin: 'io.fabric'
23-
apply plugin: 'com.fernandocejas.frodo'
2420
apply plugin: 'com.github.triplet.play'
2521

2622

@@ -37,10 +33,9 @@ android {
3733
}
3834
}
3935
compileSdkVersion 23
40-
buildToolsVersion '23.0.3'
4136
defaultConfig {
4237
applicationId 'com.sloy.sevibus'
43-
minSdkVersion 14
38+
minSdkVersion 21
4439
targetSdkVersion 22
4540
versionCode myVersionCode
4641
versionName myVersionName
@@ -63,9 +58,15 @@ android {
6358
signingConfig = signingConfigs.release
6459
}
6560
}
61+
62+
flavorDimensions "city"
6663
productFlavors {
67-
sevilla {}
68-
barna {}
64+
sevilla {
65+
dimension "city"
66+
}
67+
barna {
68+
dimension "city"
69+
}
6970
}
7071
packagingOptions {
7172
exclude 'META-INF/LICENSE.txt'
@@ -79,59 +80,61 @@ android {
7980

8081
dependencies {
8182
def supportVersion = "23.1.1"
82-
compile "com.android.support:appcompat-v7:$supportVersion"
83-
compile "com.android.support:design:$supportVersion"
84-
compile "com.android.support:recyclerview-v7:$supportVersion"
85-
compile "com.android.support:cardview-v7:$supportVersion"
86-
compile "com.android.support:percent:$supportVersion"
83+
implementation "com.android.support:appcompat-v7:$supportVersion"
84+
implementation "com.android.support:design:$supportVersion"
85+
implementation "com.android.support:recyclerview-v7:$supportVersion"
86+
implementation "com.android.support:cardview-v7:$supportVersion"
87+
implementation "com.android.support:percent:$supportVersion"
8788

8889
def playServicesVersion = "9.0.0"
89-
compile "com.google.android.gms:play-services-location:$playServicesVersion"
90-
compile "com.google.android.gms:play-services-maps:$playServicesVersion"
91-
compile "com.google.android.gms:play-services-gcm:$playServicesVersion"
92-
compile "com.google.android.gms:play-services-auth:$playServicesVersion"
90+
implementation "com.google.android.gms:play-services-location:$playServicesVersion"
91+
implementation "com.google.android.gms:play-services-maps:$playServicesVersion"
92+
implementation "com.google.android.gms:play-services-gcm:$playServicesVersion"
93+
implementation "com.google.android.gms:play-services-auth:$playServicesVersion"
9394

9495
def firebaseVersion = "9.0.0"
95-
compile "com.google.firebase:firebase-auth:$firebaseVersion"
96-
compile "com.google.firebase:firebase-database:$firebaseVersion"
97-
compile "com.google.firebase:firebase-analytics:$firebaseVersion"
98-
compile "com.google.firebase:firebase-config:$firebaseVersion"
99-
100-
compile 'com.sloydev:gallego:1.0.0'
101-
compile 'io.reactivex:rxjava:1.0.16'
102-
compile 'io.reactivex:rxjava-math:1.0.0'
103-
compile 'io.reactivex:rxandroid:1.0.1'
104-
compile 'com.squareup.okhttp:okhttp:2.5.0'
105-
compile 'com.squareup.retrofit:retrofit:1.9.0'
106-
107-
compile 'com.jakewharton:butterknife:7.0.1'
108-
compile 'com.squareup.picasso:picasso:2.5.2'
109-
compile 'com.j256.ormlite:ormlite-android:4.42'
110-
compile 'com.j256.ormlite:ormlite-core:4.42'
111-
compile 'net.sourceforge.htmlcleaner:htmlcleaner:2.7'
112-
compile('com.fourmob.colorpicker:colorpicker:1.0.0') {
96+
implementation "com.google.firebase:firebase-auth:$firebaseVersion"
97+
implementation "com.google.firebase:firebase-database:$firebaseVersion"
98+
implementation "com.google.firebase:firebase-analytics:$firebaseVersion"
99+
implementation "com.google.firebase:firebase-config:$firebaseVersion"
100+
101+
implementation 'com.sloydev:gallego:1.0.0'
102+
implementation 'io.reactivex:rxjava:1.0.16'
103+
implementation 'io.reactivex:rxjava-math:1.0.0'
104+
implementation 'io.reactivex:rxandroid:1.0.1'
105+
implementation 'com.squareup.okhttp:okhttp:2.5.0'
106+
implementation 'com.squareup.retrofit:retrofit:1.9.0'
107+
108+
implementation 'com.jakewharton:butterknife:7.0.1'
109+
annotationProcessor 'com.jakewharton:butterknife:7.0.1'
110+
111+
implementation 'com.squareup.picasso:picasso:2.5.2'
112+
implementation 'com.j256.ormlite:ormlite-android:4.42'
113+
implementation 'com.j256.ormlite:ormlite-core:4.42'
114+
implementation 'net.sourceforge.htmlcleaner:htmlcleaner:2.7'
115+
implementation('com.fourmob.colorpicker:colorpicker:1.0.0') {
113116
exclude module: 'support-v4';
114117
}
115-
compile 'de.cketti.library.changelog:ckchangelog:1.2.0'
116-
compile 'com.google.guava:guava:18.0'
117-
compile 'com.facebook.stetho:stetho:1.2.0'
118-
compile fileTree(include: ['*.jar'], dir: 'libs')
119-
compile('com.crashlytics.sdk.android:crashlytics:2.5.2@aar') {
118+
implementation 'de.cketti.library.changelog:ckchangelog:1.2.0'
119+
implementation 'com.google.guava:guava:18.0'
120+
implementation 'com.facebook.stetho:stetho:1.2.0'
121+
implementation fileTree(include: ['*.jar'], dir: 'libs')
122+
implementation('com.crashlytics.sdk.android:crashlytics:2.5.2@aar') {
120123
transitive = true;
121124
}
122-
compile('com.crashlytics.sdk.android:answers:1.3.3@aar') {
125+
implementation('com.crashlytics.sdk.android:answers:1.3.3@aar') {
123126
transitive = true;
124127
}
125-
compile 'com.android.support:multidex:1.0.1'
128+
implementation 'com.android.support:multidex:1.0.1'
126129

127-
compile 'de.hdodenhof:circleimageview:2.0.0'
128-
compile 'com.github.justzak:dilatingdotsprogressbar:1.0.1'
129-
compile 'de.cketti.mailto:email-intent-builder:1.0.0'
130-
compile 'com.artjimlop:chernobyl:1.1.0'
130+
implementation 'de.hdodenhof:circleimageview:2.0.0'
131+
implementation 'com.github.justzak:dilatingdotsprogressbar:1.0.1'
132+
implementation 'de.cketti.mailto:email-intent-builder:1.0.0'
133+
implementation 'com.artjimlop:chernobyl:1.1.0'
131134

132-
testCompile 'junit:junit:4.12'
133-
testCompile 'org.assertj:assertj-core:1.7.0'
134-
testCompile 'org.mockito:mockito-core:1.10.19'
135+
testImplementation 'junit:junit:4.12'
136+
testImplementation 'org.assertj:assertj-core:1.7.0'
137+
testImplementation 'org.mockito:mockito-core:1.10.19'
135138
}
136139

137140
play {

‎SeviBus/src/main/java/com/sloy/sevibus/resources/datasource/user/PreferencesUserDataSource.java

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import android.content.SharedPreferences;
44

5-
import com.fernandocejas.frodo.annotation.RxLogObservable;
65
import com.google.gson.Gson;
76
import com.sloy.sevibus.ui.SevibusUser;
87

‎build.gradle

+4-2
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,19 @@
22

33
buildscript {
44
repositories {
5+
google()
56
jcenter()
67
}
78
dependencies {
8-
classpath 'com.android.tools.build:gradle:2.1.0'
9-
classpath 'com.google.gms:google-services:3.0.0'
9+
classpath 'com.android.tools.build:gradle:3.1.4'
10+
classpath 'com.google.gms:google-services:3.2.1'
1011
}
1112

1213
}
1314

1415
allprojects {
1516
repositories {
17+
google()
1618
jcenter()
1719
}
1820
}

‎gradle/wrapper/gradle-wrapper.jar

3.65 KB
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Sat Apr 09 21:18:33 CEST 2016
1+
#Sun Sep 16 18:40:00 CEST 2018
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-bin.zip

‎gradlew

+3-7
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,6 @@ case "`uname`" in
4242
;;
4343
esac
4444

45-
# For Cygwin, ensure paths are in UNIX format before anything is touched.
46-
if $cygwin ; then
47-
[ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
48-
fi
49-
5045
# Attempt to set APP_HOME
5146
# Resolve links: $0 may be a link
5247
PRG="$0"
@@ -61,9 +56,9 @@ while [ -h "$PRG" ] ; do
6156
fi
6257
done
6358
SAVED="`pwd`"
64-
cd "`dirname \"$PRG\"`/" >&-
59+
cd "`dirname \"$PRG\"`/" >/dev/null
6560
APP_HOME="`pwd -P`"
66-
cd "$SAVED" >&-
61+
cd "$SAVED" >/dev/null
6762

6863
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
6964

@@ -114,6 +109,7 @@ fi
114109
if $cygwin ; then
115110
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
116111
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
112+
JAVACMD=`cygpath --unix "$JAVACMD"`
117113

118114
# We build the pattern for arguments to be converted via cygpath
119115
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`

0 commit comments

Comments
 (0)